re-arrange some gadget settings pages to try to better fit them in 64…

…0*256
dmcoles · Jul 25, 2024 · 8e4a18d · 8e4a18d
1 parent b43475c
commit 8e4a18d
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 159 deletions.
diff --git a/bevelObject.e b/bevelObject.e
@@ -139,6 +139,8 @@ PROC create() OF bevelSettingsForm
 
       LAYOUT_ADDCHILD, LayoutObject,
         LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
+        LAYOUT_FIXEDHORIZ, FALSE,
+        LAYOUT_SHRINKWRAP, TRUE,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ BEVELGAD_LEFT ]:=IntegerObject,
           GA_ID, BEVELGAD_LEFT,
@@ -187,11 +189,6 @@ PROC create() OF bevelSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'Hei_ght',
         LabelEnd,
-      LayoutEnd,
-
-      LAYOUT_ADDCHILD, LayoutObject,
-        LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
-
         LAYOUT_ADDCHILD,  self.gadgetList[ BEVELGAD_FILLPEN ]:=ButtonObject,
           GA_ID, BEVELGAD_FILLPEN,
           GA_TEXT, 'FillPen',
@@ -207,6 +204,10 @@ PROC create() OF bevelSettingsForm
           GA_TABCYCLE, TRUE,
         ButtonEnd,
         CHILD_WEIGHTEDWIDTH, 0,
+      LayoutEnd,
+
+      LAYOUT_ADDCHILD, LayoutObject,
+        LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
 
         LAYOUT_ADDCHILD, self.gadgetList[ BEVELGAD_STYLE ]:=ChooserObject,
           GA_ID, BEVELGAD_STYLE,
@@ -254,7 +255,6 @@ PROC create() OF bevelSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'HighlightPen',
         LabelEnd,
-
         LAYOUT_ADDCHILD, self.gadgetList[ BEVELGAD_FOREGROUNDPEN ]:=ChooserObject,
           GA_ID, BEVELGAD_FOREGROUNDPEN,
           GA_RELVERIFY, TRUE,
@@ -268,6 +268,7 @@ PROC create() OF bevelSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'ForegroundPen',
         LabelEnd,
+
       LayoutEnd,
 
       LAYOUT_ADDCHILD, LayoutObject,
@@ -286,7 +287,6 @@ PROC create() OF bevelSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'BackgroundPen',
         LabelEnd,
-
         LAYOUT_ADDCHILD, self.gadgetList[ BEVELGAD_SHADOWPEN ]:=ChooserObject,
           GA_ID, BEVELGAD_SHADOWPEN,
           GA_RELVERIFY, TRUE,

diff --git a/getFileObject.e b/getFileObject.e
@@ -210,7 +210,7 @@ PROC create() OF getFileSettingsForm
           INTEGER_MAXCHARS, 4,
         IntegerEnd,
         CHILD_LABEL, LabelObject,
-          LABEL_TEXT, 'Left Edge',
+          LABEL_TEXT, IF arrows THEN 'Left Edge' ELSE 'Left',
         LabelEnd,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ GETFILEGAD_TOP ]:=IntegerObject,
@@ -222,7 +222,7 @@ PROC create() OF getFileSettingsForm
           INTEGER_MAXCHARS, 4,
         IntegerEnd,
         CHILD_LABEL, LabelObject,
-          LABEL_TEXT, 'Top Edge',
+          LABEL_TEXT, IF arrows THEN 'Top Edge' ELSE 'Top',
         LabelEnd,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ GETFILEGAD_WIDTH ]:=IntegerObject,

diff --git a/getFontObject.e b/getFontObject.e
@@ -160,6 +160,10 @@ PROC create() OF getFontSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'Top Edge',
         LabelEnd,
+      LayoutEnd,
+
+      LAYOUT_ADDCHILD, LayoutObject,
+        LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ GETFONTGAD_WIDTH ]:=IntegerObject,
           GA_ID, GETFONTGAD_WIDTH,
@@ -188,7 +192,6 @@ PROC create() OF getFontSettingsForm
 
       LAYOUT_ADDCHILD, LayoutObject,
         LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
-        LAYOUT_SHRINKWRAP, TRUE,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ GETFONTGAD_MINHEIGHT ]:=IntegerObject,
           GA_ID, GETFONTGAD_MINHEIGHT,
@@ -213,6 +216,10 @@ PROC create() OF getFontSettingsForm
         CHILD_LABEL, LabelObject,
           LABEL_TEXT, 'MaxHeight',
         LabelEnd,
+      LayoutEnd,
+
+      LAYOUT_ADDCHILD, LayoutObject,
+        LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
 
         LAYOUT_ADDCHILD,  self.gadgetList[ GETFONTGAD_MAXFRONT ]:=IntegerObject,
           GA_ID, GETFONTGAD_MAXFRONT,