Sfoglia il codice sorgente

fix scale code for non-MacOS

Johann ELSASS 4 anni fa
parent
commit
1bb751c3aa
3 ha cambiato i file con 20 aggiunte e 18 eliminazioni
  1. 18 0
      lazpaint/lazpaintmainform.pas
  2. 0 18
      lazpaint/maintoolbar.inc
  3. 2 0
      lazpaintcontrols/lctoolbars.pas

+ 18 - 0
lazpaint/lazpaintmainform.pas

@@ -1138,6 +1138,24 @@ begin
     toolbarDPI := round(96*iconSize/16);
     m.ScaleToolbars(toolbarDPI);
     ScaleControl(Panel_PenWidthPreview, OriginalDPI, toolbarDPI, toolbarDPI);
+    LabelAutosize(Label_Pen);
+    LabelAutosize(Label_Back);
+    LabelAutosize(Label_PenWidth);
+    LabelAutosize(Label_Eraser);
+    LabelAutosize(Label_Tolerance);
+    LabelAutosize(Label_Grid);
+    LabelAutosize(Label_Curve);
+    LabelAutosize(Label_Text);
+    LabelAutosize(Label_TextBlur);
+    LabelAutosize(Label_ShadowOffset);
+    LabelAutosize(Label_Shape);
+    LabelAutosize(Label_PhongBorder);
+    LabelAutosize(Label_Altitude);
+    LabelAutosize(Label_OutlineWidth);
+    LabelAutosize(Label_Brush);
+    LabelAutosize(Label_Spacing);
+    LabelAutosize(Label_Ratio);
+    LabelAutosize(Label_Donate);
     m.ImageList := LazPaintInstance.Icons[iconSize];
     m.Apply;
     FLayout.Menu := m;

+ 0 - 18
lazpaint/maintoolbar.inc

@@ -225,24 +225,6 @@ begin
   Label_Coordinates.Caption := '';
   FCoordinatesCaption:= '';
   FCoordinatesCaptionCount := 0;
-  LabelAutosize(Label_Pen);
-  LabelAutosize(Label_Back);
-  LabelAutosize(Label_PenWidth);
-  LabelAutosize(Label_Eraser);
-  LabelAutosize(Label_Tolerance);
-  LabelAutosize(Label_Grid);
-  LabelAutosize(Label_Curve);
-  LabelAutosize(Label_Text);
-  LabelAutosize(Label_TextBlur);
-  LabelAutosize(Label_ShadowOffset);
-  LabelAutosize(Label_Shape);
-  LabelAutosize(Label_PhongBorder);
-  LabelAutosize(Label_Altitude);
-  LabelAutosize(Label_OutlineWidth);
-  LabelAutosize(Label_Brush);
-  LabelAutosize(Label_Spacing);
-  LabelAutosize(Label_Ratio);
-  LabelAutosize(Label_Donate);
   Image_SwapColors.Hint := Image_SwapColors.Hint + ' (X)';
 
   Tool_CurveModeAuto.Hint := Tool_CurveModeAuto.Hint + ' (A)';

+ 2 - 0
lazpaintcontrols/lctoolbars.pas

@@ -121,6 +121,8 @@ var
 begin
   iconImg := TBGRALazPaintImage.Create;
   iconImg.LoadFromResource(AFilename);
+  if AImages.ResolutionCount = 0 then
+    AImages.RegisterResolutions([AImages.Width]);
   setlength(iconFlat, AImages.ResolutionCount);
   setlength(bmpArray, length(iconFlat));
   for i := 0 to high(iconFlat) do