rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Leaves can't collapse

Browse Source
This commit is contained in:
Nicolas Werner 2021-12-01 00:24:57 +01:00
parent fe49beb68e
commit 65152252a4
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/qml/CommunitiesList.qml
View File

@ -112,7 +112,7 @@ Page {
spacing: Nheko.paddingMedium spacing: Nheko.paddingMedium
anchors.fill: parent anchors.fill: parent
anchors.margins: Nheko.paddingMedium anchors.margins: Nheko.paddingMedium
anchors.leftMargin: communitySidebar.collapsed ? Nheko.paddingMedium : (Nheko.paddingMedium * (model.depth + 1)) anchors.leftMargin: Nheko.paddingMedium + (communitySidebar.collapsed ? 0 : (fontMetrics.lineSpacing * model.depth))
ImageButton { ImageButton {
visible: !communitySidebar.collapsed && model.collapsible visible: !communitySidebar.collapsed && model.collapsible
@ -156,7 +156,7 @@ Page {
visible: !communitySidebar.collapsed visible: !communitySidebar.collapsed
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
color: communityItem.importantText color: communityItem.importantText
elideWidth: parent.width - avatar.width - r.anchors.leftMargin - Nheko.paddingMedium - fontMetrics.lineSpacing elideWidth: parent.width - avatar.width - r.anchors.leftMargin/2 - Nheko.paddingMedium - fontMetrics.lineSpacing
fullText: model.displayName fullText: model.displayName
textFormat: Text.PlainText textFormat: Text.PlainText
} }

1
src/timeline/CommunitiesModel.cpp
View File

@ -438,7 +438,6 @@ tagIdToCat(QString tagId)
bool bool
FilteredCommunitiesModel::lessThan(const QModelIndex &left, const QModelIndex &right) const FilteredCommunitiesModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{ {
nhlog::ui()->debug("lessThan");
QModelIndex const left_idx = sourceModel()->index(left.row(), 0, QModelIndex()); QModelIndex const left_idx = sourceModel()->index(left.row(), 0, QModelIndex());
QModelIndex const right_idx = sourceModel()->index(right.row(), 0, QModelIndex()); QModelIndex const right_idx = sourceModel()->index(right.row(), 0, QModelIndex());

2
src/timeline/CommunitiesModel.h
View File

@ -74,7 +74,7 @@ public:
const auto depth = tree[index].depth; const auto depth = tree[index].depth;
int i = index + 1; int i = index + 1;
for (; i < size(); i++) for (; i < size(); i++)
if (tree[i].depth == depth) if (tree[i].depth <= depth)
break; break;
return i - 1; return i - 1;
} }