diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 4223600e39c123c47ae8559b9774392c61b2dc24..ea5307497577fe0df3e6fbca32b89b5ae340e22a 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -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 diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index b16dd8dbd6738e67568afb9b3c8548bd1e43c179..00926a29f7e422adc47da29df64a5a9ce3368092 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -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 diff --git a/share/qtcreator/welcomescreen/widgets/SessionItem.qml b/share/qtcreator/welcomescreen/widgets/SessionItem.qml index 3f8bfbf4517e307ea82f1fdd050932c45fd6055e..d2928f47755ead89dbbb3faafaa846442fe1634f 100644 --- a/share/qtcreator/welcomescreen/widgets/SessionItem.qml +++ b/share/qtcreator/welcomescreen/widgets/SessionItem.qml @@ -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 { diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 4a55bdc409ffee778d7c24d38a821e9305a7e5ca..25fa51605130b8a2c3cca0a4140cefc1d96affcd 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -149,7 +149,8 @@ public: Welcome_SessionItem_BackgroundColorNormal, Welcome_SessionItem_BackgroundColorHover, - Welcome_SessionItemExpanded_BackgroundColor + Welcome_SessionItemExpanded_BackgroundColorNormal, + Welcome_SessionItemExpanded_BackgroundColorHover }; enum GradientRole { diff --git a/src/libs/utils/theme/welcometheme.cpp b/src/libs/utils/theme/welcometheme.cpp index e8581a7d7d9834befb35f60c694b80e85fa1845a..c8a495fb18dc254b64780847e18e4965712a2fff 100644 --- a/src/libs/utils/theme/welcometheme.cpp +++ b/src/libs/utils/theme/welcometheme.cpp @@ -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); } diff --git a/src/libs/utils/theme/welcometheme.h b/src/libs/utils/theme/welcometheme.h index ec9f36c8444fc46b8c0163d463af8ac16554a4fa..4695acbfc6540a38f3e6f76262363e9fb9834ea0 100644 --- a/src/libs/utils/theme/welcometheme.h +++ b/src/libs/utils/theme/welcometheme.h @@ -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)