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

gtk3: fixed setBounds() for forms with constraints.

Browse Source 
git-svn-id: trunk@51768 -
This commit is contained in:
zeljko 2016-03-01 12:38:34 +00:00
parent fbc63768e7
commit a6cd2fe67f
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lcl/interfaces/gtk3/gtk3wsforms.pp
View File

@ -37,7 +37,7 @@ uses
// To get as little as posible circles, // To get as little as posible circles,
// uncomment only when needed for registration // uncomment only when needed for registration
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
Graphics, Controls, Forms, LCLType, LCLProc, Classes, Graphics, Controls, Forms, LCLType, LCLProc,
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
WSLCLClasses, WSControls, Gtk3WSControls, WSFactory, WSForms, WSProc, WSLCLClasses, WSControls, Gtk3WSControls, WSFactory, WSForms, WSProc,
LazGtk3, LazGdk3, LazGLib2, gtk3widgets, gtk3int, gtk3objects; LazGtk3, LazGdk3, LazGLib2, gtk3widgets, gtk3int, gtk3objects;
@ -195,6 +195,10 @@ class procedure TGtk3WSCustomForm.SetBounds(const AWinControl: TWinControl;
var var
AWidget: PGtkWidget; AWidget: PGtkWidget;
ARect: TGdkRectangle; ARect: TGdkRectangle;
Geometry: TGdkGeometry;
AHints: TGdkWindowHints;
AFixedWidthHeight: Boolean;
AForm: TCustomForm;
begin begin
if not WSCheckHandleAllocated(AWinControl, 'SetBounds') then if not WSCheckHandleAllocated(AWinControl, 'SetBounds') then
Exit; Exit;
@ -202,6 +206,7 @@ begin
DebugLn('TGtk3WSCustomForm.SetBounds ',dbgsName(AWinControl),Format(' ALeft %d ATop %d AWidth %d AHeight %d',[ALeft, ATop, AWidth, AHeight])); DebugLn('TGtk3WSCustomForm.SetBounds ',dbgsName(AWinControl),Format(' ALeft %d ATop %d AWidth %d AHeight %d',[ALeft, ATop, AWidth, AHeight]));
{$ENDIF} {$ENDIF}
AWidget := TGtk3Widget(AWinControl.Handle).Widget; AWidget := TGtk3Widget(AWinControl.Handle).Widget;
AForm := TCustomForm(AWinControl);
TGtk3Widget(AWinControl.Handle).BeginUpdate; TGtk3Widget(AWinControl.Handle).BeginUpdate;
ARect.x := ALeft; ARect.x := ALeft;
ARect.y := ATop; ARect.y := ATop;
@ -209,6 +214,54 @@ begin
ARect.Height := AHeight; ARect.Height := AHeight;
try try
AWidget^.size_allocate(@ARect); AWidget^.size_allocate(@ARect);
if not (csDesigning in AForm.ComponentState) and (AForm.Parent = nil) and (AForm.ParentWindow = 0) then
begin
AFixedWidthHeight := AForm.BorderStyle in [bsDialog, bsSingle, bsToolWindow];
with Geometry do
begin
if not AFixedWidthHeight and (AForm.Constraints.MinWidth > 0) then
min_width := AForm.Constraints.MinWidth
else
min_width := AForm.Width;
if not AFixedWidthHeight and (AForm.Constraints.MaxWidth > 0) then
max_width := AForm.Constraints.MaxWidth
else
max_width := AForm.Width;
if not AFixedWidthHeight and (AForm.Constraints.MinHeight > 0) then
min_height := AForm.Constraints.MinHeight
else
min_height := AForm.Height;
if not AFixedWidthHeight and (AForm.Constraints.MaxHeight > 0) then
max_height := AForm.Constraints.MaxHeight
else
max_height := AForm.Height;
base_width := AForm.Width;
base_height := AForm.Height;
width_inc := 1;
height_inc := 1;
min_aspect := 0;
max_aspect := 1;
win_gravity := PGtkWindow(AWidget)^.get_gravity;
end;
if AFixedWidthHeight then
PGtkWindow(AWidget)^.set_geometry_hints(nil, @Geometry,
GDK_HINT_POS or GDK_HINT_MIN_SIZE or GDK_HINT_MAX_SIZE)
else
begin
if AForm.BorderStyle <> bsNone then
begin
AHints := GDK_HINT_POS or GDK_HINT_BASE_SIZE;
if (AForm.Constraints.MinHeight > 0) or (AForm.Constraints.MinWidth > 0) then
AHints := AHints or GDK_HINT_MIN_SIZE;
if (AForm.Constraints.MaxHeight > 0) or (AForm.Constraints.MaxWidth > 0) then
AHints := AHints or GDK_HINT_MAX_SIZE;
PGtkWindow(AWidget)^.set_geometry_hints(nil, @Geometry, AHints);
end;
end;
end;
PGtkWindow(AWidget)^.resize(AWidth, AHeight); PGtkWindow(AWidget)^.resize(AWidth, AHeight);
PGtkWindow(AWidget)^.move(ALeft, ATop); PGtkWindow(AWidget)^.move(ALeft, ATop);
finally finally