Fixed glyph color in carbon style.(2)

fredvs · Nov 21, 2020 · 6e674bd · 6e674bd
1 parent 738a27e
commit 6e674bd
Show file tree

Hide file tree

Showing 5 changed files with 419 additions and 440 deletions.
diff --git a/src/commander.mfm b/src/commander.mfm
@@ -1701,48 +1701,6 @@ object commanderfo: tcommanderfo
       font.localprops = [flp_color, flp_height]
       onexecute = onexecbutlght
     end
-    object nameplayers2: tstringdisp
-      color = -2147483645
-      frame.localprops = []
-      frame.localprops1 = []
-      frame.template = tframecomp2
-      face.localprops = []
-      face.template = mainfo.tfaceplayerlight
-      taborder = 37
-      hint = 'Player 2'
-      bounds_x = 192
-      bounds_y = 3
-      bounds_cx = 32
-      bounds_cy = 14
-      font.color = 3881787
-      font.height = 10
-      font.name = 'stf_default'
-      font.localprops = [flp_color, flp_height]
-      textflags = [tf_xcentered, tf_ycentered]
-      value = 'Play2'
-      reffontheight = 13
-    end
-    object nameplayers: tstringdisp
-      color = -2147483645
-      frame.localprops = []
-      frame.localprops1 = []
-      frame.template = tframecomp2
-      face.localprops = []
-      face.template = mainfo.tfaceplayerlight
-      taborder = 38
-      hint = 'Player 1'
-      bounds_x = 42
-      bounds_y = 3
-      bounds_cx = 32
-      bounds_cy = 14
-      font.color = 3881787
-      font.height = 10
-      font.name = 'stf_default'
-      font.localprops = [flp_color, flp_height]
-      textflags = [tf_xcentered, tf_ycentered]
-      value = 'Play1'
-      reffontheight = 13
-    end
     object hintpanel: tgroupbox
       frame.localprops = [frl_optionsskin]
       frame.localprops1 = []
@@ -1785,8 +1743,8 @@ object commanderfo: tcommanderfo
       frame.localprops1 = []
       taborder = 29
       visible = False
-      bounds_x = -35
-      bounds_y = 40
+      bounds_x = 18
+      bounds_y = 47
       bounds_cx = 84
       bounds_cy = 83
       reffontheight = 15
@@ -2036,6 +1994,48 @@ object commanderfo: tcommanderfo
         value = True
       end
     end
+    object nameplayers: tstringdisp
+      color = -2147483645
+      frame.localprops = []
+      frame.localprops1 = []
+      frame.template = tframecomp2
+      face.localprops = []
+      face.template = mainfo.tfaceplayerlight
+      taborder = 37
+      hint = 'Player 1'
+      bounds_x = 42
+      bounds_y = 3
+      bounds_cx = 32
+      bounds_cy = 14
+      font.color = 3881787
+      font.height = 10
+      font.name = 'stf_default'
+      font.localprops = [flp_color, flp_height]
+      textflags = [tf_xcentered, tf_ycentered]
+      value = 'Play1'
+      reffontheight = 13
+    end
+    object nameplayers2: tstringdisp
+      color = -2147483645
+      frame.localprops = []
+      frame.localprops1 = []
+      frame.template = tframecomp2
+      face.localprops = []
+      face.template = mainfo.tfaceplayerlight
+      taborder = 38
+      hint = 'Player 2'
+      bounds_x = 192
+      bounds_y = 3
+      bounds_cx = 32
+      bounds_cy = 14
+      font.color = 3881787
+      font.height = 10
+      font.name = 'stf_default'
+      font.localprops = [flp_color, flp_height]
+      textflags = [tf_xcentered, tf_ycentered]
+      value = 'Play2'
+      reffontheight = 13
+    end
   end
   object tfacecomp7: tfacecomp
     template.fade_pos.count = 2

diff --git a/src/commander.pas b/src/commander.pas
@@ -4,46 +4,12 @@
 interface
 
 uses
-  msetypes,
-  mseglob,
-  mseguiglob,
-  mseguiintf,
-  mseapplication,
-  msestat,
-  msemenus,
-  Math,
-  msegui,
-  msetimer,
-  msegraphics,
-  msegraphutils,
-  mseevent,
-  mseclasses,
-  mseforms,
-  msedock,
-  msedragglob,
-  msesimplewidgets,
-  msewidgets,
-  mseact,
-  msebitmap,
-  msedataedits,
-  msedatanodes,
-  mseedit,
-  msefiledialogx,
-  msegrids,
-  mseificomp,
-  mseificompglob,
-  mseifiglob,
-  mselistbrowser,
-  msestatfile,
-  msestream,
-  msestrings,
-  msesys,
-  SysUtils,
-  msegraphedits,
-  msescrollbar,
-  msedispwidgets,
-  mserichstring,
-  mseimage;
+ msetypes,mseglob,mseguiglob,mseguiintf,mseapplication,msestat,msemenus,Math,
+ msegui,msetimer,msegraphics,msegraphutils,mseevent,mseclasses,mseforms,msedock,
+ msedragglob,msesimplewidgets,msewidgets,mseact,msebitmap,msedataedits,
+ msedatanodes,mseedit,msefiledialogx,msegrids,mseificomp,mseificompglob,
+ mseifiglob,mselistbrowser,msestatfile,msestream,msestrings,msesys,SysUtils,
+ msegraphedits,msescrollbar,msedispwidgets,mserichstring,mseimage;
 
 type
   tcommanderfo = class(tdockform)
@@ -131,6 +97,9 @@   tcommanderfo = class(tdockform)
     tfacegreen: tfacecomp;
     tfacegreendark: tfacecomp;
     ttimer1: ttimer;
+   nameplayers: tstringdisp;
+   nameplayers2: tstringdisp;
+   namegen: tstringdisp;
     procedure formcreated(const Sender: TObject);
     procedure visiblechangeev(const Sender: TObject);
     procedure onplay(const Sender: TObject);