vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix button sizes in Aurorae 

Maximize/Restore, Menu and spacers did not honor button size factor.
icc-effect-5.14.5
Martin Gräßlin 2012-01-13 13:09:01 +01:00
parent de72df5a90
commit 2fce5db7cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/aurorae/src/qml/AuroraeButtonGroup.qml
View File

@ -22,10 +22,10 @@ Item {
var component = Qt.createComponent("AuroraeButton.qml"); var component = Qt.createComponent("AuroraeButton.qml");
for (var i=0; i<buttons.length; i++) { for (var i=0; i<buttons.length; i++) {
if (buttons.charAt(i) == "_") { if (buttons.charAt(i) == "_") {
Qt.createQmlObject("import QtQuick 1.1; Item { width: auroraeTheme.explicitButtonSpacer; height: auroraeTheme.buttonHeight }", Qt.createQmlObject("import QtQuick 1.1; Item { width: auroraeTheme.explicitButtonSpacer * auroraeTheme.buttonSizeFactor; height: auroraeTheme.buttonHeight * auroraeTheme.buttonSizeFactor }",
groupRow, "explicitSpacer" + buttons + i); groupRow, "explicitSpacer" + buttons + i);
} else if (buttons.charAt(i) == "M") { } else if (buttons.charAt(i) == "M") {
Qt.createQmlObject("import QtQuick 1.1; MenuButton { width: auroraeTheme.buttonWidthMenu; height: auroraeTheme.buttonHeight }", Qt.createQmlObject("import QtQuick 1.1; MenuButton { width: auroraeTheme.buttonWidthMenu * auroraeTheme.buttonSizeFactor; height: auroraeTheme.buttonHeight * auroraeTheme.buttonSizeFactor }",
groupRow, "menuButton" + buttons + i); groupRow, "menuButton" + buttons + i);
} else if (buttons.charAt(i) == "A") { } else if (buttons.charAt(i) == "A") {
var maximizeComponent = Qt.createComponent("AuroraeMaximizeButton.qml"); var maximizeComponent = Qt.createComponent("AuroraeMaximizeButton.qml");
@ -47,7 +47,7 @@ Item {
} }
Row { Row {
id: groupRow id: groupRow
spacing: auroraeTheme.buttonSpacing spacing: auroraeTheme.buttonSpacing * auroraeTheme.buttonSizeFactor
} }
Connections { Connections {
target: decoration target: decoration

4
clients/aurorae/src/qml/AuroraeMaximizeButton.qml
View File

@ -25,8 +25,8 @@ Item {
} }
} }
id: button id: button
width: auroraeTheme.buttonWidthMaximizeRestore width: auroraeTheme.buttonWidthMaximizeRestore * auroraeTheme.buttonSizeFactor
height: auroraeTheme.buttonHeight height: auroraeTheme.buttonHeight * auroraeTheme.buttonSizeFactor
states: [ states: [
State { name: "maximize" }, State { name: "maximize" },
State { name: "restore" } State { name: "restore" }