mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
implement configurable column number in quicksettings panel
This changeset makes the shell respect the quickSettingsColumns mobile shell setting. It renders the number of columns correctly and makes the drawer wider, as needed. As a side-effect, the width is now more dpi-independant since it switches from raw pixel values to gridUnit. Another side effect is that we make the individual quicksettings buttons ever so slightly wider (5.333 gridUnits before, gridUnits now). Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
parent
f23264e451
commit
a3723c7e7b
2 changed files with 5 additions and 2 deletions
|
|
@ -12,6 +12,7 @@ import org.kde.plasma.core as PlasmaCore
|
|||
import org.kde.plasma.plasma5support 2.0 as P5Support
|
||||
import org.kde.plasma.components 3.0 as PlasmaComponents
|
||||
import org.kde.plasma.private.mobileshell as MobileShell
|
||||
import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
|
||||
import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS
|
||||
|
||||
/**
|
||||
|
|
@ -54,7 +55,8 @@ Item {
|
|||
height: quickSettingsPanel.contentImplicitHeight + quickSettingsPanel.topPadding + quickSettingsPanel.bottomPadding
|
||||
width: intendedWidth
|
||||
|
||||
readonly property real intendedWidth: 360
|
||||
readonly property real columnWidth: 6 * Kirigami.Units.gridUnit
|
||||
readonly property real intendedWidth: (columnWidth * ShellSettings.Settings.quickSettingsColumns) + Kirigami.Units.gridUnit
|
||||
|
||||
property real offsetRatio: quickSettingsPanel.height / root.height
|
||||
anchors.topMargin: Math.min(root.actionDrawer.offsetResistance * offsetRatio - quickSettingsPanel.height, 0)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import QtQuick.Layouts 1.1
|
|||
import QtQuick.Window 2.2
|
||||
|
||||
import org.kde.plasma.private.mobileshell as MobileShell
|
||||
import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
|
||||
import org.kde.plasma.components 3.0 as PlasmaComponents
|
||||
import org.kde.plasma.private.mobileshell.quicksettingsplugin as QS
|
||||
import org.kde.kirigami 2.20 as Kirigami
|
||||
|
|
@ -28,7 +29,7 @@ Item {
|
|||
|
||||
required property QS.QuickSettingsModel quickSettingsModel
|
||||
|
||||
readonly property real columns: Math.round(Math.min(6, Math.max(3, width / intendedColumnWidth)))
|
||||
readonly property real columns: Math.round(Math.min(6, Math.max(ShellSettings.Settings.quickSettingsColumns, width / intendedColumnWidth)))
|
||||
readonly property real columnWidth: Math.floor(width / columns)
|
||||
readonly property int minimizedColumns: Math.round(Math.min(8, Math.max(5, width / intendedMinimizedColumnWidth)))
|
||||
readonly property real minimizedColumnWidth: Math.floor(width / minimizedColumns)
|
||||
|
|
|
|||
Loading…
Reference in a new issue