paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-30 16:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL/TListView: More complete fix of issue #39708, based on patch by d7_2_laz (https://forum.lazarus.freepascal.org/index.php/topic,59024.msg441180.html#msg441180).

Browse Source
This commit is contained in:
wp_xyz 2022-04-27 10:38:14 +02:00
parent 284c98021d
commit c0c30424de
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/include/customlistview.inc
View File

@ -331,11 +331,13 @@ begin
// checkbox
if Checkboxes then
DoItemChecked(Item);
// end editing
if IsEditing then
HideEditor;
if (IsEditing and OwnerData) then
if (nm^.iItem = -1) And (FSelectedIdx<>-1) then
if TWSCustomListViewClass(WidgetSetClass).MustHideEditor(self, FSelectedIdx) then
HideEditor;
// focus
if (nm^.uOldState and LVIS_FOCUSED) <> (nm^.uNewState and LVIS_FOCUSED) then
begin

1
lcl/interfaces/win32/win32wscomctrls.pp
View File

@ -200,6 +200,7 @@ type
class function GetFirstSelected(const ALV: TCustomListView): TListItem; override;
class procedure InitMultiSelList(const ALV: TCustomListView; AEnable: Boolean); override;
class procedure UpdateMultiSelList(const ALV: TCustomListView; AItem: TListItem; Add: Boolean); override;
class function MustHideEditor(const ALV: TCustomListView; ASelectedIdx: Integer): Boolean; override;
end;
{ TWin32WSListView }

13
lcl/interfaces/win32/win32wscustomlistview.inc
View File

@ -60,6 +60,7 @@ var
ListViewWindProcInfo: record
ActiveListView: TCustomListView;
NoMouseUp: Boolean;
ClickedIdx: Integer;
end;
function ListViewParentMsgHandler(const AWinControl: TWinControl; Window: HWnd;
@ -833,6 +834,12 @@ begin
ListView := TListView(WindowInfo^.WinControl);
ListItem := ListView.GetItemAt(GET_X_LPARAM(LParam), GET_Y_LPARAM(LParam));
if (Msg = WM_LBUTTONDOWN) or (Msg = WM_RBUTTONDOWN) then
if ListItem = nil then
ListViewWindProcInfo.ClickedIdx := -1
else
ListViewWindProcInfo.ClickedIdx := ListItem.Index;
if Msg = WM_LBUTTONDOWN
then AMsg := LM_LBUTTONUP
else AMsg := LM_RBUTTONUP;
@ -1508,3 +1515,9 @@ class procedure TWin32WSCustomListView.UpdateMultiSelList(const ALV: TCustomList
begin
end;
class function TWin32WSCustomListView.MustHideEditor(const ALV: TCustomListview;
ASelectedIdx: Integer): Boolean;
begin
result := ASelectedIdx <> ListViewWindProcInfo.ClickedIdx;
end;

8
lcl/widgetset/wscomctrls.pp
View File

@ -183,6 +183,8 @@ type
class function GetFirstSelected(const ALV: TCustomListView): TListItem; virtual;
class procedure InitMultiSelList(const ALV: TCustomListView; AEnable: Boolean); virtual;
class procedure UpdateMultiSelList(const ALV: TCustomListView; AItem: TListItem; Add: Boolean); virtual;
class function MustHideEditor(const ALV: TCustomListView; ASelectedIdx: Integer): Boolean; virtual;
end;
TWSCustomListViewClass = class of TWSCustomListView;
@ -902,6 +904,12 @@ begin
end;
end;
class function TWSCustomListView.MustHideEditor(const ALV: TCustomListView;
ASelectedIdx: Integer): Boolean;
begin
Result := false;
end;
{ TWSProgressBar }