mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Minimize/Restore from tray under GTK2

Browse source
This commit is contained in:
Alexander Koblov 2015-12-12 11:15:27 +00:00
commit 88748cb344
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/fmain.pas
View file

@ -575,6 +575,9 @@ type
private
QEventHook: QObject_hookH;
function QObjectEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
{$ENDIF}
{$IF DEFINED(LCLGTK2)}
procedure WindowStateUpdate(Data: PtrInt);
{$ENDIF}
private
{ Private declarations }
@ -799,6 +802,11 @@ var
CloseQueryResult: Boolean = False;
{$ENDIF}
{$IFDEF LCLGTK2}
var
MinimizedWindowButton: Boolean = False;
{$ENDIF}
var
FunctionButtonsCaptions: array[0..7] of record
ACaption: String;
@ -1680,6 +1688,13 @@ begin
end
end;
{$IF DEFINED(LCLGTK2)}
procedure TfrmMain.WindowStateUpdate(Data: PtrInt);
begin
Resizing(lastWindowState);
end;
{$ENDIF}
procedure TfrmMain.FormWindowStateChange(Sender: TObject);
begin
if FUpdateDiskCount and (WindowState <> wsMinimized) then
@ -1688,11 +1703,23 @@ begin
FUpdateDiskCount:= False;
end;
{$IF DEFINED(LCLGTK2)}
if MinimizedWindowButton then
begin
MinimizedWindowButton:= False;
Application.QueueAsyncCall(@WindowStateUpdate, 0);
Exit;
end;
{$ENDIF}
if WindowState = wsMinimized then
begin // Minimized
MainToolBar.Top:= 0; // restore toolbar position
if not HiddenToTray then
begin
{$IF DEFINED(LCLGTK2)}
MinimizedWindowButton:= True;
{$ENDIF}
if gMinimizeToTray or gAlwaysShowTrayIcon then
begin
HideToTray;
@ -1704,7 +1731,7 @@ begin
// We don't react to this message in this case.
HiddenToTray := False;
{$IF DEFINED(LCLGTK2)}
WindowState := lastWindowState;
Application.QueueAsyncCall(@WindowStateUpdate, 0);
{$ENDIF}
end;
end
@ -2008,9 +2035,8 @@ end;
procedure TfrmMain.frmMainAfterShow(Data: PtrInt);
begin
ActiveFrame.SetFocus;
{$IF NOT DEFINED(LCLGTK2)}
HiddenToTray := False;
{$ENDIF}
end;
procedure TfrmMain.frmMainShow(Sender: TObject);