win32 interface: don't restrict the height of a csSimple combobox (issue #13765)

git-svn-id: trunk@20109 -
This commit is contained in:
vincents 2009-05-21 20:19:16 +00:00
parent 9bd290d86e
commit 299f68fb06
2 changed files with 4 additions and 2 deletions

View File

@ -379,8 +379,8 @@ begin
if (FSender is TCustomComboBox) and (TCustomComboBox(FSender).Style = csSimple) then if (FSender is TCustomComboBox) and (TCustomComboBox(FSender).Style = csSimple) then
begin begin
// combobox workaround: // combobox workaround:
// if style = csSimple FEditHeight = Edit Height + Listbox Height // if style = csSimple follow the LCL height.
Result := FEditHeight; Result := FSender.Height;
end else end else
begin begin
if Count = 0 then if Count = 0 then

View File

@ -797,6 +797,8 @@ class procedure TWin32WSCustomComboBox.AdaptBounds(const AWinControl: TWinContro
var var
StringList: TWin32ComboBoxStringList; StringList: TWin32ComboBoxStringList;
begin begin
if TCustomComboBox(AWinControl).Style=csSimple
then exit;
StringList := GetStringList(TCustomComboBox(AWinControl)); StringList := GetStringList(TCustomComboBox(AWinControl));
if StringList <> nil then if StringList <> nil then
Height := StringList.ComboHeight; Height := StringList.ComboHeight;