ecere: Temporary skin tweaks to run on hi-resolution small display

diff --git a/ecere/src/gui/skins/WindowsSkin.ec b/ecere/src/gui/skins/WindowsSkin.ec
index 5c02c84..5bb47bf 100644 (file)
--- a/ecere/src/gui/skins/WindowsSkin.ec
+++ b/ecere/src/gui/skins/WindowsSkin.ec
@@ -17,12 +17,18 @@ namespace gui::skins;
 #define TOP          4
 #define BOTTOM       4
 #define CORNER       (BORDER * 2)
+#if defined(__ANDROID__)
+#define BUTTON_SIZE  45
+#define CAPTION      60
+#else
+#define BUTTON_SIZE  15
 #define CAPTION      20
+#endif
 #define DEAD_BORDER  3
 #define MIN_WIDTH    60
 #define MIN_HEIGHT   3
 #define BUTTON_OFFSET   2
-#define NAME_OFFSET   2
+#define NAME_OFFSET   12
 #define NAME_OFFSETX  4
 
 #define SB_WIDTH  16
@@ -122,12 +128,20 @@ class WindowsSkin : Skin
 
    FontResource ::SystemFont()
    {
+#if defined(__ANDROID__)
+      return FontResource { faceName = $"Tahoma", size = 18.25f };
+#else
       return FontResource { faceName = $"Tahoma", size = 8.25f };
+#endif
    }
 
    FontResource ::CaptionFont()
    {
+#if defined(__ANDROID__)
+      return FontResource { faceName = $"Tahoma", size = 18.25f, bold = true };
+#else
       return FontResource { faceName = $"Tahoma", size = 8.25f, bold = true };
+#endif
    }
 
    char * ::CursorsBitmaps(uint id, int * hotSpotX, int *hotSpotY, byte ** paletteShades)
@@ -386,7 +400,7 @@ public class WindowsSkin_Window : Window
          if(name)
          {
             int buttonsSize = border +
-               ((hasMaximize || hasMinimize) ? 52 : 18);
+               ((hasMaximize || hasMinimize) ? (BUTTON_SIZE*3)+7 : (BUTTON_SIZE+3));
             surface.WriteTextDots(left, border + NAME_OFFSETX, top + NAME_OFFSET, 
                size.w - (buttonsSize + border + 4), name, strlen(name));
          }
@@ -417,7 +431,7 @@ public class WindowsSkin_Window : Window
       bool result = false;
       if(nativeDecorations && rootWindow == this && windowHandle) return false;
 
-      if(((BorderBits\)borderStyle).fixed && (state != maximized || !GetParentMenuBar()))
+      if(((BorderBits)borderStyle).fixed && (state != maximized || !GetParentMenuBar()))
       {
          int corner = 0, border = 0, top = 0;
          if(((BorderBits)borderStyle).sizable && isNormal)
@@ -546,16 +560,16 @@ public class WindowsSkin_Window : Window
       {
          if(sysButtons[0])
          {
-            sysButtons[0].anchor = { right = 35 + border, top = top + BUTTON_OFFSET };
-            sysButtons[0].size = { 15, 15 };
+            sysButtons[0].anchor = { right = 2+(2*BUTTON_SIZE+3) + border, top = top + BUTTON_OFFSET };
+            sysButtons[0].size = { BUTTON_SIZE, BUTTON_SIZE };
             sysButtons[0].bevel = true;
             sysButtons[0].bitmap = { skinBitmaps[(state == minimized) ? restore : minimize] };
             sysButtons[0].visible = true;
          }
          if(sysButtons[1])
          {
-            sysButtons[1].anchor = { right = 20 + border, top = top + BUTTON_OFFSET };
-            sysButtons[1].size = { 15, 15 };
+            sysButtons[1].anchor = { right = 2+(BUTTON_SIZE+3) + border, top = top + BUTTON_OFFSET };
+            sysButtons[1].size = { BUTTON_SIZE, BUTTON_SIZE };
             sysButtons[1].bevel = true;
             sysButtons[1].bitmap = { skinBitmaps[(state == maximized) ? restore : maximize] };
             sysButtons[1].visible = true;
@@ -563,7 +577,7 @@ public class WindowsSkin_Window : Window
          if(sysButtons[2])
          {
             sysButtons[2].anchor = { right = 2 + border, top = top + BUTTON_OFFSET };
-            sysButtons[2].size = { 15, 15 };
+            sysButtons[2].size = { BUTTON_SIZE, BUTTON_SIZE };
             sysButtons[2].bevel = true;
             sysButtons[2].bitmap = { skinBitmaps[close] };
             sysButtons[2].visible = true;

diff --git a/samples/games/blokus/blokus.ec b/samples/games/blokus/blokus.ec
index 42cb365..329020a 100644 (file)
--- a/samples/games/blokus/blokus.ec
+++ b/samples/games/blokus/blokus.ec
@@ -425,7 +425,7 @@ class Blokus : Window
    hasMaximize = true;
    hasMinimize = true;
    hasClose = true;
-   size = { 1280, 728 };
+   clientSize = { 1276, 708 };
    nativeDecorations = true;
    font = { "Arial", 12, bold = true };
    FontResource yourTurnFont { "Arial", 12, bold = true, italic = true, window = this };
@@ -1259,7 +1259,7 @@ class CommunicationPanel : Window
    borderStyle = fixed;
    hasClose = true;
    tabCycle = true;
-   size = { 400, 300 };
+   clientSize = { 430, 300 };
    anchor = { horz = -3, vert = -7 };
    nativeDecorations = true;
 

diff --git a/samples/games/blokus/blokus.epj b/samples/games/blokus/blokus.epj
index 91c39aa..66166fd 100644 (file)
--- a/samples/games/blokus/blokus.epj
+++ b/samples/games/blokus/blokus.epj
@@ -44,18 +44,19 @@
       {
          "Name" : "Android",
          "Options" : {
-            "Optimization" : "Speed",
+            "Debug" : true,
+            "Optimization" : "None",
             "TargetType" : "SharedLibrary",
             "PostbuildCommands" : [
                "$(call mkdirq,$(OBJ)apk/lib/x86)",
                "$(call mkdirq,$(OBJ)apk/lib/armeabi)",
-               "$(call cpq,/sdk/ecere/obj/android.linux.$(COMPILER)/libecere.so,$(OBJ)apk/lib/x86)",
-               "$(call cpq,$(TARGET),$(OBJ)apk/lib/x86)",
+               "$(call cpq,/sdk/ecere/obj/android.linux.$(COMPILER)/libecere.so,$(OBJ)apk/lib/armeabi)",
+               "$(call cpq,$(TARGET),$(OBJ)apk/lib/armeabi)",
                "aapt package -v -f -m -M android/AndroidManifest.xml -F $(OBJ)$(MODULE)-unsigned.apk -I C:/android-sdk/platforms/android-16/android.jar -S android/res $(OBJ)apk",
                "jarsigner -storepass mypassword -sigalg MD5withRSA -digestalg SHA1 $(OBJ)$(MODULE)-unsigned.apk mykey -signedjar $(OBJ)$(MODULE).apk",
-               "adb uninstall com.ecere.Blokus",
+               "adb uninstall com.ecere.$(MODULE)",
                "adb install $(OBJ)$(MODULE).apk",
-               "adb shell am start -a android.intent.action.MAIN -n com.ecere.Blokus/android.app.NativeActivity"
+               "adb shell am start -a android.intent.action.MAIN -n com.ecere.$(MODULE)/android.app.NativeActivity"
             ]
          }
       }