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

gtk2 intf: removed ythickness from preferred sizes of gtk_button

Browse Source 
git-svn-id: trunk@12482 -
This commit is contained in:
mattias 2007-10-15 22:37:37 +00:00
parent 5c6f96fcaf
commit 2a5042eef4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/gtk/gtklclintf.inc
View File

@ -125,7 +125,8 @@ end;
Returns: 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 type
TFourBytes = packed record TFourBytes = packed record
B0,B1,B2,B3: Byte; B0,B1,B2,B3: Byte;
@ -807,5 +808,3 @@ begin
end; end;
{$endif} {$endif}

7
lcl/interfaces/gtk/gtkproc.inc
View File

@ -6620,12 +6620,15 @@ begin
PreferredWidth:=Requisition.width; PreferredWidth:=Requisition.width;
PreferredHeight:=Requisition.height; PreferredHeight:=Requisition.height;
if not WithThemeSpace then begin if not WithThemeSpace then begin
//DebugLn('GetGTKDefaultWidgetSize ',DbgSName(AWinControl),' ',dbgs(gtk_widget_get_xthickness(Widget)),' ythickness=',dbgs(gtk_widget_get_ythickness(Widget))); //debugLn('GetGTKDefaultWidgetSize ',DbgSName(AWinControl),' ',dbgs(gtk_widget_get_xthickness(Widget)),' ythickness=',dbgs(gtk_widget_get_ythickness(Widget)));
//DebugLn(['GetGTKDefaultWidgetSize ',GetWidgetDebugReport(Widget)]); //debugLn(['GetGTKDefaultWidgetSize ',GetWidgetDebugReport(Widget)]);
//dec(PreferredWidth,gtk_widget_get_xthickness(Widget)); //dec(PreferredWidth,gtk_widget_get_xthickness(Widget));
{$IFDEF Gtk1} {$IFDEF Gtk1}
if not GtkWidgetIsA(Widget,GTK_ENTRY_TYPE) then if not GtkWidgetIsA(Widget,GTK_ENTRY_TYPE) then
dec(PreferredHeight,2*gtk_widget_get_ythickness(Widget)); 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} {$ENDIF}
end; end;
{DebugLn(['GetGTKDefaultWidgetSize Allocation=',Widget^.allocation.x,',',Widget^.allocation.y,',',Widget^.allocation.width,',',Widget^.allocation.height, {DebugLn(['GetGTKDefaultWidgetSize Allocation=',Widget^.allocation.x,',',Widget^.allocation.y,',',Widget^.allocation.width,',',Widget^.allocation.height,