quicksettings: Fix row count calculation

This commit is contained in:
Devin Lin 2022-07-10 23:18:34 -04:00
parent 85e434913b
commit 620fd8a433

View file

@ -45,7 +45,7 @@ Item {
readonly property int columnCount: Math.floor(width/columnWidth) readonly property int columnCount: Math.floor(width/columnWidth)
readonly property int rowCount: { readonly property int rowCount: {
let totalRows = quickSettingsCount / columnCount; let totalRows = Math.ceil(quickSettingsCount / columnCount);
let isPortrait = MobileShell.Shell.orientation === MobileShell.Shell.Portrait; let isPortrait = MobileShell.Shell.orientation === MobileShell.Shell.Portrait;
let targetRows = Math.floor(Window.height * (isPortrait ? 0.65 : 0.8) / rowHeight); let targetRows = Math.floor(Window.height * (isPortrait ? 0.65 : 0.8) / rowHeight);
return Math.min(totalRows, targetRows); return Math.min(totalRows, targetRows);
@ -229,7 +229,7 @@ Item {
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.policy: ScrollBar.AlwaysOff ScrollBar.vertical.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.interactive:false ScrollBar.vertical.interactive: false
anchors.fill: parent anchors.fill: parent
contentWidth: width contentWidth: width
@ -253,7 +253,7 @@ Item {
position: 0.1 position: 0.1
contentItem: Rectangle { contentItem: Rectangle {
implicitWidth: PlasmaCore.Units.smallSpacing/4 implicitWidth: PlasmaCore.Units.smallSpacing / 4
color: PlasmaCore.Theme.textColor color: PlasmaCore.Theme.textColor
opacity: 0.5 opacity: 0.5
} }
@ -285,7 +285,6 @@ Item {
id: quickSettingComponent id: quickSettingComponent
Components.BaseItem { Components.BaseItem {
height: root.rowHeight height: root.rowHeight
width: root.columnWidth width: root.columnWidth
padding: PlasmaCore.Units.smallSpacing padding: PlasmaCore.Units.smallSpacing