0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'Fix' instance group sorting

Browse Source
This commit is contained in:
Petr Mrázek 2014-11-10 08:51:24 +01:00
parent 90eea4f05c
commit 5711b1be95
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gui/groupview/GroupView.cpp
View File

@ -62,12 +62,28 @@ void GroupView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
scheduleDelayedItemsLayout(); scheduleDelayedItemsLayout();
} }
class LocaleString : public QString
{
public:
LocaleString(const char *s) : QString(s)
{
}
LocaleString(const QString &s) : QString(s)
{
}
};
inline bool operator<(const LocaleString &lhs, const LocaleString &rhs)
{
return (QString::localeAwareCompare(lhs, rhs) < 0);
}
void GroupView::updateGeometries() void GroupView::updateGeometries()
{ {
geometryCache.clear(); geometryCache.clear();
int previousScroll = verticalScrollBar()->value(); int previousScroll = verticalScrollBar()->value();
QMap<QString, VisualGroup *> cats; QMap<LocaleString, VisualGroup *> cats;
for (int i = 0; i < model()->rowCount(); ++i) for (int i = 0; i < model()->rowCount(); ++i)
{ {

18
gui/groupview/GroupedProxyModel.cpp
View File

@ -1,6 +1,7 @@
#include "GroupedProxyModel.h" #include "GroupedProxyModel.h"
#include "GroupView.h" #include "GroupView.h"
#include "logger/QsLog.h"
GroupedProxyModel::GroupedProxyModel(QObject *parent) : QSortFilterProxyModel(parent) GroupedProxyModel::GroupedProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
{ {
@ -16,7 +17,22 @@ bool GroupedProxyModel::lessThan(const QModelIndex &left, const QModelIndex &rig
} }
else else
{ {
return leftCategory < rightCategory; // FIXME: real group sorting happens in GroupView::updateGeometries(), see LocaleString
auto result = leftCategory.localeAwareCompare(rightCategory);
if(result < 0)
{
QLOG_DEBUG() << leftCategory << "<" << rightCategory;
}
if(result == 0)
{
QLOG_DEBUG() << leftCategory << "=" << rightCategory;
return subSortLessThan(left, right);
}
if(result > 0)
{
QLOG_DEBUG() << leftCategory << ">" << rightCategory;
}
return result < 0;
} }
} }