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

LCL: TComboBox: Fixed invisible mouse. Issue #34913

Browse Source 
git-svn-id: trunk@60126 -
This commit is contained in:
michl 2019-01-20 21:39:36 +00:00
parent 132af67a46
commit 71a9406fd6
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/include/customcombobox.inc
View File

@ -492,7 +492,6 @@ procedure TCustomComboBox.KeyDown(var Key: Word; Shift: TShiftState);
var var
Skip, UserDropDown, PreventDropDown: Boolean; Skip, UserDropDown, PreventDropDown: Boolean;
begin begin
FDroppingDown := False;
FEditingDone := Key = VK_RETURN; FEditingDone := Key = VK_RETURN;
Skip := False; Skip := False;
UserDropDown := ((Shift *[ssAlt] = [ssAlt]) and (Key = VK_DOWN)); UserDropDown := ((Shift *[ssAlt] = [ssAlt]) and (Key = VK_DOWN));
@ -530,7 +529,7 @@ begin
FReturnArrowState := True; FReturnArrowState := True;
Skip := True; Skip := True;
end; end;
FDroppingDown := True; DroppedDown := True;
if UserDropDown then if UserDropDown then
Skip := True; Skip := True;
end; end;
@ -547,11 +546,6 @@ var
sCompleteText, sPrefixText, sResultText: string; sCompleteText, sPrefixText, sResultText: string;
Utf8TextLen: Integer; Utf8TextLen: Integer;
begin begin
if DroppingDown then
begin
FDroppingDown := False;
DroppedDown := True;
end;
inherited KeyUp(Key, Shift); inherited KeyUp(Key, Shift);
//SelectAll when hitting return key for AutoSelect feature //SelectAll when hitting return key for AutoSelect feature
if (Key = VK_RETURN) then if (Key = VK_RETURN) then
@ -820,7 +814,6 @@ begin
FItemWidth := 0; FItemWidth := 0;
FMaxLength := 0; FMaxLength := 0;
FDropDownCount := 8; FDropDownCount := 8;
FDroppingDown := False;
FCanvas := TControlCanvas.Create; FCanvas := TControlCanvas.Create;
TControlCanvas(FCanvas).Control := Self; TControlCanvas(FCanvas).Control := Self;
ArrowKeysTraverseList := True; ArrowKeysTraverseList := True;

2
lcl/stdctrls.pp
View File

@ -386,7 +386,7 @@ type
procedure ClearSelection; //override; procedure ClearSelection; //override;
property CharCase: TEditCharCase read FCharCase write SetCharCase default ecNormal; property CharCase: TEditCharCase read FCharCase write SetCharCase default ecNormal;
property DroppedDown: Boolean read GetDroppedDown write SetDroppedDown; 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; procedure SelectAll;
property AutoComplete: boolean property AutoComplete: boolean
read GetAutoComplete write SetAutoComplete default False; read GetAutoComplete write SetAutoComplete default False;