paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 07:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: fix the issue of NSButton with NSRegularSquareBezelStyle

Browse Source 
if the height of NSButton with NSRegularSquareBezelStyle is too small, a strange rectangular color block will be shown in the Button, in dark mode.

FYI: https://github.com/doublecmd/doublecmd/issues/1775
This commit is contained in:
rich2014 2024-08-12 21:04:16 +08:00
parent 8590d1f811
commit 4150057274
3 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lcl/interfaces/cocoa/cocoabuttons.pas
View File

@ -24,7 +24,7 @@ interface
uses
Types, Classes, SysUtils, Graphics,
MacOSAll, CocoaAll, CocoaPrivate, CocoaCallback;
MacOSAll, CocoaAll, CocoaConst, CocoaPrivate, CocoaCallback;
const
@ -120,8 +120,23 @@ type
procedure lclClearCallback; override;
end;
function adjustButtonSizeIfNecessary( button: NSButton; aSize: NSSize ): NSSize;
implementation
function adjustButtonSizeIfNecessary(button: NSButton; aSize: NSSize): NSSize;
begin
Result:= aSize;
if button.bezelStyle = NSRegularSquareBezelStyle then begin
// if the height of NSButton with NSRegularSquareBezelStyle is too small,
// a strange rectangular color block will be shown in the Button,
// in dark mode.
// FYI: https://github.com/doublecmd/doublecmd/issues/1775
if Result.Height < BUTTON_MIN_HEIGHT_NSRegularSquareBezelStyle then
Result.Height:= BUTTON_MIN_HEIGHT_NSRegularSquareBezelStyle;
end;
end;
{ TCocoaStepper }
procedure TCocoaStepper.stepperAction(sender: NSObject);
@ -215,6 +230,8 @@ procedure TCocoaButton.lclSetFrame(const r: TRect);
var
lBtnHeight, lDiff: Integer;
lRoundBtnSize: NSSize;
newFrame: TRect;
size: NSSize;
begin
// NSTexturedRoundedBezelStyle should be the preferred style, but it has a fixed height!
// fittingSize is 10.7+
@ -231,9 +248,17 @@ begin
else
setBezelStyle(NSTexturedSquareBezelStyle);
}
Size.width:= r.Width;
Size.height:= r.Height;
Size:= adjustButtonSizeIfNecessary( self, Size );
newFrame:= r;
newFrame.Width:= Round( Size.width );
newFrame.Height:= Round( Size.height );
if (miniHeight<>0) or (smallHeight<>0) then
SetNSControlSize(Self,r.Bottom-r.Top,miniHeight, smallHeight, adjustFontToControlSize);
inherited lclSetFrame(r);
SetNSControlSize(Self,newFrame.Bottom-newFrame.Top,miniHeight, smallHeight, adjustFontToControlSize);
inherited lclSetFrame(newFrame);
end;
procedure TCocoaButton.lclCheckMixedAllowance;

6
lcl/interfaces/cocoa/cocoaconst.pas
View File

@ -40,6 +40,12 @@ function NSSTR_EDIT_MENU_COPY: NSSTRING;
function NSSTR_EDIT_MENU_PASTE: NSSTRING;
function NSSTR_EDIT_MENU_SELECTALL: NSSTRING;
const
// if the height of NSButton with NSRegularSquareBezelStyle is too small,
// a strange rectangular color block will be shown in the Button,
// in dark mode.
BUTTON_MIN_HEIGHT_NSRegularSquareBezelStyle = 26;
implementation
const

16
lcl/interfaces/cocoa/cocoawsbuttons.pas
View File

@ -98,15 +98,13 @@ begin
if not AWinControl.HandleAllocated then Exit;
lButtonHandle := TCocoaButton(AWinControl.Handle);
// fittingSize is 10.7+
if lButtonHandle.respondsToSelector(objcselector('fittingSize')) then
begin
Size := lButtonHandle.fittingSize();
if lButton.Glyph <> nil then
Size.Height := Max(Size.Height, lButton.Glyph.Height + 6); // This nr is arbitrary
PreferredWidth := Round(Size.Width);
PreferredHeight := Round(Size.Height);
end;
Size := lButtonHandle.fittingSize();
if lButton.Glyph <> nil then
Size.Height := Max(Size.Height, lButton.Glyph.Height + 6); // This nr is arbitrary
Size:= adjustButtonSizeIfNecessary( lButtonHandle, Size );
PreferredWidth := Round(Size.Width);
PreferredHeight := Round(Size.Height);
end;
{------------------------------------------------------------------------------