[Pkg-privacy-commits] [tails-installer] 169/210: Fix arrow scaling

Intrigeri intrigeri at moszumanska.debian.org
Wed May 24 15:26:41 UTC 2017


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 36494890a6b52e8c99dd6211c14a32dc9303a335
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Sep 10 13:49:35 2015 +0200

    Fix arrow scaling
---
 liveusb/components/AdwaitaComboBox.qml | 2 +-
 liveusb/components/Arrow.qml           | 8 +++++---
 liveusb/components/DelegateImage.qml   | 1 -
 liveusb/components/DownloadDialog.qml  | 3 +--
 liveusb/components/ImageDetails.qml    | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/liveusb/components/AdwaitaComboBox.qml b/liveusb/components/AdwaitaComboBox.qml
index 083e12a..d9cbafe 100644
--- a/liveusb/components/AdwaitaComboBox.qml
+++ b/liveusb/components/AdwaitaComboBox.qml
@@ -13,7 +13,7 @@ ComboBox {
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.rightMargin: $(16)
-                scale: $(1.3)
+                scale: $(1.2)
                 rotation: 90
             }
         }
diff --git a/liveusb/components/Arrow.qml b/liveusb/components/Arrow.qml
index 5e911b3..893aa99 100644
--- a/liveusb/components/Arrow.qml
+++ b/liveusb/components/Arrow.qml
@@ -1,16 +1,18 @@
 import QtQuick 2.4
 
 Item {
-    height: $(10)
+    implicitHeight: 10
     width: height / 2
     clip: true
-    property color color: "black"
+    scale: $(1)
+    property alias color: rect.color
     Rectangle {
+        id: rect
         x: -parent.height / 5 * 4
         y: -parent.height / 10
         rotation: 45
         width: parent.height
         height: parent.height
-        color: parent.color
+        color: "black"
     }
 }
diff --git a/liveusb/components/DelegateImage.qml b/liveusb/components/DelegateImage.qml
index c18b579..91e55c0 100644
--- a/liveusb/components/DelegateImage.qml
+++ b/liveusb/components/DelegateImage.qml
@@ -63,7 +63,6 @@ Item {
         Arrow {
             id: arrow
             visible: !release.isLocal
-            scale: $(1)
             anchors {
                 verticalCenter: parent.verticalCenter
                 right: parent.right
diff --git a/liveusb/components/DownloadDialog.qml b/liveusb/components/DownloadDialog.qml
index 2b2e472..8fd7c4b 100644
--- a/liveusb/components/DownloadDialog.qml
+++ b/liveusb/components/DownloadDialog.qml
@@ -187,8 +187,7 @@ Dialog {
                         Arrow {
                             id: writeArrow
                             anchors.verticalCenter: parent.verticalCenter
-                            height: $(14)
-                            scale: $(1)
+                            scale: $(1.4)
                             SequentialAnimation {
                                 running: liveUSBData.currentImage.writer.running
                                 loops: -1
diff --git a/liveusb/components/ImageDetails.qml b/liveusb/components/ImageDetails.qml
index c2f26d0..ec2c399 100644
--- a/liveusb/components/ImageDetails.qml
+++ b/liveusb/components/ImageDetails.qml
@@ -1,8 +1,9 @@
-import QtQuick 2.0
-import QtQuick.Controls 1.2
+import QtQuick 2.4
+import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.2
 import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.0
+import QtQuick.Dialogs 1.2
+import QtQuick.Window 2.2
 
 Item {
     id: root
@@ -10,7 +11,6 @@ Item {
 
     signal stepForward
 
-
     Rectangle {
         z: 2
         gradient: Gradient {

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



More information about the Pkg-privacy-commits mailing list