From 607b8b8ca822dd6de1b389f169a7035bf56e26a1 Mon Sep 17 00:00:00 2001 From: exokortex Date: Wed, 28 Feb 2018 21:12:51 +0100 Subject: [PATCH] make FunctionsWidget and SectionsWidget sort numbers correctly and align right (#344) --- src/widgets/FunctionsWidget.cpp | 7 ++++++- src/widgets/SectionsWidget.cpp | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/widgets/FunctionsWidget.cpp b/src/widgets/FunctionsWidget.cpp index 5bbaeb1a..dd1b9c03 100644 --- a/src/widgets/FunctionsWidget.cpp +++ b/src/widgets/FunctionsWidget.cpp @@ -134,7 +134,7 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const case NameColumn: return function.name; case SizeColumn: - return RSizeString(function.size); + return function.size; case OffsetColumn: return RAddressString(function.offset); default: @@ -153,6 +153,11 @@ QVariant FunctionModel::data(const QModelIndex &index, int role) const return highlightFont; return defaultFont; + case Qt::TextAlignmentRole: + if (index.column() == 1) + return static_cast(Qt::AlignRight | Qt::AlignVCenter); + return static_cast(Qt::AlignLeft | Qt::AlignVCenter); + case Qt::ToolTipRole: { QList info = CutterCore::getInstance()->cmd("afi @ " + function.name).split("\n"); diff --git a/src/widgets/SectionsWidget.cpp b/src/widgets/SectionsWidget.cpp index 18887c21..cd669083 100644 --- a/src/widgets/SectionsWidget.cpp +++ b/src/widgets/SectionsWidget.cpp @@ -88,7 +88,8 @@ void SectionsWidget::fillSections(int row, const SectionDescription §ion) QTreeWidgetItem *tempItem = new QTreeWidgetItem(); tempItem->setText(0, section.name); - tempItem->setText(1, RSizeString(section.size)); + tempItem->setData(1, Qt::DisplayRole, section.size); + tempItem->setTextAlignment(1, Qt::AlignRight | Qt::AlignVCenter); tempItem->setText(2, RAddressString(section.vaddr)); tempItem->setText(3, RAddressString(section.vaddr + section.vsize)); tempItem->setData(0, Qt::DecorationRole, colors[row % colors.size()]);