[Pkg-privacy-commits] [tails-installer] 14/210: Fix colors in Adwaita Rectangles

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit 3dbac5e0c4378ed4df65affc004b4e55a6f350c4
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Feb 12 12:36:31 2015 +0100

    Fix colors in Adwaita Rectangles
---
 liveusb/components/AdwaitaButton.qml    |  2 +-
 liveusb/components/AdwaitaRectangle.qml | 32 ++++++++++++++++++++++----------
 liveusb/components/ImageDetails.qml     |  3 +--
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/liveusb/components/AdwaitaButton.qml b/liveusb/components/AdwaitaButton.qml
index eef3213..ead350d 100644
--- a/liveusb/components/AdwaitaButton.qml
+++ b/liveusb/components/AdwaitaButton.qml
@@ -9,7 +9,7 @@ Button {
 
     style: ButtonStyle {
         background: AdwaitaRectangle {
-            tint: control.enabled ? (root.color == palette.button) ? "transparent" : root.color : "white"
+            color: root.color
             border.color: control.enabled ? "#777777" : "#c2c2c2"
         }
         label: Text {
diff --git a/liveusb/components/AdwaitaRectangle.qml b/liveusb/components/AdwaitaRectangle.qml
index 689958d..d4e3886 100644
--- a/liveusb/components/AdwaitaRectangle.qml
+++ b/liveusb/components/AdwaitaRectangle.qml
@@ -2,22 +2,34 @@ import QtQuick 2.0
 
 Rectangle {
     id: rect
-    property color tint: "transparent"
-    property real tintFactor: !control.pressed ? control.hovered ? 0.0 : 0.1 : -0.2
     implicitHeight: 36
     implicitWidth: 36
     radius: 3
-    color: "red"
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: Qt.lighter(palette.button, 1.08 - (control.pressed ? 0.2 : 0)) }
-        GradientStop { position: 1.0; color: Qt.lighter(palette.button, 0.92 + (!control.pressed && control.hovered ? 0.1 : 0)) }
-    }
+
     Rectangle {
         radius: parent.radius - 1
-        anchors.margins: 1
+        anchors.margins: 0.5
         anchors.fill: parent
-        color: parent.tint
-        opacity: 0.66
+        gradient: control.enabled ? !control.pressed ? !control.hovered ? regularGradient: hoveredGradient : downGradient : disabledGradient
+        Gradient {
+            id: disabledGradient
+            GradientStop { position: 0.0; color: "light gray" }
+        }
+        Gradient {
+            id: regularGradient
+            GradientStop { position: 0.0; color: "#14ffffff" }
+            GradientStop { position: 1.0; color: "#14000000" }
+        }
+        Gradient {
+            id: hoveredGradient
+            GradientStop { position: 0.0; color: "#14ffffff" }
+            GradientStop { position: 1.0; color: "#05ffffff" }
+        }
+        Gradient {
+            id: downGradient
+            GradientStop { position: 0.0; color: "#1e000000" }
+            GradientStop { position: 1.0; color: "#14000000" }
+        }
     }
 
     border {
diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index 6075fab..7a9615b 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -41,8 +41,7 @@ Item {
         }
         AdwaitaButton {
             text: "Write to USB disk"
-            //color: "#729FCF"
-            color: Qt.darker("#729fcf", 1.25)
+            color: "#729fcf"
             textColor: "white"
             width: implicitWidth + 16
             onClicked: dialog.visible = true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git