[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-desktop] applets/kickoff/package/contents/ui: [Kickoff] Draw FrameSvgItem behind kickoff con
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2016-09-30 21:20:56
Message-ID: E1bq5Em-0007UD-3t () code ! kde ! org
[Download RAW message or body]

Git commit f722ae24231822613f45ae75a203b7e5ccae00f1 by David Edmundson, on behalf of \
John Salatas. Committed on 30/09/2016 at 21:20.
Pushed by davidedmundson into branch 'master'.

[Kickoff] Draw FrameSvgItem behind kickoff configuration buttons

Summary:

This ensures we don't end up with a white icon (dark Plasma theme) on a light gray \
(default application colors) background. It also makes the configuration (draggable) \
buttons look more like a live preview.

similar to: https://phabricator.kde.org/D2884

Test Plan:
Breeze dark application scheme, Breeze dark Plasma theme
{F346143}
Breeze dark application scheme, Breeze light Plasma theme
{F346138}
Breeze light application scheme, Breeze light Plasma theme
{F346139}
Breeze light application scheme, Breeze dark Plasma theme
{F346142}

Reviewers: #plasma:_design, #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: davidedmundson, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D2900

M  +17   -38   applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml

http://commits.kde.org/plasma-desktop/f722ae24231822613f45ae75a203b7e5ccae00f1

diff --git a/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml \
b/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml index \
                0baa583..ef95dec 100644
--- a/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml
+++ b/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml
@@ -21,22 +21,8 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import QtQuick.Controls 1.0 as QtControls
 import org.kde.kquickcontrolsaddons 2.0
 
-Rectangle {
+PlasmaCore.FrameSvgItem {
     id: button
-    SystemPalette {
-        id:palette
-    }
-
-    color: palette.button
-
-    border {
-        width: 1
-        color: Qt.rgba(palette.text.r, palette.text.g, palette.text.b, 0.5)
-    }
-    radius: 5
-
-    visible: name != "empty"
-
     property alias icon: iconElement.source
     property alias text: textElement.text
     property string name
@@ -44,34 +30,27 @@ Rectangle {
     width: units.gridUnit * 6
     height: units.gridUnit * 5
 
+    visible: name != "empty"
 
-    Item {
-         anchors {
-             margins: units.smallSpacing
-             left: parent.left
-             right: parent.right
-             verticalCenter: parent.verticalCenter
-         }
-
-        height: childrenRect.height
-
-        PlasmaCore.IconItem {
-            id: iconElement
+    imagePath: "widgets/background"
 
-            anchors.horizontalCenter: parent.horizontalCenter
-            width: units.iconSizes.medium
-            height: width
+    PlasmaCore.IconItem {
+        id: iconElement
 
-            source: icon
-        }
+        anchors.centerIn: parent
+        width: units.iconSizes.medium
+        height: width
 
-        QtControls.Label {
-             id: textElement
-             anchors {
-                 top: iconElement.bottom
-                 horizontalCenter: parent.horizontalCenter
-             }
+        source: icon
+    }
 
+    QtControls.Label {
+        id: textElement
+        anchors {
+            top: iconElement.bottom
+            horizontalCenter: parent.horizontalCenter
         }
+        color: PlasmaCore.ColorScope.textColor
+        font.pointSize: theme.smallestFont.pointSize
     }
 }


[prev in list] [next in list] [prev in thread] [next in thread]