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

Gtk3: fixed wrong value set to natural height of lclgtk* controls.

Browse Source
This commit is contained in:
zeljan1 2025-01-22 21:50:29 +01:00
parent 4374f2360f
commit 6668cb44c4
5 changed files with 25 additions and 25 deletions

16
lcl/interfaces/gtk3/gtk3lclbutton.inc
View File

@ -44,11 +44,11 @@ begin
if AControl.LCLWidth = 0 then
begin
min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^, AControl.LCLObject.Width);
end else
begin
min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^, AControl.LCLWidth);
end;
end;
@ -94,11 +94,11 @@ begin
if AControl.LCLHeight = 0 then
begin
min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^, AControl.LCLObject.Height);
end else
begin
min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^, AControl.LCLHeight);
end;
end;
@ -111,11 +111,11 @@ begin
AWidgetClass^.get_preferred_height := @LCLGtkButtonGetPreferredHeight;
end;
procedure LCLGtkButtonInstanceInit(instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
var
buttonWidget: PGtkButton;
procedure LCLGtkButtonInstanceInit({%H-}instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
//var
// buttonWidget: PGtkButton;
begin
buttonWidget := PGtkButton(instance);
//buttonWidget := PGtkButton(instance);
// Custom initialization logic (if needed)
end;

8
lcl/interfaces/gtk3/gtk3lclcombobox.inc
View File

@ -46,11 +46,11 @@ begin
if AControl.LCLWidth = 0 then
begin
min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^, AControl.LCLObject.Width);
end else
begin
min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^, AControl.LCLWidth);
end;
end;
@ -96,11 +96,11 @@ begin
if AControl.LCLHeight = 0 then
begin
min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^, AControl.LCLObject.Height);
end else
begin
min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^, AControl.LCLHeight);
end;
end;

8
lcl/interfaces/gtk3/gtk3lclentry.inc
View File

@ -42,11 +42,11 @@ begin
if AControl.LCLWidth = 0 then
begin
min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^, AControl.LCLObject.Width);
end else
begin
min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^, AControl.LCLWidth);
end;
end;
@ -91,11 +91,11 @@ begin
if AControl.LCLHeight = 0 then
begin
min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^, AControl.LCLObject.Height);
end else
begin
min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^, AControl.LCLHeight);
end;
end;

8
lcl/interfaces/gtk3/gtk3lclframe.inc
View File

@ -51,11 +51,11 @@ begin
if AControl.LCLWidth = 0 then
begin
min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^, AControl.LCLObject.Width);
end else
begin
min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^, AControl.LCLWidth);
end;
end;
@ -105,11 +105,11 @@ begin
if AControl.LCLHeight = 0 then
begin
min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^, AControl.LCLObject.Height);
end else
begin
min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^, AControl.LCLHeight);
end;
end;

10
lcl/interfaces/gtk3/gtk3lclspinbutton.inc
View File

@ -44,11 +44,11 @@ begin
if AControl.LCLWidth = 0 then
begin
min_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^ div 2, AControl.LCLObject.Width);
nat_width^ := Max(min_width^, AControl.LCLObject.Width);
end else
begin
min_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^ div 2, AControl.LCLWidth);
nat_width^ := Max(min_width^, AControl.LCLWidth);
end;
end;
@ -93,11 +93,11 @@ begin
if AControl.LCLHeight = 0 then
begin
min_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^ div 2, AControl.LCLObject.Height);
nat_height^ := Max(min_height^, AControl.LCLObject.Height);
end else
begin
min_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^ div 2, AControl.LCLHeight);
nat_height^ := Max(min_height^, AControl.LCLHeight);
end;
end;
@ -110,7 +110,7 @@ begin
AWidgetClass^.get_preferred_height := @LCLGtkSpinButtonGetPreferredHeight;
end;
procedure LCLGtkSpinButtonInstanceInit(instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
procedure LCLGtkSpinButtonInstanceInit({%H-}instance: PGTypeInstance; {%H-}klass: PGTypeClass); cdecl;
// var
// buttonWidget: PGtkSpinButton;
begin