mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: hide the LCL Toolbar in ViewerForm on macOS 11+ (because of the native Toolbar)

Browse source
This commit is contained in:
rich2014 2026-05-09 22:15:35 +08:00
commit 4d6c1e86ad
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fviewer.lfm
View file

@ -443,6 +443,7 @@ object frmViewer: TfrmViewer
ParentFont = False
ShowCaptions = True
TabOrder = 1
Visible = False
object btnReload: TToolButton
Left = 1
Top = 2

25
src/fviewer.pas
View file

@ -441,6 +441,7 @@ type
procedure SaveImageAs (Var sExt: String; senderSave: boolean; Quality: integer);
procedure ImagePaintBackground(ASender: TObject; ACanvas: TCanvas; ARect: TRect);
procedure CreatePreview(FullPathToFile:string; index:integer; delete: boolean = false);
procedure showToolBar( newVisibility: Boolean );
property Commands: TFormCommands read FCommands implements IFormCommands;
property FileName: String write SetFileName;
@ -570,6 +571,9 @@ uses
{$if lcl_fullversion >= 4990000}
, SynEditWrappedView
{$endif}
{$IFDEF DARWIN}
, uDarwinApplication, uEarlyConfig
{$ENDIF}
;
const
@ -1460,6 +1464,15 @@ begin
end;
end;
procedure TfrmViewer.showToolBar( newVisibility: Boolean );
begin
{$IFDEF DARWIN}
if gModernUI and TDarwinApplicationUtil.supportsModernForm then
newVisibility:= False;
{$ENDIF}
ToolBar1.Visible:= newVisibility;
end;
procedure TfrmViewer.WMCommand(var Message: TLMCommand);
var
Index: Integer;
@ -2205,12 +2218,12 @@ begin
begin
if (ToolBar1.Visible) and (i_timer > 60) and (not ToolBar1.MouseInClient) then
begin
ToolBar1.Visible:= False;
showToolBar( False );
AdjustImageSize;
end
else if (not ToolBar1.Visible) and (sboxImage.ScreenToClient(Mouse.CursorPos).Y < ToolBar1.Height div 2) then
begin
ToolBar1.Visible:= True;
showToolBar( True );
AdjustImageSize;
end;
end;
@ -2219,7 +2232,7 @@ begin
begin
if (ToolBar1.Visible) and (not ToolBar1.MouseInClient) then
begin
ToolBar1.Visible:= False;
showToolBar( False );
AdjustImageSize;
end;
cm_LoadNextFile([]);
@ -3629,7 +3642,7 @@ begin
Image.Invalidate;
Status.Panels[sbpTextEncoding].Text:= EmptyStr;
if (not bQuickView) and CanFocus and pnlImage.CanFocus then pnlImage.SetFocus;
ToolBar1.Visible:= not (bQuickView or (miFullScreen.Checked and not ToolBar1.MouseInClient));
showToolBar( not (bQuickView or (miFullScreen.Checked and not ToolBar1.MouseInClient)) );
viewerFormHandler.onShowModeChanged( self, vsmImage );
end
else if Panel = pnlFolder then
@ -3877,7 +3890,7 @@ begin
Self.Menu:= nil;
btnPaint.Down:= false;
btnHightlight.Down:=false;
ToolBar1.Visible:= False;
showToolBar( False );
miStretch.Checked:= True;
miStretchOnlyLarge.Checked:= False;
if miPreview.Checked then cm_Preview(['']);
@ -3895,7 +3908,7 @@ begin
BorderStyle:= bsSizeable;
SetBounds(FWindowBounds.Left, FWindowBounds.Top, FWindowBounds.Right, FWindowBounds.Bottom);
{$ENDIF}
ToolBar1.Visible:= True;
showToolBar( True );
actFullscreen.ImageIndex:= 22;
sboxImage.BorderStyle:= bsSingle;
end;