From f499a9705219afef4e823f3ab3d32e36d54463dc Mon Sep 17 00:00:00 2001
From: Mirek Fidler <mirek.fidler@gmail.com>
Date: Thu, 13 Feb 2025 09:45:45 +0100
Subject: [PATCH] CtrlCore: Wayland fixes, ide: Upgrade now using blitz if
 enabled as build method default

---
 uppsrc/CtrlCore/GtkWnd.cpp | 3 +++
 uppsrc/CtrlLib/ChGtk3.cpp  | 2 +-
 uppsrc/ide/Upgrade.cpp     | 3 +--
 uppsrc/ide/ide.h           | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/uppsrc/CtrlCore/GtkWnd.cpp b/uppsrc/CtrlCore/GtkWnd.cpp
index 9ba75d7bd..218c54190 100644
--- a/uppsrc/CtrlCore/GtkWnd.cpp
+++ b/uppsrc/CtrlCore/GtkWnd.cpp
@@ -435,6 +435,9 @@ void Ctrl::WndInvalidateRect(const Rect& r)
 		rr.right = (r.right + 1) / 2;
 		rr.bottom = (r.bottom + 1) / 2;
 	}
+	
+	if(IsWayland())
+		rr.Inflate(2, 2); // TODO: This is temporary fix
 
 	// as gtk3 dropped thread locking, we need to push invalid rectangles onto main loop
 	for(Win& win : wins) {
diff --git a/uppsrc/CtrlLib/ChGtk3.cpp b/uppsrc/CtrlLib/ChGtk3.cpp
index 88dc1fa92..9811ed0c1 100644
--- a/uppsrc/CtrlLib/ChGtk3.cpp
+++ b/uppsrc/CtrlLib/ChGtk3.cpp
@@ -421,7 +421,7 @@ void ChHostSkin()
 		Gtk_New("scrollbar.horizontal.bottom contents trough slider");
 		GtkSize(sz);
 
-		s.barsize = s.thumbwidth = DPI(sz.cy);
+		s.barsize = s.thumbwidth = Ctrl::SCL(sz.cy);
 		s.thumbmin = max(minslider, 2 * s.barsize);
 
 		sz.cx = 4 * sz.cy;
diff --git a/uppsrc/ide/Upgrade.cpp b/uppsrc/ide/Upgrade.cpp
index 306d347af..41aa745db 100644
--- a/uppsrc/ide/Upgrade.cpp
+++ b/uppsrc/ide/Upgrade.cpp
@@ -33,9 +33,8 @@ void Ide::UpgradeTheIDE()
 #endif
 	release.createmap = false;
 	release.version.Clear();
-	release.def.blitz = false;
 	release.def.debug = false;
-	release.package.Clear();
+	release.def.blitz = MapFlag(GetMethodVars(method), "RELEASE_BLITZ");
 	
 	targetmode = 1;
 
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index f68cab33d..727dc10b6 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -1300,6 +1300,8 @@ String GetGitBranchRaw(const String& dir);
 
 Index<String> GetAllNests(bool sleep = false);
 
+bool MapFlag(const VectorMap<class String, class String>& map, const char *key);
+
 #include "urepo.h"
 
 #endif
\ No newline at end of file