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

Merged revision(s) 54791 #33d34bce77, 54975 #cba5c9c545 from trunk:

Browse Source 
Gtk2: implemented LCLIntf.ShowWindow(SW_RESTORE).Patch by AlexeyT. issue #31740
........
Gtk2: removed workaround for SW_SHOWNORMAL, added checks for SW_RESTORE and SW_SHOWMAXIMIZED. issue #31832
........

git-svn-id: branches/fixes_1_8@55065 -
This commit is contained in:
maxim 2017-05-23 22:06:56 +00:00
parent a2d1a6092f
commit 41a8c54dd4
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lcl/interfaces/gtk2/gtk2winapi.inc
View File

@ -9400,7 +9400,8 @@ var
GtkWindow: PGtkWindow;
B: Boolean;
Widget: PGtkWidget;
Control: TWinControl;
AFlags: TGdkWindowState;
AWindow: PGdkWindow;
begin
Result := False;
@ -9446,20 +9447,17 @@ begin
begin
if not GTK_WIDGET_VISIBLE(PGtkWidget(GtkWindow)) then
gtk_widget_show(PGtkWidget(GtkWindow));
gtk_window_deiconify(GtkWindow);
// Workaround for gtk2 bug with some window managers:
// calling gtk_window_unmaximize when the window is not maximized
// will cause window to shrink. Here we check if the window we are
// resizing is a form and use its WindowState property to make sure
// it is maximized before trying to unmaximize it which avoids the
// issue (custom code that uses the Win32 API will still have the
// problem though, but gtk2 does not offer a is_maximized method)
// see https://bugs.freepascal.org/view.php?id=31832
Control:=TWinControl(GetLCLObject({%H-}Pointer(hWnd)));
if (not (Control is TCustomForm)) or
(TCustomForm(Control).WindowState=wsMaximized) then
gtk_window_unmaximize(GtkWindow);
gtk_window_unfullscreen(GtkWindow);
AWindow := PGtkWidget(GtkWindow)^.window;
if GDK_IS_WINDOW(AWindow) then
begin
AFlags := gdk_window_get_state(AWindow);
if AFlags and GDK_WINDOW_STATE_ICONIFIED <> 0 then
gtk_window_deiconify(GtkWindow);
if AFlags and GDK_WINDOW_STATE_MAXIMIZED <> 0 then
gtk_window_unmaximize(GtkWindow);
if AFlags and GDK_WINDOW_STATE_FULLSCREEN <> 0 then
gtk_window_unfullscreen(GtkWindow);
end;
end;
end;
@ -9475,9 +9473,16 @@ begin
gtk_widget_show(PGtkWidget(GtkWindow))
else
begin
gtk_window_deiconify(GtkWindow);
gtk_window_unfullscreen(GtkWindow);
gtk_window_maximize(GtkWindow);
AWindow := PGtkWidget(GtkWindow)^.window;
if GDK_IS_WINDOW(AWindow) then
begin
AFlags := gdk_window_get_state(AWindow);
if AFlags and GDK_WINDOW_STATE_ICONIFIED <> 0 then
gtk_window_deiconify(GtkWindow);
if AFlags and GDK_WINDOW_STATE_FULLSCREEN <> 0 then
gtk_window_unfullscreen(GtkWindow);
gtk_window_maximize(GtkWindow);
end;
end;
SW_SHOWFULLSCREEN:
@ -9486,6 +9491,20 @@ begin
else
gtk_window_fullscreen(GtkWindow);
SW_RESTORE:
begin
AWindow := PGtkWidget(GtkWindow)^.window;
if GDK_IS_WINDOW(AWindow) then
begin
AFlags := gdk_window_get_state(AWindow);
if AFlags and GDK_WINDOW_STATE_ICONIFIED <> 0 then
gtk_window_deiconify(GtkWindow);
if AFlags and GDK_WINDOW_STATE_MAXIMIZED <> 0 then
gtk_window_unmaximize(GtkWindow);
if AFlags and GDK_WINDOW_STATE_FULLSCREEN <> 0 then
gtk_window_unfullscreen(GtkWindow);
end;
end;
end;
Result := True;