From f66147c4348291b504162b41dfe251c0e7e3be35 Mon Sep 17 00:00:00 2001
From: Kirill Anisimov <kirill.anisimov@demlabs.net>
Date: Tue, 21 Jan 2020 23:03:33 +0300
Subject: [PATCH] Moved Scroll Button icons to properties.
---
widgets/DapScrollView.qml | 8 ++++----
widgets/DapScrollViewForm.ui.qml | 10 ++++++++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/widgets/DapScrollView.qml b/widgets/DapScrollView.qml
index 5778abd..dbdae69 100644
--- a/widgets/DapScrollView.qml
+++ b/widgets/DapScrollView.qml
@@ -45,11 +45,11 @@ DapScrollViewForm
{
if (scrollButton.state === "goUp")
{
- scrollButton.imageSource = "qrc:/res/icons/ic_scroll-down_hover.png"
+ scrollButtonImage.source = scrollDownButtonHoveredImageSource
}
else if (scrollButton.state === "goDown")
{
- scrollButton.imageSource = "qrc:/res/icons/ic_scroll-up_hover.png"
+ scrollButtonImage.source = scrollUpButtonHoveredImageSource
}
}
@@ -57,11 +57,11 @@ DapScrollViewForm
{
if (scrollButton.state === "goUp")
{
- scrollButton.imageSource = "qrc:/res/icons/ic_scroll-down.png"
+ scrollButtonImage.source = scrollDownButtonImageSource
}
else if (scrollButton.state === "goDown")
{
- scrollButton.imageSource = "qrc:/res/icons/ic_scroll-up.png"
+ scrollButtonImage.source = scrollUpButtonImageSource
}
}
diff --git a/widgets/DapScrollViewForm.ui.qml b/widgets/DapScrollViewForm.ui.qml
index 62d4e1d..024a0ef 100644
--- a/widgets/DapScrollViewForm.ui.qml
+++ b/widgets/DapScrollViewForm.ui.qml
@@ -3,10 +3,16 @@ import QtQuick 2.4
MouseArea
{
id: dapScrollMouseArea
+ ////@ Icons for Scroll Button
+ property string scrollDownButtonImageSource: ""
+ property string scrollDownButtonHoveredImageSource: ""
+ property string scrollUpButtonImageSource: ""
+ property string scrollUpButtonHoveredImageSource: ""
////@ ListView to attach the ScrollButton
property ListView viewData: ListView {}
property alias scrollMouseArea: dapScrollMouseArea
property alias scrollButton: dapScrollButton
+ property alias scrollButtonImage: dapScrollButtonImage
anchors.fill: parent
hoverEnabled: true
@@ -14,7 +20,6 @@ MouseArea
MouseArea
{
id: dapScrollButton
- property string imageSource: "qrc:/res/icons/ic_scroll-down.png"
width: 36 * pt
height: width
anchors.right: parent.right
@@ -27,9 +32,10 @@ MouseArea
Image
{
+ id: dapScrollButtonImage
anchors.fill: parent
fillMode: Image.PreserveAspectFit
- source: dapScrollButton.imageSource
+ source: scrollDownButtonImageSource
sourceSize.height: parent.height
sourceSize.width: parent.width
}
--
GitLab