Fixed glyph color in carbon style.

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

Hide file tree

Showing 4 changed files with 52 additions and 34 deletions.
diff --git a/src/main.pas b/src/main.pas
@@ -2823,11 +2823,11 @@       // spect1.face.template := recorderfo.tfacerecorder;
 
     songplayerfo.playreverse.colorglyph  := ltblack;
     songplayer2fo.playreverse.colorglyph := ltblack;
-
+}
     songplayerfo.edvolleft.frame.colorglyph  := ltblack;
     songplayer2fo.edvolleft.frame.colorglyph := ltblack;
 
-   }
+
     recorderfo.edvol.frame.colorglyph   := ltblack;
     recorderfo.edvolr.frame.colorglyph  := ltblack;
     recorderfo.edtempo.frame.colorglyph := ltblack;
@@ -3500,10 +3500,10 @@       // spect1.face.template := recorderfo.tfacerecorder;
 
     songplayerfo.playreverse.colorglyph  := ltblank;
     songplayer2fo.playreverse.colorglyph := ltblank;
-
+}
     songplayerfo.edvolleft.frame.colorglyph  := ltblank;
     songplayer2fo.edvolleft.frame.colorglyph := ltblank;
-}
+
     recorderfo.edvol.frame.colorglyph  := ltblank;
     recorderfo.edvolr.frame.colorglyph := ltblank;
 

diff --git a/src/songplayer.mfm b/src/songplayer.mfm
@@ -971,8 +971,8 @@ object songplayerfo: tsongplayerfo
       face.template = mainfo.tfaceorange
       taborder = 13
       visible = False
-      bounds_x = 51
-      bounds_y = 55
+      bounds_x = 50
+      bounds_y = 28
       bounds_cx = 221
       bounds_cy = 36
       font.name = 'stf_default'

diff --git a/src/songplayer_mfm.pas b/src/songplayer_mfm.pas
@@ -1212,8 +1212,8 @@ implementation
   114,111,112,115,11,0,13,102,97,99,101,46,116,101,109,112,108,97,116,101,
   7,18,109,97,105,110,102,111,46,116,102,97,99,101,111,114,97,110,103,101,
   8,116,97,98,111,114,100,101,114,2,13,7,118,105,115,105,98,108,101,8,
-  8,98,111,117,110,100,115,95,120,2,51,8,98,111,117,110,100,115,95,121,
-  2,55,9,98,111,117,110,100,115,95,99,120,3,221,0,9,98,111,117,110,
+  8,98,111,117,110,100,115,95,120,2,50,8,98,111,117,110,100,115,95,121,
+  2,28,9,98,111,117,110,100,115,95,99,120,3,221,0,9,98,111,117,110,
   100,115,95,99,121,2,36,9,102,111,110,116,46,110,97,109,101,6,11,115,
   116,102,95,100,101,102,97,117,108,116,15,102,111,110,116,46,108,111,99,97,
   108,112,114,111,112,115,11,0,0,6,116,108,97,98,101,108,9,104,105,110,

diff --git a/src/strumpract.prj b/src/strumpract.prj
@@ -186,8 +186,8 @@ finddialog=8
  value=0
  [finddialogfo]
  stackedunder=
- x=505
- y=265
+ x=908
+ y=206
  cx=300
  cy=269
 replacedialog=33
@@ -842,12 +842,15 @@ settingsstorage=0
 settingsprojecttree=0
 settingsautoload=0
 settingsautosave=0
-modulenames=1
+modulenames=2
  SONGPLAYERFO
-moduletypes=1
+ MAINFO
+moduletypes=2
  TSONGPLAYERFO
-modulefiles=1
+ TMAINFO
+modulefiles=2
  /home/fred/strumpract/src/songplayer.mfm
+ /home/fred/strumpract/src/main.mfm
 befcommandon=0
 makeoptionson=12
  4095
@@ -1610,8 +1613,9 @@ envvarons=0
 [edit]
 hintwidth=314
 hintheight=200
-finddtext=reverse
+finddtext=edvolleft
 findhistory=20
+ edvolleft
  reverse
  addfromf
  linkvol2
@@ -1631,24 +1635,28 @@ findhistory=20
  tbutton2
  commander.tbutton2
  initvolleft2
- maxvolleft1
 findoptions=1
-editpos=3
+editpos=4
  0,-1073741823
- 0,290
+ 0,277
  0,-1073741823
+ 0,4024
 bookmarks0=0
 bookmarks1=0
 bookmarks2=0
-sourcefiles=3
+bookmarks3=0
+sourcefiles=4
  ${PROJECTDIR}/strumpract.pas
  ${PROJECTDIR}/songplayer.pas
  ${PROJECTDIR}/uos_flat.pas
-relpaths=3
+ ${PROJECTDIR}/main.pas
+relpaths=4
  strumpract.pas
  songplayer.pas
  uos_flat.pas
-ismoduletexts=3
+ main.pas
+ismoduletexts=4
+ 0
  0
  0
  0
@@ -1665,22 +1673,27 @@ moduleoptions=5
  0
  0
 visiblemodules=5
+ -1
  0
  0
  0
- 0
- 0
-nomenumodules=5
  -1
+nomenumodules=5
+ 0
  -1
  -1
  -1
  0
 [sourcefo.files_tab]
+order=4
+ 0
+ 1
+ 3
+ 2
 firsttab=0
-index=1
+index=2
 [layout]
-windowlayout=660
+windowlayout=665
  [mainfo.basedock]
  splitdir=2
  useroptions=268450944
@@ -1825,7 +1838,7 @@ windowlayout=660
  sortdescend1=0
  sorted=0
  col=0
- row=12
+ row=9
  rowheight=16
  [stackfo]
  splitdir=0
@@ -2161,7 +2174,7 @@ windowlayout=660
  [debuggerfo.edit_compiler]
  value=Pascal
  [debuggerfo.file_history]
- value=/home/fred/strumpract/src/songplayer.pas
+ value=/home/fred/strumpract/src/main.pas
  history=20
   /home/fred/strumpract/src/songplayer.pas
   /home/fred/strumpract/src/strumpract.pas
@@ -2204,8 +2217,13 @@ windowlayout=660
  rcx=0
  rcy=0
  [sourcefo.files_tab]
+ order=4
+  0
+  1
+  3
+  2
  firsttab=0
- index=1
+ index=2
  [confideufo.fontname]
  value=stf_default
  [confideufo.usedefaulteditoroptions]
@@ -2214,7 +2232,7 @@ windowlayout=660
  irqoff=0
  splitdir=0
  useroptions=268451947
- stackedunder=_mse_mainfo_mse_
+ stackedunder=_mse_drumsfo_mse_
  parent=
  mdistate=0
  nx=0
@@ -2249,7 +2267,7 @@ windowlayout=660
  [_mse_mainfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=_mse_drumsfo_mse_
+ stackedunder=mainfo
  parent=
  mdistate=3
  nx=0
@@ -2264,11 +2282,11 @@ windowlayout=660
  rcy=0
  wsize=0
  active=0
- visible=0
+ visible=1
  [_mse_commanderfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=_mse_songplayerfo_mse_
+ stackedunder=confdebuggerfo
  parent=
  mdistate=3
  nx=0
@@ -2325,7 +2343,7 @@ windowlayout=660
  [_mse_songplayerfo_mse_]
  splitdir=0
  useroptions=268451963
- stackedunder=confdebuggerfo
+ stackedunder=objectinspectorfo
  parent=
  mdistate=3
  nx=0
@@ -2340,7 +2358,7 @@ windowlayout=660
  rcy=0
  wsize=0
  active=0
- visible=0
+ visible=1
 [targetconsole]
 finddtext=
 findhistory=0