Commit e711edd7 authored by Nate Graham's avatar Nate Graham
Browse files

[sidebar view] Remove size hacks for toolbar items

The heights of these items are all bound together to keep them the same
height, but this is the wrong way to do it; instead, the QQC2 styling
for these controls should automatically take care of ensuring consistent
heights, as I recently did for the PlasmaComponents3 versions in
frameworks/plasma-framework@e607c1ae.

These hacks have caused a bug when the font size is increased. Let's remove
the size hacks and fix the sizing properly in the style itself.

BUG: 424228
FIXED-IN: 5.20.0
parent 63219d83
...@@ -45,8 +45,6 @@ Kirigami.ScrollablePage { ...@@ -45,8 +45,6 @@ Kirigami.ScrollablePage {
icon.name: "application-menu" icon.name: "application-menu"
checkable: true checkable: true
checked: systemsettings.actionMenuVisible checked: systemsettings.actionMenuVisible
Layout.maximumWidth: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2
Layout.maximumHeight: width
Keys.onBacktabPressed: { Keys.onBacktabPressed: {
root.focusPreviousRequest() root.focusPreviousRequest()
} }
...@@ -60,8 +58,6 @@ Kirigami.ScrollablePage { ...@@ -60,8 +58,6 @@ Kirigami.ScrollablePage {
Kirigami.SearchField { Kirigami.SearchField {
id: searchField id: searchField
focus: true focus: true
Layout.minimumHeight: Layout.maximumHeight
Layout.maximumHeight: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2
Layout.fillWidth: true Layout.fillWidth: true
onTextChanged: { onTextChanged: {
systemsettings.searchModel.filterRegExp = text; systemsettings.searchModel.filterRegExp = text;
...@@ -73,8 +69,6 @@ Kirigami.ScrollablePage { ...@@ -73,8 +69,6 @@ Kirigami.ScrollablePage {
id: showIntroPageButton id: showIntroPageButton
enabled: !systemsettings.introPageVisible enabled: !systemsettings.introPageVisible
icon.name: "go-home" icon.name: "go-home"
Layout.maximumWidth: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2
Layout.maximumHeight: width
Keys.onBacktabPressed: { Keys.onBacktabPressed: {
root.focusPreviousRequest() root.focusPreviousRequest()
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment