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

customdrawn: Fixes combobox width autosize

Browse Source 
git-svn-id: trunk@48890 -
This commit is contained in:
sekelsenmat 2015-04-29 09:19:19 +00:00
parent c6d6f8c7a6
commit 960e2242e9
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/customdrawn_common.pas
View File

@ -324,22 +324,25 @@ begin
cidEdit: PreferredHeight := GetMeasuresEx(ADest, TCDCONTROL_CAPTION_HEIGHT, AState, AStateEx)+8;
cidCheckBox, cidRadioButton:
begin
if AStateEx.AutoSize then begin
if AStateEx.AutoSize and AAllowUseOfMeasuresEx then
begin
PreferredWidth := GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT);
PreferredWidth := PreferredWidth
+ GetMeasuresEx(ADest, TCDCONTROL_CAPTION_WIDTH, AState, AStateEx) + 6;
end;
PreferredHeight :=
Max(GetMeasuresEx(ADest, TCDCONTROL_CAPTION_HEIGHT, AState, AStateEx),
GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT));
PreferredHeight := GetMeasures(TCDCHECKBOX_SQUARE_HEIGHT)
if AAllowUseOfMeasuresEx then
PreferredHeight := Max(PreferredHeight,
GetMeasuresEx(ADest, TCDCONTROL_CAPTION_HEIGHT, AState, AStateEx));
end;
// In the LCL TComboBox AutoSizes only its Height, so follow this here
cidComboBox:
begin
PreferredHeight := GetMeasures(TCDCOMBOBOX_DEFAULT_HEIGHT);
if AAllowUseOfMeasuresEx then
PreferredHeight := Max(GetMeasuresEx(ADest, TCDCONTROL_CAPTION_HEIGHT, AState, AStateEx),
PreferredHeight);
PreferredHeight := Max(PreferredHeight,
GetMeasuresEx(ADest, TCDCONTROL_CAPTION_HEIGHT, AState, AStateEx));
end;
end;
end;

12
lcl/interfaces/customdrawn/customdrawnwsstdctrls.pas
View File

@ -892,16 +892,18 @@ var
lCDWinControl: TCDWinControl;
lIntfComboBox: TCDIntfComboBox;
begin
// ToDo: Do something to correct the combobox height when autosized, now something in the LCL seams to hardcode it to 50...
lCDWinControl := TCDWinControl(AWinControl.Handle);
lIntfComboBox := TCDIntfComboBox(lCDWinControl.CDControl);
lIntfComboBox.LCLWSCalculatePreferredSize(PreferredWidth, PreferredHeight, WithThemeSpace, False, False);
//AWinControl.Height := PreferredHeight;
// The correct behavior for the LCL is not forcing any specific value for
// TComboBox.Width, so we set it to zero to signal that here
PreferredWidth := 0;
// TComboBox.Width, so widgetsets should set PreferredWidth to zero to
// use the user-provided value.
//
// But in LCL-CustomDrawn something strange happens (probably due to control injection)
// that requires setting PreferredWidth or else a default 50 will be used,
// this default size 50x75 is set at TControl.GetControlClassDefaultSize
PreferredWidth := AWinControl.Width;
end;
class procedure TCDWSCustomComboBox.SetItemIndex(