From f34df6c717c6ecbd73a917348f07c9151e3f3da9 Mon Sep 17 00:00:00 2001 From: mattias Date: Thu, 24 Jan 2019 09:50:13 +0000 Subject: [PATCH] LCL: TComboBox: Fixed invisible mouse. Issue #34913 git-svn-id: branches/fixes_2_0@60199 - --- lcl/include/customcombobox.inc | 9 +-------- lcl/stdctrls.pp | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lcl/include/customcombobox.inc b/lcl/include/customcombobox.inc index 8d8aa6d05c..3d952dbc6c 100644 --- a/lcl/include/customcombobox.inc +++ b/lcl/include/customcombobox.inc @@ -489,7 +489,6 @@ procedure TCustomComboBox.KeyDown(var Key: Word; Shift: TShiftState); var Skip, UserDropDown, PreventDropDown: Boolean; begin - FDroppingDown := False; Skip := False; UserDropDown := ((Shift *[ssAlt] = [ssAlt]) and (Key = VK_DOWN)); PreventDropDown := Key in [VK_TAB, VK_RETURN, VK_ESCAPE]; @@ -526,7 +525,7 @@ begin FReturnArrowState := True; Skip := True; end; - FDroppingDown := True; + DroppedDown := True; if UserDropDown then Skip := True; end; @@ -543,11 +542,6 @@ var sCompleteText, sPrefixText, sResultText: string; Utf8TextLen: Integer; begin - if DroppingDown then - begin - FDroppingDown := False; - DroppedDown := True; - end; inherited KeyUp(Key, Shift); //SelectAll when hitting return key for AutoSelect feature if (Key = VK_RETURN) then @@ -816,7 +810,6 @@ begin FItemWidth := 0; FMaxLength := 0; FDropDownCount := 8; - FDroppingDown := False; FCanvas := TControlCanvas.Create; TControlCanvas(FCanvas).Control := Self; ArrowKeysTraverseList := True; diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index d27b237d97..db006970b1 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -385,7 +385,7 @@ type procedure ClearSelection; //override; property CharCase: TEditCharCase read FCharCase write SetCharCase default ecNormal; property DroppedDown: Boolean read GetDroppedDown write SetDroppedDown; - property DroppingDown: Boolean read FDroppingDown write FDroppingDown; + property DroppingDown: Boolean read FDroppingDown write FDroppingDown; deprecated 'Will be removed in 2.2'; procedure SelectAll; property AutoComplete: boolean read GetAutoComplete write SetAutoComplete default False;