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

MG: fixed window jumping

Browse Source 
git-svn-id: trunk@717 -
This commit is contained in:
lazarus 2002-02-09 01:45:44 +00:00
parent 2dc287881d
commit 2ab4322524
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lcl/interfaces/gtk/gtkobject.inc
View File

@ -177,6 +177,22 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{------------------------------------------------------------------------------
Method: TGtkObject.SetWindowSizeAndPosition
Params: Widget: PGtkWidget; AWinControl: TWinControl
Returns: Nothing
Set the size and position of a top level window.
------------------------------------------------------------------------------}
procedure TgtkObject.SetWindowSizeAndPosition(Window: PGtkWindow;
AWinControl: TWinControl);
begin
gtk_window_set_default_size(Window,AWinControl.Width,AWinControl.Height);
gtk_widget_set_usize(PGtkWidget(Window), -1,-1);
gtk_widget_set_usize(PGtkWidget(Window),AWinControl.Width,AWinControl.Height);
gtk_widget_set_uposition(PGtkWidget(Window),AWinControl.Left,AWinControl.Top);
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Method: TGtkObject.SendCachedLCLMessages Method: TGtkObject.SendCachedLCLMessages
Params: None Params: None
@ -238,21 +254,13 @@ procedure TgtkObject.SendCachedLCLMessages;
end end
else begin else begin
// resize form // resize form
gtk_window_set_default_size(PgtkWindow(Widget), {$IFDEF VerboseFormPositioning}
LCLControl.Width,LCLControl.Height); writeln('VFP SendCachedLCLMessages1 ',Widget^.window<>nil);
{$IFDEF VerboseClientRectBugFix}
writeln('BBB1 SendCachedLCLMessages ',Widget^.window<>nil);
if (LCLControl is TCustomForm) then if (LCLControl is TCustomForm) then
writeln('BBB2 SendCachedLCLMessages ',LCLControl.ClassName,' ',LCLControl.Left,',',LCLControl.Top); writeln('VFP SendCachedLCLMessages2 ',LCLControl.ClassName,' ',
LCLControl.Left,',',LCLControl.Top,',',LCLControl.Width,',',LCLControl.Height);
{$ENDIF} {$ENDIF}
if Widget^.window<>nil then begin SetWindowSizeAndPosition(PgtkWindow(Widget),TWinControl(LCLControl));
gdk_window_resize(Widget^.window,LCLControl.Width, LCLControl.Height);
gdk_window_move(Widget^.window,LCLControl.Left,LCLControl.Top);
end else begin
gtk_widget_set_usize(Widget, -1,-1);
gtk_widget_set_usize(Widget, LCLControl.Width, LCLControl.Height);
gtk_widget_set_uposition(Widget, LCLControl.Left, LCLControl.Top);
end;
end; end;
end; end;
@ -289,7 +297,6 @@ end;
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TGtkObject.SendCachedGtkMessages; procedure TGtkObject.SendCachedGtkMessages;
{$IFDEF ClientRectBugFix}
procedure SendSizeNotificationToLCL(MainWidget: PGtkWidget); procedure SendSizeNotificationToLCL(MainWidget: PGtkWidget);
var var
LCLControl: TWinControl; LCLControl: TWinControl;
@ -326,13 +333,21 @@ procedure TGtkObject.SendCachedGtkMessages;
IsTopLevelWidget:=(LCLControl is TCustomForm) IsTopLevelWidget:=(LCLControl is TCustomForm)
and (LCLControl.Parent=nil); and (LCLControl.Parent=nil);
if IsTopLevelWidget then begin if IsTopLevelWidget then begin
if not GTK_WIDGET_VISIBLE(MainWidget) then begin
// size/move messages of invisible windows are not reliable
// -> ignore
exit;
end;
if MainWidget^.window<>nil then begin if MainWidget^.window<>nil then begin
gdk_window_get_root_origin(MainWidget^.window, @GtkLeft, @GtkTop); gdk_window_get_root_origin(MainWidget^.window, @GtkLeft, @GtkTop);
end else begin end else begin
GtkLeft:=LCLControl.Left; GtkLeft:=LCLControl.Left;
GtkTop:=LCLControl.Top; GtkTop:=LCLControl.Top;
end; end;
//writeln('SendSizeNotificationToLCL ',LCLControl.ClassName,' ',GtkLeft,',',GtkTop); {$IFDEF VerboseFormPositioning}
writeln('VFP SendSizeNotificationToLCL ',LCLControl.ClassName,' ',
GtkLeft,',',GtkTop,',',GtkWidth,',',GtkHeight);
{$ENDIF}
end; end;
UpdateLCLRect; UpdateLCLRect;
@ -461,9 +476,9 @@ procedure TGtkObject.SendCachedGtkMessages;
end; end;
end; end;
{ if there any client area was resized, which MainWidget Size was already in { if any client area was resized, which MainWidget Size was already in sync
sync with the LCL, no message was send. So, tell each changed client area with the LCL, no message was send. So, tell each changed client area to
to check its size. check its size.
} }
{$IFDEF VerboseSizeMsg} {$IFDEF VerboseSizeMsg}
writeln('HHH3 SendCachedGtkClientResizeNotifications Updating ClientRects ...'); writeln('HHH3 SendCachedGtkClientResizeNotifications Updating ClientRects ...');
@ -483,12 +498,9 @@ procedure TGtkObject.SendCachedGtkMessages;
writeln('HHH4 SendCachedGtkClientResizeNotifications completed.'); writeln('HHH4 SendCachedGtkClientResizeNotifications completed.');
{$ENDIF} {$ENDIF}
end; end;
{$ENDIF}
begin begin
{$IFDEF ClientRectBugFix}
SendCachedGtkResizeNotifications; SendCachedGtkResizeNotifications;
{$ENDIF}
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
@ -3817,29 +3829,18 @@ begin
//if Sender is TForm then //if Sender is TForm then
// writeln('[TgtkObject.ShowHide] START ',Sender.ClassName,' Visible=',TControl(Sender).Visible,' Window=',FormWidget^.Window<>nil); // writeln('[TgtkObject.ShowHide] START ',Sender.ClassName,' Visible=',TControl(Sender).Visible,' Window=',FormWidget^.Window<>nil);
if TControl(Sender).Visible then begin if TControl(Sender).Visible then begin
{$IFDEF ClientRectBugFix}
if (Sender is TCustomForm) and (not gtk_widget_visible(SenderWidget)) then if (Sender is TCustomForm) and (not gtk_widget_visible(SenderWidget)) then
begin begin
{$IFDEF VerboseClientRectBugFix} {$IFDEF VerboseFormPositioning}
writeln('[TgtkObject.ShowHide] A set bounds ', writeln('VFP [TgtkObject.ShowHide] A set bounds ',
TControl(Sender).Name,':',TControl(Sender).ClassName, TControl(Sender).Name,':',TControl(Sender).ClassName,
' Window=',SenderWidget^.Window<>nil, ' Window=',SenderWidget^.Window<>nil,
' ',TControl(Sender).Left,',',TControl(Sender).Top); ' ',TControl(Sender).Left,',',TControl(Sender).Top,
',',TControl(Sender).Width,',',TControl(Sender).Height);
{$ENDIF} {$ENDIF}
{if SenderWidget^.Window<>nil then begin SetWindowSizeAndPosition(PgtkWindow(SenderWidget),TWinControl(Sender));
gdk_window_resize(SenderWidget^.window,
TControl(Sender).Width,TControl(Sender).Height);
gdk_window_move(SenderWidget^.window,
TControl(Sender).Left, TControl(Sender).Top);
end else begin}
gtk_window_set_default_size(PgtkWindow(SenderWidget),
TControl(Sender).Width,TControl(Sender).Height);
gtk_widget_set_uposition(PgtkWidget(SenderWidget),
TControl(Sender).Left, TControl(Sender).Top);
//end;
UnsetResizeRequest(PgtkWidget(Sender)); UnsetResizeRequest(PgtkWidget(Sender));
end; end;
{$ENDIF}
gtk_widget_show(SenderWidget); gtk_widget_show(SenderWidget);
if (Sender is TCustomForm) and (SenderWidget^.Window<>nil) then begin if (Sender is TCustomForm) and (SenderWidget^.Window<>nil) then begin
FormIconGdiObject:=PGDIObject(TCustomForm(Sender).GetIconHandle); FormIconGdiObject:=PGDIObject(TCustomForm(Sender).GetIconHandle);
@ -5252,6 +5253,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.139 2002/06/09 07:08:43 lazarus
MG: fixed window jumping
Revision 1.138 2002/06/08 17:16:04 lazarus Revision 1.138 2002/06/08 17:16:04 lazarus
MG: added close buttons and images to TNoteBook and close buttons to source editor MG: added close buttons and images to TNoteBook and close buttons to source editor