diff --git a/Modules/Panels/Launcher/Launcher.qml b/Modules/Panels/Launcher/Launcher.qml index 031493693..b61526685 100644 --- a/Modules/Panels/Launcher/Launcher.qml +++ b/Modules/Panels/Launcher/Launcher.qml @@ -840,7 +840,7 @@ SmartPanel { } } - width: resultsList.width - Style.marginS - resultsList.scrollBarTotalWidth + width: resultsList.width - Style.marginS implicitHeight: entryHeight radius: Style.radiusM color: entry.isSelected ? Color.mHover : Color.mSurface diff --git a/Modules/Panels/Settings/SettingsContent.qml b/Modules/Panels/Settings/SettingsContent.qml index 0f05c4db2..9ccb6060c 100644 --- a/Modules/Panels/Settings/SettingsContent.qml +++ b/Modules/Panels/Settings/SettingsContent.qml @@ -332,7 +332,7 @@ Item { Rectangle { id: sidebar clip: true - Layout.preferredWidth: root.sidebarExpanded ? 200 * Style.uiScaleRatio : (sidebarToggle.width + (sidebarList.verticalScrollBarActive ? sidebarList.scrollBarTotalWidth : 0)) + Layout.preferredWidth: root.sidebarExpanded ? 200 * Style.uiScaleRatio : sidebarToggle.width Layout.fillHeight: true Layout.alignment: Qt.AlignTop color: Color.transparent @@ -416,7 +416,7 @@ Item { delegate: Rectangle { id: tabItem - width: sidebarList.verticalScrollBarActive ? sidebarList.width - sidebarList.scrollBarWidth - Style.marginXS : sidebarList.width + width: sidebarList.verticalScrollBarActive ? sidebarList.width - Style.marginXS : sidebarList.width height: tabEntryRow.implicitHeight + Style.marginS * 2 radius: Style.radiusS color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mHover : Color.transparent) diff --git a/Widgets/NGridView.qml b/Widgets/NGridView.qml index f95eec811..b027fc6a8 100644 --- a/Widgets/NGridView.qml +++ b/Widgets/NGridView.qml @@ -29,7 +29,6 @@ Item { return false; return gridView.contentHeight > gridView.height; } - readonly property real scrollBarWidth: verticalScrollBarActive ? handleWidth : 0 // Forward GridView properties property alias model: gridView.model diff --git a/Widgets/NListView.qml b/Widgets/NListView.qml index e7e7548c3..ceb69a5bc 100644 --- a/Widgets/NListView.qml +++ b/Widgets/NListView.qml @@ -19,9 +19,6 @@ Item { return false; return listView.contentHeight > listView.height; } - readonly property real scrollBarWidth: verticalScrollBarActive ? handleWidth : 0 - readonly property real scrollBarSpacing: verticalScrollBarActive ? 4 : 0 - readonly property real scrollBarTotalWidth: verticalScrollBarActive ? (handleWidth + 4) : 0 // Forward ListView properties property alias model: listView.model @@ -115,13 +112,12 @@ Item { id: listView anchors.fill: parent - anchors.rightMargin: root.verticalScrollBarActive ? root.handleWidth + 4 : 0 clip: true boundsBehavior: Flickable.StopAtBounds ScrollBar.vertical: ScrollBar { - parent: root // Position relative to root Item, not listView - x: listView.mirrored ? 0 : root.width - width + parent: listView + x: listView.mirrored ? 0 : listView.width - width y: 0 height: listView.height policy: root.verticalPolicy diff --git a/Widgets/NSearchableComboBox.qml b/Widgets/NSearchableComboBox.qml index 427f7ecc4..62f0239be 100644 --- a/Widgets/NSearchableComboBox.qml +++ b/Widgets/NSearchableComboBox.qml @@ -202,7 +202,7 @@ RowLayout { id: defaultDelegate ItemDelegate { id: delegateRoot - width: listView.width - listView.scrollBarTotalWidth + width: listView.width leftPadding: Style.marginM rightPadding: Style.marginM topPadding: Style.marginS