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

Merged revision(s) 61369 #e5212b707b from trunk:

Browse Source 
cocoa: implemented form icons
........

git-svn-id: branches/fixes_2_0@61640 -
This commit is contained in:
martin 2019-07-28 11:08:21 +00:00
parent ea06ef9576
commit 5e811e756f
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/cocoa/cocoaobject.inc
View File

@ -273,7 +273,6 @@ begin
lcCanDrawOutsideOnPaint,
lcNeedMininimizeAppWithMainForm,
lcApplicationTitle,
lcFormIcon,
{$ifndef COCOA_USE_NATIVE_MODAL}
lcModalWindow,
{$endif}
@ -282,6 +281,7 @@ begin
{$ifdef COCOA_USE_NATIVE_MODAL}
lcModalWindow,
{$endif}
lcFormIcon,
lcAntialiasingEnabledByDefault:
Result := LCL_CAPABILITY_YES;
lcTransparentWindow: Result := LCL_CAPABILITY_YES;

51
lcl/interfaces/cocoa/cocoawsforms.pas
View File

@ -31,6 +31,7 @@ uses
WSForms, WSLCLClasses, WSProc, LCLMessageGlue,
// LCL Cocoa
CocoaPrivate, CocoaUtils, CocoaWSCommon, CocoaWSStdCtrls, CocoaWSMenus,
CocoaGDIObjects,
CocoaWindows, CocoaScrollers, cocoa_extra;
type
@ -128,6 +129,7 @@ type
class procedure SetBorderIcons(const AForm: TCustomForm; const ABorderIcons: TBorderIcons); override;
class procedure SetFormBorderStyle(const AForm: TCustomForm; const AFormBorderStyle: TFormBorderStyle); override;
class procedure SetFormStyle(const AForm: TCustomform; const AFormStyle, AOldFormStyle: TFormStyle); override;
class procedure SetIcon(const AForm: TCustomForm; const Small, Big: HICON); override;
class procedure SetRealPopupParent(const ACustomForm: TCustomForm;
const APopupParent: TCustomForm); override;
class procedure ShowHide(const AWinControl: TWinControl); override;
@ -603,10 +605,35 @@ class procedure TCocoaWSCustomForm.UpdateWindowIcons(AWindow: NSWindow;
end;
end;
var
btn : NSButton;
url : NSURL;
b : NSBundle;
const
// mimic Windows border styles
isIconVisible : array [TFormBorderStyle] of Boolean = (
false, // bsNone
true, // bsSingle
true, // bsSizeable
false, // bsDialog
false, // bsToolWindow
false // bsSizeToolWin
);
begin
SetWindowButtonState(NSWindowMiniaturizeButton, biMinimize in ABorderIcons, (ABorderStyle in [bsSingle, bsSizeable]) and (biSystemMenu in ABorderIcons));
SetWindowButtonState(NSWindowZoomButton, (biMaximize in ABorderIcons) and (ABorderStyle in [bsSizeable, bsSizeToolWin]), (ABorderStyle in [bsSingle, bsSizeable]) and (biSystemMenu in ABorderIcons));
SetWindowButtonState(NSWindowCloseButton, True, (ABorderStyle <> bsNone) and (biSystemMenu in ABorderIcons));
btn := AWindow.standardWindowButton(NSWindowDocumentIconButton);
url := nil;
if isIconVisible[ABorderStyle] then
begin
b := NSBundle.mainBundle;
if Assigned(b) then url := b.bundleURL;
end;
AWindow.setRepresentedURL(url);
end;
class procedure TCocoaWSCustomForm.UpdateWindowMask(AWindow: NSWindow;
@ -968,6 +995,30 @@ begin
end;
end;
class procedure TCocoaWSCustomForm.SetIcon(const AForm: TCustomForm;
const Small, Big: HICON);
var
win : NSWindow;
trg : NSImage;
btn : NSButton;
begin
if not AForm.HandleAllocated then Exit;
win := TCocoaWindowContent(AForm.Handle).lclOwnWindow;
if Assigned(win) then
begin
if Small <> 0 then
trg := TCocoaBitmap(Small).image
else if Big <> 0 then
trg := TCocoaBitmap(Big).image
else
trg := nil;
btn := win.standardWindowButton(NSWindowDocumentIconButton);
if Assigned(btn) then btn.setImage(trg);
end;
end;
class procedure TCocoaWSCustomForm.SetRealPopupParent(
const ACustomForm: TCustomForm; const APopupParent: TCustomForm);
var