paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 06:40:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed OnItemChecked event for TListView when ViewStyle <> vsReport by using internal check state. issue #21446

Browse Source 
git-svn-id: trunk@35836 -
This commit is contained in:
zeljko 2012-03-09 08:48:05 +00:00
parent 70a3961aa6
commit 7ebe5af938
2 changed files with 104 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1183,6 +1183,8 @@ type
FItemClickedHook: QListWidget_hookH;
FItemTextChangedHook: QListWidget_hookH;
FDontPassSelChange: Boolean;
procedure HandleCheckChangedEvent(const AMousePos: TQtPoint;
AItem: QListWidgetItemH; AEvent: QEventH);
function GetItemChecked(AIndex: Integer): Boolean;
function getItemCount: Integer;
function GetItemEnabled(AIndex: Integer): Boolean;
@ -1196,8 +1198,8 @@ type
procedure OwnerDataNeeded(ARect: TRect); override;
function GetItemFlags(AIndex: Integer): QtItemFlags; override;
procedure SetItemFlags(AIndex: Integer; AValue: QtItemFlags); override;
function GetItemLastCheckState(AItem: QListWidgetItemH): QtCheckState;
procedure SetItemLastCheckState(AItem: QListWidgetItemH);
procedure SetItemLastCheckStateInternal(AItem: QListWidgetItemH; AState: QtCheckState);
procedure SetNextStateMap(AItem: QListWidgetItemH); virtual;
public
FList: TStrings;
@ -1218,6 +1220,7 @@ type
procedure ClearItems;
function currentRow: Integer;
function currentItem: QListWidgetItemH;
function GetItemLastCheckState(AItem: QListWidgetItemH): QtCheckState;
function IndexAt(APoint: PQtPoint): Integer;
procedure insertItem(AIndex: Integer; AText: String); overload;
procedure insertItem(AIndex: Integer; AText: PWideString); overload;
@ -10220,6 +10223,14 @@ begin
if AItem = nil then
exit;
AState := QListWidgetItem_checkState(AItem);
SetItemLastCheckStateInternal(AItem, AState);
end;
procedure TQtListWidget.SetItemLastCheckStateInternal(AItem: QListWidgetItemH;
AState: QtCheckState);
var
v: QVariantH;
begin
v := QVariant_create(Ord(AState));
QListWidgetItem_setData(AItem, QtCheckStateRole, v);
QVariant_destroy(v);
@ -10440,7 +10451,83 @@ begin
Such events are handled by itemViewportEventFilter.
With Qt TListBox and TCheckListBox are also affected. issue #21318}
else
begin
Result:=inherited EventFilter(Sender, Event);
if Checkable and
(QEvent_type(Event) = QEventKeyPress) and
(QKeyEvent_key(QKeyEventH(Event)) = QtKey_Space) then
begin
if CurrentItem <> nil then
HandleCheckChangedEvent(QtPoint(0, 0), currentItem, Event);
end;
end;
end;
end;
procedure TQtListWidget.HandleCheckChangedEvent(const AMousePos: TQtPoint;
AItem: QListWidgetItemH; AEvent: QEventH);
var
xx: Integer;
// Msg: TLMessage;
ItemRow: Integer;
B: Boolean;
procedure SendMessage;
var
Msg: TLMNotify;
NMLV: TNMListView;
begin
FillChar(Msg, SizeOf(Msg), #0);
FillChar(NMLV, SizeOf(NMLV), #0);
Msg.Msg := CN_NOTIFY;
NMLV.hdr.hwndfrom := HWND(Self);
NMLV.hdr.code := LVN_ITEMCHANGED;
NMLV.iItem := QListWidget_row(QListWidgetH(Widget), AItem);
NMLV.uNewState := UINT(B);
NMLV.uChanged := LVIF_STATE;
Msg.NMHdr := @NMLV.hdr;
// DebugLn('HandleCheckableMouseDown sending LVN_ITEMCHANGED ...');
DeliverMessage(Msg);
end;
begin
if not Checkable or (AItem = nil) then
exit;
if ((QEvent_type(AEvent) = QEventMouseButtonPress) or
(QEvent_type(AEvent) = QEventMouseButtonDblClick)) and
(QMouseEvent_button(QMouseEventH(AEvent)) = QtLeftButton) then
begin
if (QListWidgetItem_flags(AItem) and QtItemIsUserCheckable) <> 0 then
begin
xx := GetPixelMetric(QStylePM_IndicatorWidth, nil, Widget);
if ((AMousePos.X > 2) and (AMousePos.X <= (xx + 2))) then
begin
B := QListWidgetItem_checkState(AItem) = QtUnChecked;
if B then
SetItemLastCheckStateInternal(AItem, QtChecked)
else
SetItemLastCheckStateInternal(AItem, QtUnChecked);
SendMessage;
end;
end;
end else
if (QEvent_type(AEvent) = QEventKeyPress) and
(QKeyEvent_key(QKeyEventH(AEvent)) = QtKey_Space) then
begin
B := QListWidgetItem_checkState(AItem) = QtUnChecked;
if B then
SetItemLastCheckStateInternal(AItem, QtChecked)
else
SetItemLastCheckStateInternal(AItem, QtUnChecked);
SendMessage;
end;
end;
@ -10498,6 +10585,8 @@ begin
Modifiers := QInputEvent_modifiers(QInputEventH(Event));
SlotMouse(Sender, Event);
HandleCheckChangedEvent(MousePos, Item, Event);
if not QListWidgetItem_isSelected(Item) then
begin
if Modifiers = 0 then
@ -10584,6 +10673,7 @@ begin
end else
begin
SlotMouse(Sender, Event);
HandleCheckChangedEvent(MousePos, Item, Event);
if not QListWidgetItem_isSelected(Item) then
QListWidget_setCurrentItem(QListWidgetH(Widget), Item, QItemSelectionModelSelect);
QEvent_ignore(Event);
@ -10593,6 +10683,14 @@ begin
end;
end;
if Checkable and (QEvent_type(Event) = QEventMouseButtonDblClick) then
begin
MousePos := QMouseEvent_pos(QMouseEventH(Event))^;
Item := itemAt(MousePos.x, MousePos.y);
if Item <> nil then
HandleCheckChangedEvent(MousePos, Item, Event);
end;
Result := inherited itemViewViewportEventFilter(Sender, Event);
end;
end else

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

@ -1146,7 +1146,7 @@ begin
begin
LWI := TQtListWidget(ALV.Handle).getItem(AIndex);
if LWI <> nil then
AState := QListWidgetItem_checkState(LWI);
AState := TQtListWidget(ALV).GetItemLastCheckState(LWI);
end else
begin
QtTreeWidget := TQtTreeWidget(ALV.Handle);
@ -1315,6 +1315,7 @@ class procedure TQtWSCustomListView.ItemSetChecked(const ALV: TCustomListView;
var
QtListWidget: TQtListWidget;
QtTreeWidget: TQtTreeWidget;
B: Boolean;
begin
if not WSCheckHandleAllocated(ALV, 'ItemSetChecked') then
Exit;
@ -1325,7 +1326,9 @@ begin
if IsIconView(ALV) then
begin
QtListWidget := TQtListWidget(ALV.Handle);
QtListWidget.ItemChecked[AIndex] := AChecked;
B := QtListWidget.GetItemLastCheckState(QtListWidget.getItem(AIndex)) = QtChecked;
if B <> AChecked then
QtListWidget.ItemChecked[AIndex] := AChecked;
end else
begin
QtTreeWidget := TQtTreeWidget(ALV.Handle);