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

Gtk2: Fixed ScrollWindowEx when region rect is equal clip rect.

Browse Source 
Gtk2: TGtk2WidgetSet.ShowWindow(), changed behaviour so it's win32 and qt compatibile.Respect SW_SHOW and SW_HIDE if hand
le is PGtkWidget without window.

git-svn-id: trunk@34099 -
This commit is contained in:
zeljko 2011-12-11 13:58:46 +00:00
parent 5d7716606b
commit 649fbe7f16
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7486,9 +7486,18 @@ begin
Rect1.y := PrcScroll^.Top; Rect1.y := PrcScroll^.Top;
Rect1.width := PrcScroll^.Right - PrcScroll^.Left; Rect1.width := PrcScroll^.Right - PrcScroll^.Left;
Rect1.height := PrcScroll^.Bottom - PrcScroll^.Top; Rect1.height := PrcScroll^.Bottom - PrcScroll^.Top;
end; if (PrcClip <> nil) and EqualRect(PrcClip^, PrcScroll^) then
// do nothing
else
begin
Region := gdk_region_rectangle(@Rect1); Region := gdk_region_rectangle(@Rect1);
gdk_window_move_region(Window, Region, dx, dy); gdk_window_move_region(Window, Region, dx, dy);
end;
end else
begin
Region := gdk_region_rectangle(@Rect1);
gdk_window_move_region(Window, Region, dx, dy);
end;
// Rect2 includes the Area at the scroll-in side of Rect1 // Rect2 includes the Area at the scroll-in side of Rect1
// gdk_window_move_region is supposed to have invalidated it, but some // gdk_window_move_region is supposed to have invalidated it, but some
@ -9153,13 +9162,32 @@ end;
function TGtk2WidgetSet.ShowWindow(hWnd: HWND; nCmdShow: Integer): Boolean; function TGtk2WidgetSet.ShowWindow(hWnd: HWND; nCmdShow: Integer): Boolean;
var var
GtkWindow: PGtkWindow; GtkWindow: PGtkWindow;
GdkWindow: PGdkWindow;
B: Boolean; B: Boolean;
Widget: PGtkWidget;
begin begin
Result := False; Result := False;
GtkWindow := PGtkWindow(hWnd);
if GtkWindow = nil then Widget := PGtkWidget(HWND);
if Widget = nil then
RaiseGDBException('TGtk2WidgetSet.ShowWindow hWnd is nil'); RaiseGDBException('TGtk2WidgetSet.ShowWindow hWnd is nil');
if GTK_IS_WINDOW(Widget) then
GtkWindow := PGtkWindow(hWnd)
else
begin
// we are pure gtkwidget so only SW_SHOW AND SW_HIDE CAN GO
case nCmdShow of
SW_SHOWNORMAL,
SW_SHOW: gtk_widget_show(Widget);
SW_HIDE: gtk_widget_hide(Widget);
end;
Result := nCmdShow in [SW_SHOW, SW_HIDE];
exit;
end;
B := (PGtkWidget(GtkWindow)^.parent <> nil) and B := (PGtkWidget(GtkWindow)^.parent <> nil) and
(PGtkWidget(GtkWindow)^.parent^.window <> nil) and (PGtkWidget(GtkWindow)^.parent^.window <> nil) and
(PGtkWidget(GtkWindow)^.parent^.window = PGtkWidget(GtkWindow)^.window); (PGtkWidget(GtkWindow)^.parent^.window = PGtkWidget(GtkWindow)^.window);