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

Qt: TQtListWidget items sort rework, fixed AV introduced by previous TQtListWidget patch.

Browse Source 
git-svn-id: trunk@22179 -
This commit is contained in:
zeljko 2009-10-14 21:04:36 +00:00
parent 27b929c2a5
commit 89e1df3d7f
2 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -954,8 +954,10 @@ type
procedure resizeSection(ASection: Integer; ASize: Integer);
procedure setHighlightSections(AValue: Boolean);
procedure setDefaultSectionSize(AValue: Integer);
function SortIndicatorOrder: QtSortOrder;
procedure SetSortIndicator(const AColumn: Integer; const AOrder: QtSortOrder);
procedure SetSortIndicatorVisible(AVisible: Boolean);
procedure setStretchLastSection(AValue: Boolean);
function sortIndicatorOrder: QtSortOrder;
property Clickable: Boolean read getClickable write setClickable;
property MinSectionSize: Integer read getMinSectionSize write setMinSectionSize;
end;
@ -983,8 +985,10 @@ type
TQtTreeWidget = class(TQtTreeView)
private
FSyncingItems: Boolean;
FSorting: Boolean;
FHeader: TQtHeaderView;
FSectionClicked: QHeaderView_hookH;
FSortChanged: QHeaderView_hookH;
FHeaderEventFilterHook: QObject_hookH;
FCurrentItemChangedHook: QTreeWidget_hookH;
FItemDoubleClickedHook: QTreeWidget_hookH;
@ -1040,6 +1044,7 @@ type
procedure SignalitemExpanded(item: QTreeWidgetItemH) cdecl;
procedure SignalItemCollapsed(item: QTreeWidgetItemH) cdecl;
procedure SignalCurrentItemChanged(current: QTreeWidgetItemH; previous: QTreeWidgetItemH) cdecl;
procedure SignalSortIndicatorChanged(ALogicalIndex: Integer; AOrder: QtSortOrder) cdecl;
property ColCount: Integer read getColCount write setColCount;
property ItemCount: Integer read getItemCount;
@ -7149,6 +7154,11 @@ begin
Result := QHeaderView_minimumSectionSize(QHeaderViewH(Widget));
end;
function TQtHeaderView.SortIndicatorOrder: QtSortOrder;
begin
Result := QHeaderView_sortIndicatorOrder(QHeaderViewH(Widget));
end;
procedure TQtHeaderView.setClickable(const AValue: Boolean);
begin
QHeaderView_setClickable(QHeaderViewH(Widget), AValue);
@ -7159,6 +7169,17 @@ begin
QHeaderView_setMinimumSectionSize(QHeaderViewH(Widget), AValue);
end;
procedure TQtHeaderView.SetSortIndicator(const AColumn: Integer;
const AOrder: QtSortOrder);
begin
QHeaderView_setSortIndicator(QHeaderViewH(Widget), AColumn, AOrder);
end;
procedure TQtHeaderView.SetSortIndicatorVisible(AVisible: Boolean);
begin
QHeaderView_setSortIndicatorShown(QHeaderViewH(Widget), AVisible);
end;
{------------------------------------------------------------------------------
Function: TQtHeaderView.CreateWidget
Params: None
@ -7255,11 +7276,6 @@ begin
QHeaderView_setStretchLastSection(QHeaderViewH(Widget), AValue);
end;
function TQtHeaderView.sortIndicatorOrder: QtSortOrder;
begin
Result := QHeaderView_sortIndicatorOrder(QHeaderViewH(Widget));
end;
{ TQtTreeView }
function TQtTreeView.getColVisible(AIndex: Integer): Boolean;
@ -7325,6 +7341,7 @@ begin
WriteLn('TQtTreeWidget.Create');
{$endif}
FSyncingItems := False;
FSorting := False;
Result := QTreeWidget_create();
FHeader := nil;
QWidget_setAttribute(Result, QtWA_NoMousePropagation);
@ -7357,7 +7374,11 @@ begin
QObject_hook_hook_events(FHeaderEventFilterHook, @headerViewEventFilter);
FSectionClicked := QHeaderView_hook_create(FHeader.Widget);
QHeaderView_hook_hook_sectionClicked(FSectionClicked, @FHeader.SignalSectionClicked);
QHeaderView_hook_hook_sectionClicked(FSectionClicked,
@FHeader.SignalSectionClicked);
FSortChanged := QHeaderView_hook_create(FHeader.Widget);
QHeaderView_hook_hook_sortIndicatorChanged(FSortChanged,
@SignalSortIndicatorChanged);
end;
Result := FHeader;
end;
@ -7622,6 +7643,8 @@ begin
QObject_hook_destroy(FHeaderEventFilterHook);
if FSectionClicked <> nil then
QHeaderView_hook_destroy(FSectionClicked);
if FSortChanged <> nil then
QHeaderView_hook_destroy(FSortChanged);
inherited DetachEvents;
end;
@ -7895,6 +7918,21 @@ begin
end;
end;
procedure TQtTreeWidget.SignalSortIndicatorChanged(ALogicalIndex: Integer;
AOrder: QtSortOrder)cdecl;
begin
if FSorting or not Assigned(LCLObject) or not
QHeaderView_isSortIndicatorShown(QHeaderViewH(Header.Widget)) then
exit;
FSorting := True;
try
if ALogicalIndex >= 0 then
sortItems(ALogicalIndex, AOrder);
finally
FSorting := False;
end;
end;
{TQtTableView}
function TQtTableView.CreateWidget(const Params: TCreateParams): QWidgetH;

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

@ -1120,7 +1120,7 @@ begin
for i := 0 to AItem.SubItems.Count - 1 do
begin
AAlignment := QtAlignLeft;
if TListView(ALV).Columns.Count > 0 then
if (TListView(ALV).Columns.Count > 0) and (i + 1 < TListView(ALV).Columns.Count) then
AAlignment := AlignmentToQtAlignmentMap[ALV.Column[i + 1].Alignment];
Str := GetUtf8String(AItem.Subitems.Strings[i]);
QtTreeWidget.setItemText(TWI, i + 1, Str, AAlignment);
@ -1152,7 +1152,7 @@ begin
if TWI <> NiL then
begin
AAlignment := QtAlignLeft;
if TListView(ALV).Columns.Count > 0 then
if (TListView(ALV).Columns.Count > 0) and (ASubIndex < TListView(ALV).Columns.Count) then
AAlignment := AlignmentToQtAlignmentMap[ALV.Column[ASubIndex].Alignment];
QtTreeWidget.setItemText(TWI, ASubIndex, Str, AAlignment);
end;
@ -1297,17 +1297,15 @@ begin
QtTreeWidget := TQtTreeWidget(ALV.Handle);
if AType = stNone then
QtTreeWidget.SortEnabled := False
QtTreeWidget.Header.SetSortIndicatorVisible(False)
else
begin
QtTreeWidget.SortEnabled := True;
{$note for proper implementation of all TSortType
we have to implement item sorting roles.
if QtTreeWidget.Header.sortIndicatorOrder = QtDescendingOrder then
QtTreeWidget.sortItems(AColumn, QtAscendingOrder)
else
QtTreeWidget.sortItems(AColumn, QtDescendingOrder);
}
with QtTreeWidget.Header do
begin
SetSortIndicatorVisible(True);
if (AColumn >= 0) and (AColumn < QtTreeWidget.ColCount) then
SetSortIndicator(AColumn, QtAscendingOrder);
end;
end;
end;