Commit 91c011d7 authored by Alessandro Portale's avatar Alessandro Portale Committed by hjk

WelcomeScreen: Fix hover effect for default.creatortheme

Change-Id: I8a1761ae0dde2a05b81dcbaacdf0b6844277f762
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 1754dbf6
......@@ -92,7 +92,8 @@ Welcome_Link_TextColorActive=fff0f0f0
Welcome_Link_TextColorNormal=text
Welcome_ProjectItem_BackgroundColorHover=0
Welcome_ProjectItem_TextColorFilepath=textDisabled
Welcome_SessionItemExpanded_BackgroundColor=selectedBackground
Welcome_SessionItemExpanded_BackgroundColorHover=hoverBackground
Welcome_SessionItemExpanded_BackgroundColorNormal=selectedBackground
Welcome_SessionItem_BackgroundColorHover=hoverBackground
Welcome_SessionItem_BackgroundColorNormal=0
Welcome_SideBar_BackgroundColor=ff434343
......
......@@ -86,7 +86,8 @@ Welcome_Link_TextColorActive=fff0f0f0
Welcome_Link_TextColorNormal=ff328930
Welcome_ProjectItem_BackgroundColorHover=fff9f9f9
Welcome_ProjectItem_TextColorFilepath=ff6b6b6b
Welcome_SessionItemExpanded_BackgroundColor=fff1f1f1
Welcome_SessionItemExpanded_BackgroundColorHover=ffe9e9e9
Welcome_SessionItemExpanded_BackgroundColorNormal=fff1f1f1
Welcome_SessionItem_BackgroundColorHover=fff9f9f9
Welcome_SessionItem_BackgroundColorNormal=19f9f9f9
Welcome_SideBar_BackgroundColor=ffebebeb
......
......@@ -68,9 +68,7 @@ Item {
Rectangle {
z: -4
// background of session item
color: (iArea.hovered || text.hovered || area2.hovered)
? creatorTheme.sessionItem_BackgroundColorHover
: creatorTheme.sessionItem_BackgroundColorNormal
color: creatorTheme.sessionItem_BackgroundColorHover
anchors.fill: parent
visible: iArea.containsMouse || text.hovered
anchors.topMargin: 1
......@@ -226,8 +224,8 @@ Item {
id: collapseButton
visible: text.hovered || iArea.containsMouse || delegate.expanded
property color color: iArea.containsMouse ? creatorTheme.sessionItem_BackgroundColorHover
: creatorTheme.sessionItemExpanded_BackgroundColor
property color color: iArea.containsMouse ? creatorTheme.sessionItemExpanded_BackgroundColorHover
: creatorTheme.sessionItemExpanded_BackgroundColorNormal
anchors.fill: parent
Image {
......
......@@ -149,7 +149,8 @@ public:
Welcome_SessionItem_BackgroundColorNormal,
Welcome_SessionItem_BackgroundColorHover,
Welcome_SessionItemExpanded_BackgroundColor
Welcome_SessionItemExpanded_BackgroundColorNormal,
Welcome_SessionItemExpanded_BackgroundColorHover
};
enum GradientRole {
......
......@@ -80,7 +80,8 @@ IMPL_COLOR_PROPERTY(sideBar_BackgroundColor, Welcome_SideBar_BackgroundCol
IMPL_COLOR_PROPERTY(projectItem_TextColorFilepath, Welcome_ProjectItem_TextColorFilepath)
IMPL_COLOR_PROPERTY(projectItem_BackgroundColorHover, Welcome_ProjectItem_BackgroundColorHover)
IMPL_COLOR_PROPERTY(sessionItem_BackgroundColorNormal, Welcome_SessionItem_BackgroundColorNormal)
IMPL_COLOR_PROPERTY(sessionItemExpanded_BackgroundColor, Welcome_SessionItemExpanded_BackgroundColor)
IMPL_COLOR_PROPERTY(sessionItemExpanded_BackgroundColorHover, Welcome_SessionItemExpanded_BackgroundColorHover)
IMPL_COLOR_PROPERTY(sessionItemExpanded_BackgroundColorNormal, Welcome_SessionItemExpanded_BackgroundColorNormal)
IMPL_COLOR_PROPERTY(sessionItem_BackgroundColorHover, Welcome_SessionItem_BackgroundColorHover)
QGradient WelcomeTheme::button_GradientNormal () const { GRADIENT(Welcome_Button_GradientNormal); }
......
......@@ -64,7 +64,8 @@ public:
DECLARE_COLOR_PROPERTY(projectItem_TextColorFilepath)
DECLARE_COLOR_PROPERTY(projectItem_BackgroundColorHover)
DECLARE_COLOR_PROPERTY(sessionItem_BackgroundColorNormal)
DECLARE_COLOR_PROPERTY(sessionItemExpanded_BackgroundColor)
DECLARE_COLOR_PROPERTY(sessionItemExpanded_BackgroundColorNormal)
DECLARE_COLOR_PROPERTY(sessionItemExpanded_BackgroundColorHover)
DECLARE_COLOR_PROPERTY(sessionItem_BackgroundColorHover)
Q_PROPERTY(QGradient button_GradientNormal READ button_GradientNormal NOTIFY themeChanged)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment