|
|
|
|
|
|
|
|
|
|
Not blocker, postponed. |
|
|
|
gtk2-groupbox-autosize.patch (1,606 bytes)
Index: lcl/interfaces/gtk2/gtk2wsstdctrls.pp
===================================================================
--- lcl/interfaces/gtk2/gtk2wsstdctrls.pp (revision 45769)
+++ lcl/interfaces/gtk2/gtk2wsstdctrls.pp (working copy)
@@ -2365,32 +2365,9 @@
class procedure TGtk2WSCustomGroupBox.GetPreferredSize(
const AWinControl: TWinControl; var PreferredWidth, PreferredHeight: integer;
WithThemeSpace: Boolean);
-var
- Widget: PGtkWidget;
- border_width: Integer;
begin
- Widget := PGtkWidget(GetFrameWidget({%H-}PGTKEventBox(AWinControl.Handle)));
-
- if Assigned(PGtkFrame(Widget)^.label_widget) then
- begin
- PreferredWidth := gtk_widget_get_xthickness(Widget) * 2 +
- gtk_widget_get_xthickness(PGtkFrame(Widget)^.label_widget);
- PreferredHeight := Max(gtk_widget_get_ythickness(Widget),
- gtk_widget_get_ythickness(PGtkFrame(Widget)^.label_widget)) +
- gtk_widget_get_ythickness(Widget);
- end else
- begin
- PreferredWidth := gtk_widget_get_xthickness(Widget) * 2;
- PreferredHeight := gtk_widget_get_ythickness(Widget) * 2;
- end;
-
- if WithThemeSpace then
- begin
- border_width := (PGtkContainer(Widget)^.flag0 and bm_TGtkContainer_border_width) shr
- bp_TGtkContainer_border_width;
- inc(PreferredWidth, border_width);
- inc(PreferredHeight, 2 * border_width);
- end;
+ GetGTKDefaultWidgetSize(AWinControl, PreferredWidth, PreferredHeight,
+ WithThemeSpace);
end;
class procedure TGtk2WSCustomGroupBox.SetFont(const AWinControl: TWinControl;
|
|
|
|
I've uploaded a patch with a fix for the gtk2 interface. Can anyone give me a tip for how to fix it in the win32 interface? |
|
|
|
Thanks, I applied your patch in r45786. Looks good.
I will keep this open at least until LCL-Win is fixed.
Lazarus mailng list may be the best place to ask about win32 interface code.
Vincent used to work on it but he has not been active recently. I guess you must dive into the code and figure it out. It is doable, even I have changed some things there when I had to. |
|
|
|
win32wsstdctrls.pp.patch (1,210 bytes)
Index: lcl/interfaces/win32/win32wsstdctrls.pp
===================================================================
--- lcl/interfaces/win32/win32wsstdctrls.pp (revision 45786)
+++ lcl/interfaces/win32/win32wsstdctrls.pp (working copy)
@@ -54,6 +54,9 @@
const AParams: TCreateParams): HWND; override;
class procedure SetBiDiMode(const AWinControl: TWinControl; UseRightToLeftAlign,
UseRightToLeftReading, UseRightToLeftScrollBar : Boolean); override;
+ class procedure GetPreferredSize(const AWinControl: TWinControl;
+ var PreferredWidth, PreferredHeight: integer;
+ WithThemeSpace: Boolean); override;
end;
{ TWin32WSGroupBox }
@@ -560,6 +563,17 @@
RecreateWnd(AWinControl);
end;
+class procedure TWin32WSCustomGroupBox.GetPreferredSize(
+ const AWinControl: TWinControl; var PreferredWidth, PreferredHeight: integer;
+ WithThemeSpace: Boolean);
+begin
+ if MeasureText(AWinControl, AWinControl.Caption, PreferredWidth,
+ PreferredHeight) then begin
+ PreferredWidth += 19;
+ PreferredHeight += 4;
+ end;
+end;
+
{ TWin32WSCustomListBox }
function ListBoxWindowProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam;
|
|
|
|
I've uploaded a patch for Windows. I see a lot of border sizes are hardcoded in the Windows interface, look for example at the other GetPreferredSize implementations in that unit. I don't know if there's a better way to do it, but it seems to work OK on Vista with and without the aero theme. I don't know if extra space should be allowed in the case of WithThemeSpace. |
|
|
|
Cool, thanks. I applied it in r45795.
Finally the other widgetsets should follow this logic as well. Are you planning to provide more patches or should I resolve this issue? |
|
|
|
qt-groupbox-prefsize.patch (1,603 bytes)
Index: lcl/interfaces/qt/qtwidgets.pas
===================================================================
--- lcl/interfaces/qt/qtwidgets.pas (revision 45807)
+++ lcl/interfaces/qt/qtwidgets.pas (working copy)
@@ -7730,7 +7730,7 @@
ASize: TSize;
begin
QWidget_getContentsMargins(Widget,@L, @T, @R, @B);
- QWidget_sizeHint(Widget, @ASize);
+ QGroupBox_minimumSizeHint(QGroupBoxH(Widget), @ASize);
PreferredWidth := ASize.cx + L + R;
PreferredHeight := ASize.cy + B + T;
{$IFDEF VerboseQtResize}
Index: lcl/interfaces/qt/qtwsstdctrls.pp
===================================================================
--- lcl/interfaces/qt/qtwsstdctrls.pp (revision 45807)
+++ lcl/interfaces/qt/qtwsstdctrls.pp (working copy)
@@ -55,6 +55,8 @@
class function GetDefaultClientRect(const AWinControl: TWinControl;
const aLeft, aTop, aWidth, aHeight: integer; var aClientRect: TRect
): boolean; override;
+ class procedure GetPreferredSize(const AWinControl: TWinControl;
+ var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); override;
end;
{ TQtWSGroupBox }
@@ -1317,6 +1319,15 @@
end;
end;
+class procedure TQtWSCustomGroupBox.GetPreferredSize(
+ const AWinControl: TWinControl; var PreferredWidth, PreferredHeight: integer;
+ WithThemeSpace: Boolean);
+begin
+ if AWinControl.HandleAllocated then
+ TQtGroupBox(AWinControl.Handle).PreferredSize(PreferredWidth,
+ PreferredHeight, WithThemeSpace);
+end;
+
{ TQtWSCustomComboBox }
{------------------------------------------------------------------------------
|
|
|
|
Patch for Qt uploaded. Since these patches are quite small, could I ask for them to be merged into fixes_1_2, please? |
|
|
|
@Juha, pls commit win32 and qt patches and close issue. Also add all (gtk2,win32 and qt) revisions about this issue to the merge list: http://wiki.lazarus.freepascal.org/Lazarus_1.2_fixes_branch |
|
|
|
Done.
Thanks for the patches.
Please test. |
|
