2
0
Juliette ELSASS 1 жил өмнө
parent
commit
7912790475

+ 3 - 0
lazpaint/dialog/ubrowseimages.pas

@@ -337,6 +337,9 @@ begin
   FCreateFolderOrContainerCaption := ToolButton_CreateFolderOrContainer.Hint;
   ToolButton_CreateFolderOrContainer.Hint := ToolButton_CreateFolderOrContainer.Hint + '...';
   ComboBox_FileExtension.TabStop := true;
+
+  ClientWidth := Screen.WorkAreaWidth * 3 div 4;
+  ClientHeight := Screen.WorkAreaHeight * 3 div 4;
 end;
 
 procedure TFBrowseImages.FormDestroy(Sender: TObject);

+ 3 - 0
lazpaint/lazpaintmainform.pas

@@ -962,6 +962,9 @@ begin
   ComboBox_ArrowEnd.Font.Height := ComboBox_BrushSelect.Font.Height;
   {$ENDIF}
 
+  ClientWidth := DoScaleX(ClientWidth, 96);
+  ClientHeight := DoScaleY(ClientHeight, 96);
+
   FInitialized := true;
   FirstPaint := true;
 end;

+ 1 - 1
lazpaint/maintoolbar.inc

@@ -1759,7 +1759,7 @@ begin
       end;
   end else
     bmp.FillEllipseAntialias(x,y,visualSize/2,visualSize/2,c);
-  t := round(ImageList16.Width*scaling);
+  t := round(DoScaleX(ImageList16.Width, 96)*scaling);
   margin := DoScaleX(round(4*scaling),OriginalDPI);
   FPenPlusMinus := round((t+margin)/scaling);
   m := t/10;

+ 4 - 2
lazpaint/uconfig.pas

@@ -881,7 +881,8 @@ end;
 
 function TLazPaintConfig.DefaultToolPenWidth: single;
 begin
-  result := iniOptions.ReadFloat('Tool','PenWidth',5);
+  result := iniOptions.ReadFloat('Tool','PenWidth',
+    round(5 * ScreenInfo.PixelsPerInchX / 96));
 end;
 
 procedure TLazPaintConfig.SetDefaultToolPenWidth(value: single);
@@ -891,7 +892,8 @@ end;
 
 function TLazPaintConfig.DefaultToolEraserWidth: single;
 begin
-  result := iniOptions.ReadFloat('Tool','EraserWidth',10);
+  result := iniOptions.ReadFloat('Tool','EraserWidth',
+    round(10 * ScreenInfo.PixelsPerInchX / 96));
 end;
 
 procedure TLazPaintConfig.SetDefaultToolEraserWidth(value: single);