ecere: Android fixes; i18n update

- gui: Fixed issue with rootWindow not being set properly
- Fixed uninitialized values on Android causing bad window area awareness;
- i18n: Added missing context for "Imp" and "Exp" strings

diff --git a/documentor/locale/documentor.pot b/documentor/locale/documentor.pot
index 0507977..03e6341 100644 (file)
--- a/documentor/locale/documentor.pot
+++ b/documentor/locale/documentor.pot
@@ -131,7 +131,7 @@ msgid "Bit Collection"
 msgstr "Bit Collection"
 
 #: ./src/Documentor.ec:2194
-#: ./src/SettingsDialog.ec:53
+#: ./src/SettingsDialog.ec:52
 msgid "Cancel"
 msgstr "Cancel"
 

diff --git a/ecere/locale/ecere.pot b/ecere/locale/ecere.pot
index 0836cfd..4dc6a6e 100644 (file)
--- a/ecere/locale/ecere.pot
+++ b/ecere/locale/ecere.pot
@@ -312,6 +312,7 @@ msgid "Error writing file"
 msgstr "Error writing file"
 
 #: ./src/sys/File.ec:318
+msgctxt "Export"
 msgid "Exp"
 msgstr "Exp"
 
@@ -411,6 +412,7 @@ msgid "Image Files (*.jpg, *.jpeg, *.bmp, *.pcx, *.png, *.gif)"
 msgstr "Image Files (*.jpg, *.jpeg, *.bmp, *.pcx, *.png, *.gif)"
 
 #: ./src/sys/File.ec:294
+msgctxt "Import"
 msgid "Imp"
 msgstr "Imp"
 

diff --git a/ecere/src/gui/Window.ec b/ecere/src/gui/Window.ec
index b21b574..a764630 100644 (file)
--- a/ecere/src/gui/Window.ec
+++ b/ecere/src/gui/Window.ec
@@ -4730,7 +4730,7 @@ private:
 
       // Setup relationship with outside world (bb root || !bb)
       if((!guiApp.fullScreenMode && parent == guiApp.desktop) || this == guiApp.desktop || 
-         (_displayDriver && dispDriver != parent.dispDriver))
+         (_displayDriver && parent.dispDriver && dispDriver != parent.dispDriver))
       {
          rootWindow = this;
          if(!tempExtents)

diff --git a/ecere/src/gui/skins/WindowsSkin.ec b/ecere/src/gui/skins/WindowsSkin.ec
index 6cbd743..5d240ac 100644 (file)
--- a/ecere/src/gui/skins/WindowsSkin.ec
+++ b/ecere/src/gui/skins/WindowsSkin.ec
@@ -284,7 +284,7 @@ public class WindowsSkin_Window : Window
          *x += client00.x - rcWindow.left;
          *y += client00.y - rcWindow.top;
 #else
-         Box widths;
+         Box widths = { 0 };
 #if !defined(__ANDROID__)
          XGetBorderWidths(this, widths);
 #endif

diff --git a/ecere/src/sys/File.ec b/ecere/src/sys/File.ec
index da5d51e..72915e9 100644 (file)
--- a/ecere/src/sys/File.ec
+++ b/ecere/src/sys/File.ec
@@ -291,7 +291,7 @@ public class File : IOChannel
       Window editData = class::OnEdit(dataBox, obsolete, x + 24, y, w - 48, h, userData);
       Button load
       { 
-         dataBox, inactive = true, text = $"Imp", hotKey = f2,
+         dataBox, inactive = true, text = $"Import"."Imp", hotKey = f2,
          position = { Max(x + 24, x + w - 24), y }, size = { 24, h };
 
          bool DataBox::NotifyClicked(Button button, int x, int y, Modifiers mods)
@@ -315,7 +315,7 @@ public class File : IOChannel
       };
       Button save
       { 
-         dataBox, inactive = true, text = $"Exp", hotKey = f2,
+         dataBox, inactive = true, text = $"Export"."Exp", hotKey = f2,
          position = { Max(x + 24, x + w - 48), y }, size = { 24, h };
 
          bool DataBox::NotifyClicked(Button button, int x, int y, Modifiers mods)