mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 20:28:19 +02:00
gtk2 intf: removed ythickness from preferred sizes of gtk_button
git-svn-id: trunk@12482 -
This commit is contained in:
parent
5c6f96fcaf
commit
2a5042eef4
@ -125,7 +125,8 @@ end;
|
||||
Returns:
|
||||
|
||||
------------------------------------------------------------------------------}
|
||||
function TGtkWidgetSet.RawImage_CreateBitmaps(const ARawImage: TRawImage; out ABitmap, AMask: HBitmap; ASkipMask: Boolean): boolean;
|
||||
function TGtkWidgetSet.RawImage_CreateBitmaps(const ARawImage: TRawImage;
|
||||
out ABitmap, AMask: HBitmap; ASkipMask: Boolean): boolean;
|
||||
type
|
||||
TFourBytes = packed record
|
||||
B0,B1,B2,B3: Byte;
|
||||
@ -807,5 +808,3 @@ begin
|
||||
end;
|
||||
{$endif}
|
||||
|
||||
|
||||
|
||||
|
@ -6620,12 +6620,15 @@ begin
|
||||
PreferredWidth:=Requisition.width;
|
||||
PreferredHeight:=Requisition.height;
|
||||
if not WithThemeSpace then begin
|
||||
//DebugLn('GetGTKDefaultWidgetSize ',DbgSName(AWinControl),' ',dbgs(gtk_widget_get_xthickness(Widget)),' ythickness=',dbgs(gtk_widget_get_ythickness(Widget)));
|
||||
//DebugLn(['GetGTKDefaultWidgetSize ',GetWidgetDebugReport(Widget)]);
|
||||
//debugLn('GetGTKDefaultWidgetSize ',DbgSName(AWinControl),' ',dbgs(gtk_widget_get_xthickness(Widget)),' ythickness=',dbgs(gtk_widget_get_ythickness(Widget)));
|
||||
//debugLn(['GetGTKDefaultWidgetSize ',GetWidgetDebugReport(Widget)]);
|
||||
//dec(PreferredWidth,gtk_widget_get_xthickness(Widget));
|
||||
{$IFDEF Gtk1}
|
||||
if not GtkWidgetIsA(Widget,GTK_ENTRY_TYPE) then
|
||||
dec(PreferredHeight,2*gtk_widget_get_ythickness(Widget));
|
||||
{$ELSE}
|
||||
if GtkWidgetIsA(Widget,GTK_TYPE_BUTTON) then
|
||||
dec(PreferredHeight,2*gtk_widget_get_ythickness(Widget));
|
||||
{$ENDIF}
|
||||
end;
|
||||
{DebugLn(['GetGTKDefaultWidgetSize Allocation=',Widget^.allocation.x,',',Widget^.allocation.y,',',Widget^.allocation.width,',',Widget^.allocation.height,
|
||||
|
Loading…
Reference in New Issue
Block a user