Johann пре 5 година
родитељ
комит
0641022846

+ 1 - 1
lazpaint/dialog/filter/uemboss.pas

@@ -148,7 +148,7 @@ var bmp: TBGRABitmap;
     c: TBGRAPixel;
 begin
     bmp := TBGRABitmap.Create(PaintBox1.Width,PaintBox1.Height);
-    bmp.Fill(ColorToRGB(clBtnFace));
+    bmp.Fill(clForm);
     c := ColorToBGRA(ColorToRGB(clWindowText));
     t := min(PaintBox1.Width/2,PaintBox1.Height/2);
     dx := cos(angle*Pi/180);

+ 1 - 1
lazpaint/dialog/filter/uformrain.pas

@@ -162,7 +162,7 @@ var bmp: TBGRABitmap;
 begin
     if wind = 0 then exit;
     bmp := TBGRABitmap.Create(PaintBox_Wind.Width,PaintBox_Wind.Height);
-    bmp.Fill(ColorToRGB(clBtnFace));
+    bmp.Fill(clForm);
     c := ColorToBGRA(ColorToRGB(clWindowText));
     if wind < 0 then angle := 180 else angle := 0;
     t := PaintBox_Wind.Width/2*abs(wind);

+ 1 - 1
lazpaint/dialog/filter/umotionblur.pas

@@ -104,7 +104,7 @@ var bmp: TBGRABitmap;
     c: TBGRAPixel;
 begin
     bmp := TBGRABitmap.Create(PaintBox1.Width,PaintBox1.Height);
-    bmp.Fill(ColorToRGB(clBtnFace));
+    bmp.Fill(clForm);
     c := ColorToBGRA(ColorToRGB(clWindowText));
     t := min(PaintBox1.Width/2,PaintBox1.Height/2);
     dx := cos(angle*Pi/180);

+ 2 - 2
lazpaint/dialog/uabout.pas

@@ -91,12 +91,12 @@ var bmp: TBGRABitmap;
 begin
   shader.LightPosition := Point(round((cos(angle)+1)/2*Image_Title.Width),round((sin(angle)+1)*Image_Title.height));
   inc(frameNumber);
-  bmp := TBGRABitmap.Create(Image_Title.Width,Image_Title.Height,ColorToRGB({$IFDEF DARWIN}clWindow{$ELSE}clBtnFace{$ENDIF}));
+  bmp := TBGRABitmap.Create(Image_Title.Width,Image_Title.Height,clForm);
 
   if xTxt = -1 then xTxt := bmp.Width;
   if xTxt > bmp.Width div 2 then dec(xTxt);
   fx.DrawShaded(bmp,xTxt,0, shader, 1,
-    MergeBGRA(ColorToBGRA(ColorToRGB(clBtnFace)),ColorToBGRA(ColorToRGB(clWindowText))),
+    MergeBGRA(ColorToBGRA(clForm),ColorToBGRA(clWindowText)),
     taCenter, false);
 
   bmp.Draw(Image_Title.Picture.Bitmap.Canvas,0,0,true);

+ 1 - 1
lazpaint/dialog/ucanvassize.lfm

@@ -120,7 +120,7 @@ object FCanvasSize: TFCanvasSize
     Width = 144
     OnRedraw = vsPreviewRedraw
     Alignment = taLeftJustify
-    Color = clBtnFace
+    Color = clForm
     ParentColor = False
     TabOrder = 6
   end

+ 2 - 2
lazpaint/dialog/uchoosecolorinterface.pas

@@ -641,8 +641,8 @@ begin
     FFormTextColor := clLightText;
   end else
   begin
-    FFormBackgroundColor := ColorToBGRA(ColorToRGB({$IFDEF DARWIN}clWindow{$ELSE}clBtnFace{$ENDIF}));
-    FFormTextColor := ColorToBGRA(ColorToRGB(clWindowText));
+    FFormBackgroundColor := clForm;
+    FFormTextColor := clWindowText;
   end;
   Container.Color := FFormBackgroundColor;
   vsColorView.Color := FFormBackgroundColor;

+ 1 - 1
lazpaint/dialog/unewimage.lfm

@@ -80,7 +80,7 @@ object FNewImage: TFNewImage
     Width = 134
     OnRedraw = vsPreviewRedraw
     Alignment = taLeftJustify
-    Color = clBtnFace
+    Color = clForm
     ParentColor = False
     TabOrder = 4
   end

+ 1 - 1
lazpaint/dialog/uobject3d.pas

@@ -610,7 +610,7 @@ begin
       x := round(pt.X*Width);
       y := round(pt.Y*Height);
       Canvas.Brush.Style := bsSolid;
-      Canvas.Brush.Color:= clBtnFace;
+      Canvas.Brush.Color:= clForm;
       Canvas.Pen.Style := psSolid;
       Canvas.Pen.Color := clWindowText;
       Canvas.Rectangle(0,0,Width,Height);

+ 1 - 1
lazpaint/dialog/uresample.lfm

@@ -124,7 +124,7 @@ object FResample: TFResample
     Width = 185
     OnRedraw = vsPreviewRedraw
     Alignment = taLeftJustify
-    Color = clBtnFace
+    Color = clForm
     ParentColor = False
     TabOrder = 7
   end