Revert "phonepanel: Keep the Quick Settings buttons the same size"

This reverts commit c4903c25b9.


(cherry picked from commit 43f2f293cf)
This commit is contained in:
Aleix Pol 2021-09-13 18:26:05 +02:00 committed by Aleix Pol Gonzalez
parent 92cb1290dc
commit f6c1d727d7

View file

@ -94,6 +94,9 @@ Item {
spacing: 0
height: Layout.minimumHeight * (1 - root.expandedRatio) + (Layout.maximumHeight * root.expandedRatio)
readonly property real cellSizeHint: PlasmaCore.Units.iconSizes.large + PlasmaCore.Units.smallSpacing * 6
readonly property real columnWidth: Math.floor(width / Math.floor(width / cellSizeHint))
// top indicators (clock, widgets, etc.)
IndicatorsRow {
id: indicatorsRow
@ -124,7 +127,7 @@ Item {
readonly property real cellSizeHint: PlasmaCore.Units.iconSizes.large + PlasmaCore.Units.smallSpacing * 6
readonly property real columns: Math.floor(width / cellSizeHint)
readonly property real columnWidth: (flow.width / (flow.columns + 1)) * (root.expandedRatio > 0.4 ? 1 : (1 - root.expandedRatio) + (flow.width / flow.columns) * root.expandedRatio)
readonly property real columnWidth: Math.floor(width / columns)
spacing: 0
@ -133,8 +136,10 @@ Item {
delegate: Delegate {
id: delegateItem
required property var modelData
width: flow.columnWidth
width: root.expandedRatio < 0.4
? Math.max(implicitWidth + PlasmaCore.Units.smallSpacing * 2, flow.width / (flow.columns + 1))
: Math.max(implicitWidth + PlasmaCore.Units.smallSpacing * 2,
(flow.width / (flow.columns + 1)) * (1 - root.expandedRatio) + (flow.width / flow.columns) * root.expandedRatio)
labelOpacity: y > 0 ? 1 : root.expandedRatio
opacity: y <= 0 ? 1 : root.expandedRatio