d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Explicitly set parent for scrollbars to prevent them from showing on some platforms

Browse source
This commit is contained in:
Nicolas Werner 2023-02-16 00:39:47 +01:00
parent 60606133cb
commit 5457d67c98
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/CommunitiesList.qml
View file

@ -36,10 +36,10 @@ Page {
height: parent.height height: parent.height
model: Communities.filtered() model: Communities.filtered()
ScrollBar { ScrollBar.vertical: ScrollBar {
id: scrollbar id: scrollbar
parent: !collapsed && Settings.scrollbarsInRoomlist ? communitiesList : null
} }
ScrollBar.vertical: (!collapsed && Settings.scrollbarsInRoomlist) ? scrollbar : null
ScrollHelper { ScrollHelper {
flickable: parent flickable: parent
@ -88,7 +88,7 @@ Page {
required property var model required property var model
height: avatarSize + 2 * Nheko.paddingMedium 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" state: "normal"
ToolTip.visible: hovered && collapsed ToolTip.visible: hovered && collapsed
ToolTip.text: model.tooltip ToolTip.text: model.tooltip

6
resources/qml/RoomList.qml
View file

@ -60,10 +60,10 @@ Page {
model: Rooms model: Rooms
//reuseItems: true //reuseItems: true
ScrollBar { ScrollBar.vertical: ScrollBar {
id: scrollbar id: scrollbar
parent: !collapsed && Settings.scrollbarsInRoomlist ? roomlist : null
} }
ScrollBar.vertical: (!collapsed && Settings.scrollbarsInRoomlist) ? scrollbar : null
ScrollHelper { ScrollHelper {
flickable: parent flickable: parent
@ -263,7 +263,7 @@ Page {
} }
height: avatarSize + 2 * Nheko.paddingMedium 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" state: "normal"
ToolTip.visible: hovered && collapsed ToolTip.visible: hovered && collapsed
ToolTip.delay: Nheko.tooltipDelay ToolTip.delay: Nheko.tooltipDelay