Fix panel icon sizing

Ensure integer pixel margins
This commit is contained in:
Devin Lin 2021-03-05 18:50:42 -05:00
parent 66f13653ae
commit 9854558a1b
2 changed files with 6 additions and 1 deletions

View file

@ -19,6 +19,7 @@ Item {
property MouseArea mouseArea property MouseArea mouseArea
readonly property bool pressed: mouseArea.pressed && mouseArea.activeButton == button readonly property bool pressed: mouseArea.pressed && mouseArea.activeButton == button
property double iconSizeFactor: 1
property alias iconSource: icon.source property alias iconSource: icon.source
property alias colorGroup: icon.colorGroup property alias colorGroup: icon.colorGroup
signal clicked() signal clicked()
@ -67,7 +68,7 @@ Item {
id: icon id: icon
anchors { anchors {
fill: parent fill: parent
margins: parent.height * 0.25 margins: Math.round((parent.height - parent.height * iconSizeFactor * 0.6) / 2)
} }
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup
//enabled: button.enabled && button.clickable //enabled: button.enabled && button.clickable

View file

@ -200,6 +200,7 @@ PlasmaCore.ColorScope {
plasmoid.nativeInterface.showDesktop = false; plasmoid.nativeInterface.showDesktop = false;
taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show(); taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
} }
iconSizeFactor: 0.75
iconSource: "mobile-task-switcher" iconSource: "mobile-task-switcher"
colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
} }
@ -222,6 +223,7 @@ PlasmaCore.ColorScope {
MobileShell.HomeScreenControls.resetHomeScreenPosition(); MobileShell.HomeScreenControls.resetHomeScreenPosition();
plasmoid.nativeInterface.allMinimizedChanged(); plasmoid.nativeInterface.allMinimizedChanged();
} }
iconSizeFactor: 1
iconSource: "start-here-kde" iconSource: "start-here-kde"
colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
} }
@ -253,6 +255,8 @@ PlasmaCore.ColorScope {
} }
} }
// mobile-close-app (from plasma-frameworks) seems to have less margins than icons from breeze-icons
iconSizeFactor: TaskPanel.KWinVirtualKeyboard.active ? 1 : 0.75
iconSource: TaskPanel.KWinVirtualKeyboard.active ? "go-down-symbolic" : "mobile-close-app" iconSource: TaskPanel.KWinVirtualKeyboard.active ? "go-down-symbolic" : "mobile-close-app"
colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup colorGroup: root.showingApp ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup
} }