ecere;samples/blokus: Grouped High DPI tweaks separately with HIGH_DPI preprocessor...

diff --git a/ecere/ecere.epj b/ecere/ecere.epj
index 5002029..9ab2d2d 100644 (file)
--- a/ecere/ecere.epj
+++ b/ecere/ecere.epj
@@ -335,7 +335,7 @@
             "Optimization" : "Speed",
             "PreprocessorDefinitions" : [
                "ECERE_NOFONTCONFIG",
-               "_DEBUG"
+               "HIGH_DPI"
             ],
             "IncludeDirs" : [
                "../deps/jpeg-6b",

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index 8fba1a4..b21b574 100644 (file)
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -39,7 +39,7 @@ import "WindowList"
 import "i18n"
 
 // Had to define this here for native decorations support, because the menu bar is part of total decoration's size, but not part of the system decorations
-#ifdef __ANDROID__
+#ifdef HIGH_DPI
 define skinMenuHeight = 40;
 define statusBarHeight = 30;
 #else

diff --git a/ecere/src/gui/skins/WindowsSkin.ec b/ecere/src/gui/skins/WindowsSkin.ec
index a1cf256..6cbd743 100644 (file)
--- a/ecere/src/gui/skins/WindowsSkin.ec
+++ b/ecere/src/gui/skins/WindowsSkin.ec
@@ -21,7 +21,7 @@ namespace gui::skins;
 #define TOP          4
 #define BOTTOM       4
 #define CORNER       (BORDER * 2)
-#if defined(__ANDROID__)
+#if defined(HIGH_DPI)
 #define BUTTON_SIZE  45
 #define CAPTION      60
 #else
@@ -32,7 +32,7 @@ namespace gui::skins;
 #define MIN_WIDTH    60
 #define MIN_HEIGHT   3
 #define BUTTON_OFFSET   2
-#if defined(__ANDROID__)
+#if defined(HIGH_DPI)
 #define NAME_OFFSET   12
 #else
 #define NAME_OFFSET   2
@@ -136,7 +136,7 @@ class WindowsSkin : Skin
 
    FontResource ::SystemFont()
    {
-#if defined(__ANDROID__)
+#if defined(HIGH_DPI)
       return FontResource { faceName = $"Tahoma", size = 18.25f };
 #else
       return FontResource { faceName = $"Tahoma", size = 8.25f };
@@ -145,7 +145,7 @@ class WindowsSkin : Skin
 
    FontResource ::CaptionFont()
    {
-#if defined(__ANDROID__)
+#if defined(HIGH_DPI)
       return FontResource { faceName = $"Tahoma", size = 18.25f, bold = true };
 #else
       return FontResource { faceName = $"Tahoma", size = 8.25f, bold = true };

diff --git a/samples/games/blokus/blokus.ec b/samples/games/blokus/blokus.ec
index 13aa70c..049d455 100644 (file)
--- a/samples/games/blokus/blokus.ec
+++ b/samples/games/blokus/blokus.ec
@@ -33,7 +33,7 @@ define boardSize = 20; //10;
 define boardSize = 20;
 #endif
 
-#if defined(__ANDROID__)
+#if defined(HIGH_DPI)
 define squareWidth = 60;
 define boardStartX = 20;
 define boardStartY = 30;
@@ -47,7 +47,7 @@ define squareWidth = 28;
 define blockOffset0 = 2;
 define blockOffset1 = 5;
 define blockOffset2 = 15;
-define blockOffset2 = 18;
+define blockOffset3 = 18;
 define boardStartX = 20;
 define boardStartY = 30;
 define piecesY = 20;

diff --git a/samples/games/blokus/blokus.epj b/samples/games/blokus/blokus.epj
index 66166fd..7e87149 100644 (file)
--- a/samples/games/blokus/blokus.epj
+++ b/samples/games/blokus/blokus.epj
@@ -46,6 +46,9 @@
          "Options" : {
             "Debug" : true,
             "Optimization" : "None",
+            "PreprocessorDefinitions" : [
+               "HIGH_DPI"
+            ],
             "TargetType" : "SharedLibrary",
             "PostbuildCommands" : [
                "$(call mkdirq,$(OBJ)apk/lib/x86)",