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

Gtk2: fixed sizing of form with constraints. Issue #31950

Browse Source 
git-svn-id: branches/fixes_1_8@55284 -
This commit is contained in:
mattias 2017-06-09 14:37:56 +00:00
parent a2436ffc36
commit e565f9922a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -9387,7 +9387,7 @@ begin
// X warns if marking a fixed size window resizeable:
if ((AForm.Constraints.MinWidth>0)
and (AForm.Constraints.MinWidth=AForm.Constraints.MaxWidth))
or ((AForm.Constraints.MinHeight>0)
and ((AForm.Constraints.MinHeight>0)
and (AForm.Constraints.MinHeight=AForm.Constraints.MaxHeight)) then
Result:=Result-GDK_FUNC_RESIZE;

20
lcl/interfaces/gtk2/gtk2wscontrols.pp
View File

@ -670,7 +670,6 @@ var
begin
if not WSCheckHandleAllocated(AWinControl, 'SetBounds')
then Exit;
ResizeHandle(AWinControl);
InvalidateLastWFPResult(AWinControl, Rect(ALeft, ATop, AWidth, AHeight));
if not AWinControl.Visible then // Gtk2WSForms.ShowHide will correct visibility
@ -686,24 +685,34 @@ begin
// as expected for some reason.issue #20741.
// Constraints fix issue #29563
AFixedWidthHeight := AForm.BorderStyle in [bsDialog, bsSingle, bsToolWindow];
FillChar(Geometry, SizeOf(TGdkGeometry), 0);
with Geometry do
begin
if not AFixedWidthHeight and (AForm.Constraints.MinWidth > 0) then
min_width := AForm.Constraints.MinWidth
else
if AFixedWidthHeight then
min_width := AForm.Width;
if not AFixedWidthHeight and (AForm.Constraints.MaxWidth > 0) then
max_width := AForm.Constraints.MaxWidth
else
max_width := AForm.Width;
if AFixedWidthHeight then
max_width := AForm.Width;
if not AFixedWidthHeight and (AForm.Constraints.MinHeight > 0) then
min_height := AForm.Constraints.MinHeight
else
min_height := AForm.Height;
if AFixedWidthHeight then
min_height := AForm.Height;
if not AFixedWidthHeight and (AForm.Constraints.MaxHeight > 0) then
max_height := AForm.Constraints.MaxHeight
else
max_height := AForm.Height;
if AFixedWidthHeight then
max_height := AForm.Height;
if AForm.Constraints.MaxHeight = 0 then
max_height := 32767;
if AForm.Constraints.MaxWidth = 0 then
max_width := 32767;
base_width := AForm.Width;
base_height := AForm.Height;
@ -713,7 +722,8 @@ begin
max_aspect := 1;
win_gravity := gtk_window_get_gravity({%H-}PGtkWindow(AForm.Handle));
end;
//debugln('TGtk2WSWinControl.ConstraintsChange A ',GetWidgetDebugReport(Widget),' max=',dbgs(Geometry.max_width),'x',dbgs(Geometry.max_height));
//debugln('TGtk2WSWinControl.SetBounds A maxw=',dbgs(Geometry.max_width),' maxh=',dbgs(Geometry.max_height),
//' base w=',dbgs(Geometry.base_width),' h=',dbgs(Geometry.base_height));
if AFixedWidthHeight then
gtk_window_set_geometry_hints({%H-}PGtkWindow(AForm.Handle), nil, @Geometry,
GDK_HINT_POS or GDK_HINT_MIN_SIZE or GDK_HINT_MAX_SIZE)