瀏覽代碼

consistent color for editable text

Johann 6 年之前
父節點
當前提交
21c3bd7145
共有 3 個文件被更改,包括 8 次插入12 次删除
  1. 2 5
      lazpaint/lazpaintmainform.lfm
  2. 1 0
      lazpaint/udarktheme.pas
  3. 5 7
      lazpaint/umenu.pas

+ 2 - 5
lazpaint/lazpaintmainform.lfm

@@ -139,6 +139,7 @@ object FMain: TFMain
       AutoSize = False
       Caption = '%'
       Color = clWindow
+      Font.Color = clWindowText
       Font.Height = -15
       Layout = tlCenter
       ParentColor = False
@@ -284,12 +285,10 @@ object FMain: TFMain
       Alignment = taCenter
       AutoSize = False
       Caption = '100%'
-      Color = clWindow
       Font.Height = -15
       Layout = tlCenter
       ParentColor = False
       ParentFont = False
-      Transparent = False
     end
     object Shape_PenColor: TShape
       Left = 38
@@ -1220,13 +1219,11 @@ object FMain: TFMain
       Width = 88
       Alignment = taCenter
       AutoSize = False
-      Caption = '99999x99999'
-      Color = clWindow
+      Caption = '9999x9999'
       Font.Height = -15
       Layout = tlCenter
       ParentColor = False
       ParentFont = False
-      Transparent = False
     end
   end
   object Panel_LineCap: TPanel

+ 1 - 0
lazpaint/udarktheme.pas

@@ -10,6 +10,7 @@ uses
 const
   clDarkBtnHighlight = $e0e0e0;
   clDarkBtnFace = $606060;
+  clDarkEditableFace = $808080;
   clLightText = $f0f0f0;
   clDarkPanelHighlight = $909090;
   clDarkPanelShadow = $404040;

+ 5 - 7
lazpaint/umenu.pas

@@ -233,7 +233,7 @@ begin
         begin
           if FDarkTheme then
           begin
-            TBCTrackbarUpdown(Controls[j]).Background.Color := $808080;
+            TBCTrackbarUpdown(Controls[j]).Background.Color := clDarkEditableFace;
             TBCTrackbarUpdown(Controls[j]).ButtonBackground.Style:= bbsColor;
             TBCTrackbarUpdown(Controls[j]).ButtonBackground.Color:= $a0a0a0;
             Controls[j].Font.Color := clLightText;
@@ -248,19 +248,17 @@ begin
         end else
         if Controls[j] is TLabel then
         begin
-          if (Controls[j].Name = 'Label_Coordinates') or
-             (Controls[j].Name = 'Label_CurrentZoom') or
-             (Controls[j].Name = 'Label_CurrentDiff') then
+          if (Controls[j].Name = 'Label_CurrentZoom') then
           begin
             if FDarkTheme then
             begin
-              Controls[j].Color := clDarkBtnFace;
+              Controls[j].Color := clDarkEditableFace;
               Controls[j].Font.Color := clLightText;
             end
             else
             begin
-              Controls[j].Color := clWhite;
-              Controls[j].Font.Color := clBlack;
+              Controls[j].Color := clWindow;
+              Controls[j].Font.Color := clWindowText;
             end;
           end else
           begin