paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 21:41:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: TCocoaComboBox: refactor and comments

Browse Source
This commit is contained in:
rich2014 2023-06-23 12:54:16 +08:00
parent b9b1f7f310
commit 8b426df777
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/cocoa/cocoatextedits.pas
View File

@ -1402,19 +1402,25 @@ function TCocoaComboBox.comboBox_indexOfItemWithStringValue(
aComboBox: NSComboBox; string_: NSString): NSUInteger;
var
idx : integer;
lclString: String;
lclCmb : TObject;
begin
idx := indexOfSelectedItem;
if (idx>=0) and (idx<list.Count) and (list[idx]=string_.UTF8String) then
lclString := string_.UTF8String;
lclCmb := lclGetTarget;
if (idx>=0) and (idx<list.Count) and (list[idx]=lclString) then
// this is used for the case of the same items in the combobox
Result:=idx
else
begin
idx := TCocoaWSCustomComboBox.GetObjectItemIndex(aComboBox.lclGetTarget);
idx := TCocoaWSCustomComboBox.GetObjectItemIndex(lclCmb);
if idx<0 then
Result := NSNotFound
else
begin
TComboBoxAsyncHelper.ResetTextIfNecessary(lclGetTarget, string_.UTF8String);
// ComboBox.Text will be set to the List Item value after comboBox_indexOfItemWithStringValue()
// so if cbactRetainPrefixCase set, ComboBox.Text should be reset Async
TComboBoxAsyncHelper.ResetTextIfNecessary(lclCmb, lclString);
Result := idx;
end;
end;