mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-21 18:50:47 +03:00
Explicitly set parent for scrollbars to prevent them from showing on some platforms
This commit is contained in:
parent
60606133cb
commit
5457d67c98
2 changed files with 6 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue