diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml index fab3316e336505690b15275b919a5c0bc67d7cc7..8907a36096a21f2204159a9b6dc5be61d9b02acb 100644 --- a/resources/qml/CommunitiesList.qml +++ b/resources/qml/CommunitiesList.qml @@ -112,7 +112,7 @@ Page { spacing: Nheko.paddingMedium anchors.fill: parent 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 { visible: !communitySidebar.collapsed && model.collapsible @@ -156,7 +156,7 @@ Page { visible: !communitySidebar.collapsed Layout.alignment: Qt.AlignVCenter 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 textFormat: Text.PlainText } diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp index 7b323bb96e0e15a5f8a5a034c466d49b0ccac0c9..0db3b0b01752d99d8c4cb663060ea18f5387452a 100644 --- a/src/timeline/CommunitiesModel.cpp +++ b/src/timeline/CommunitiesModel.cpp @@ -438,7 +438,6 @@ tagIdToCat(QString tagId) bool 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 right_idx = sourceModel()->index(right.row(), 0, QModelIndex()); diff --git a/src/timeline/CommunitiesModel.h b/src/timeline/CommunitiesModel.h index 79f8c33ad016da1a28086734fc9d1cb72d906f70..21d24829d3f5103352117e81b0e0ad860548ac00 100644 --- a/src/timeline/CommunitiesModel.h +++ b/src/timeline/CommunitiesModel.h @@ -74,7 +74,7 @@ public: const auto depth = tree[index].depth; int i = index + 1; for (; i < size(); i++) - if (tree[i].depth == depth) + if (tree[i].depth <= depth) break; return i - 1; }