diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-02-16 00:39:47 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-02-16 00:39:47 +0100 |
| commit | 5457d67c9895badb6492b738e5c0c9fecce59160 (patch) | |
| tree | ce80a5f51648d43981727d0b75b419e3d3f377ba /resources | |
| parent | Fix build on macOS (diff) | |
| download | nheko-5457d67c9895badb6492b738e5c0c9fecce59160.tar.xz | |
Explicitly set parent for scrollbars to prevent them from showing on some platforms
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/CommunitiesList.qml | 6 | ||||
| -rw-r--r-- | resources/qml/RoomList.qml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml index 7a2e6ab7..94f8d5a2 100644 --- a/resources/qml/CommunitiesList.qml +++ b/resources/qml/CommunitiesList.qml @@ -36,10 +36,10 @@ Page { height: parent.height model: Communities.filtered() - ScrollBar { + ScrollBar.vertical: ScrollBar { id: scrollbar + parent: !collapsed && Settings.scrollbarsInRoomlist ? communitiesList : null } - ScrollBar.vertical: (!collapsed && Settings.scrollbarsInRoomlist) ? scrollbar : null ScrollHelper { flickable: parent @@ -88,7 +88,7 @@ Page { required property var model height: avatarSize + 2 * Nheko.paddingMedium - width: ListView.view.width - (scrollbar.interactive && scrollbar.visible ? scrollbar.width : 0) + width: ListView.view.width - ((scrollbar.interactive && scrollbar.visible && scrollbar.parent) ? scrollbar.width : 0) state: "normal" ToolTip.visible: hovered && collapsed ToolTip.text: model.tooltip diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml index 18afba8b..f06fb15e 100644 --- a/resources/qml/RoomList.qml +++ b/resources/qml/RoomList.qml @@ -60,10 +60,10 @@ Page { model: Rooms //reuseItems: true - ScrollBar { + ScrollBar.vertical: ScrollBar { id: scrollbar + parent: !collapsed && Settings.scrollbarsInRoomlist ? roomlist : null } - ScrollBar.vertical: (!collapsed && Settings.scrollbarsInRoomlist) ? scrollbar : null ScrollHelper { flickable: parent @@ -263,7 +263,7 @@ Page { } height: avatarSize + 2 * Nheko.paddingMedium - width: ListView.view.width - (scrollbar.interactive && scrollbar.visible ? scrollbar.width : 0) + width: ListView.view.width - ((scrollbar.interactive && scrollbar.visible && scrollbar.parent) ? scrollbar.width : 0) state: "normal" ToolTip.visible: hovered && collapsed ToolTip.delay: Nheko.tooltipDelay |