yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/Plasma/5.9'

Browse source 
Conflicts:
    CMakeLists.txt
This commit is contained in:
Luca Beltrame 2017-03-21 20:50:03 +01:00
commit b128c634c4
No known key found for this signature in database
GPG key ID: 8DF631FD021DB0C5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kcmkwin/kwindecoration/qml/Buttons.qml
View file

@ -39,7 +39,7 @@ Item {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: units.gridUnit / 2 anchors.topMargin: units.gridUnit / 2
border.width: Math.ceil(units.gridUnit / 16.0) border.width: Math.ceil(units.gridUnit / 16.0)
color: SystemPalette.base; color: backgroundColor;
border.color: highlightColor; border.color: highlightColor;
ColumnLayout { ColumnLayout {
id: layout id: layout
@ -51,7 +51,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
border.width: Math.ceil(units.gridUnit / 16.0) border.width: Math.ceil(units.gridUnit / 16.0)
border.color: highlightColor border.color: highlightColor
color: SystemPalette.base; color: backgroundColor;
RowLayout { RowLayout {
id: buttonPreviewRow id: buttonPreviewRow
anchors.top: parent.top; anchors.top: parent.top;
@ -194,7 +194,7 @@ Item {
id: dragHint id: dragHint
visible: !(leftButtonsView.dragging || rightButtonsView.dragging || availableGrid.dragging) visible: !(leftButtonsView.dragging || rightButtonsView.dragging || availableGrid.dragging)
Layout.fillWidth: true Layout.fillWidth: true
color: SystemPalette.text; color: backgroundColor;
opacity: 0.66 opacity: 0.66
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignTop verticalAlignment: Text.AlignTop