paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 18:22:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed msg providing to LCL when deselection of items occured by mouse click into listview viewport. issue #18972

Browse Source 
git-svn-id: trunk@30078 -
This commit is contained in:
zeljko 2011-03-30 09:53:16 +00:00
parent e0f19a0bea
commit bf7ad8a2f9
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lcl/interfaces/qt/qtwidgets.pas
View File

@ -1086,6 +1086,7 @@ type
TQtListWidget = class(TQtListView) TQtListWidget = class(TQtListView)
private private
FSavedSelection: TPtrIntArray;
FCurrentItemChangedHook: QListWidget_hookH; FCurrentItemChangedHook: QListWidget_hookH;
FSelectionChangeHook: QListWidget_hookH; FSelectionChangeHook: QListWidget_hookH;
FItemClickedHook: QListWidget_hookH; FItemClickedHook: QListWidget_hookH;
@ -8692,6 +8693,7 @@ function TQtListWidget.CreateWidget(const AParams: TCreateParams): QWidgetH;
var var
Parent: QWidgetH; Parent: QWidgetH;
begin begin
SetLength(FSavedSelection, 0);
FSavedEvent := nil; FSavedEvent := nil;
FSavedEventTimer := nil; FSavedEventTimer := nil;
FSavedEventTimerHook := nil; FSavedEventTimerHook := nil;
@ -8899,7 +8901,17 @@ begin
if QEvent_type(Event) = QEventMouseButtonRelease then if QEvent_type(Event) = QEventMouseButtonRelease then
PostponedMouseRelease(Event) PostponedMouseRelease(Event)
else else
begin
if (QEvent_type(Event) = QEventMouseButtonPress) then
begin
MousePos := QMouseEvent_pos(QMouseEventH(Event))^;
Item := itemAt(MousePos.x, MousePos.y);
if Item = nil then
FSavedSelection := selectedItems;
end;
Result := inherited itemViewViewportEventFilter(Sender, Event); Result := inherited itemViewViewportEventFilter(Sender, Event);
end;
end else end else
case QEvent_type(Event) of case QEvent_type(Event) of
QEventMouseButtonPress, QEventMouseButtonPress,
@ -8952,7 +8964,10 @@ begin
NMLV.hdr.hwndfrom := LCLObject.Handle; NMLV.hdr.hwndfrom := LCLObject.Handle;
NMLV.hdr.code := LVN_ITEMCHANGING; NMLV.hdr.code := LVN_ITEMCHANGING;
AIndex := getRow(Current); if Current <> nil then
AIndex := getRow(Current)
else
AIndex := -1;
ASubIndex := 0; ASubIndex := 0;
@ -9016,6 +9031,8 @@ end;
procedure TQtListWidget.signalSelectionChanged(); cdecl; procedure TQtListWidget.signalSelectionChanged(); cdecl;
var var
Msg: TLMessage; Msg: TLMessage;
i: Integer;
Item: QListWidgetItemH;
begin begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
WriteLn('TQtListWidget.signalSelectionChange'); WriteLn('TQtListWidget.signalSelectionChange');
@ -9027,13 +9044,31 @@ begin
Exit; Exit;
end; end;
if ViewStyle >= 0 then if (ViewStyle >= 0) and (InUpdate or
(not InUpdate and (length(FSavedSelection) = 0)) ) then
exit; exit;
FillChar(Msg, SizeOf(Msg), #0); FillChar(Msg, SizeOf(Msg), #0);
Msg.Msg := LM_SELCHANGE; Msg.Msg := LM_SELCHANGE;
if (getSelCount > 0) and (FChildOfComplexWidget <> ccwComboBox) then if (FChildOfComplexWidget <> ccwComboBox) then
DeliverMessage(Msg); begin
if (ViewStyle < 0) and (getSelCount > 0) then
DeliverMessage(Msg)
else
if (ViewStyle >= 0) then
begin
if getSelCount = 0 then
begin
for i := 0 to High(FSavedSelection) do
begin
Item := QListWidgetItemH(FSavedSelection[i]);
if (Item <> nil) then
signalItemClicked(Item);
end;
end;
setLength(FSavedSelection, 0);
end;
end;
end; end;
procedure TQtListWidget.signalItemTextChanged(ANewText: PWideString); cdecl; procedure TQtListWidget.signalItemTextChanged(ANewText: PWideString); cdecl;

2
lcl/interfaces/qt/qtwscomctrls.pp
View File

@ -1243,10 +1243,12 @@ begin
begin begin
QtListWidget := TQtListWidget(ALV.Handle); QtListWidget := TQtListWidget(ALV.Handle);
LWI := QtListWidget.getItem(AIndex); LWI := QtListWidget.getItem(AIndex);
QtListWidget.BeginUpdate;
case AState of case AState of
lisFocused: QtListWidget.setCurrentItem(LWI); lisFocused: QtListWidget.setCurrentItem(LWI);
lisSelected: QtListWidget.setItemSelected(LWI, AIsSet); lisSelected: QtListWidget.setItemSelected(LWI, AIsSet);
end; end;
QtListWidget.EndUpdate;
end else end else
begin begin
QtTreeWidget := TQtTreeWidget(ALV.Handle); QtTreeWidget := TQtTreeWidget(ALV.Handle);