diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-12-06 16:12:41 +0100 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2021-12-06 15:13:48 +0000 |
commit | cc64384d3a0193f319d437f624adfc740c62af0c (patch) | |
tree | 0376c14486991a76885cd8a4d09f8a782d44af41 | |
parent | acb4858f97096c81456123b2e9081c08790638c1 (diff) |
Update SocialButtons using isLightTheme
Change-Id: I7700d30ab523c5ec3cb5ce11f9dac16b069bedb1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r-- | share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml | 14 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml b/share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml index a7d9316826..061db8938a 100644 --- a/share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml +++ b/share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.15 -import QtQuick.Controls 2.12 +import QtQuick.Templates 2.15 import WelcomeScreen 1.0 import StudioTheme 1.0 as StudioTheme @@ -66,7 +66,7 @@ Item { states: [ State { name: "darkNormal" - when: StudioTheme.Values.style === 0 && !mouseArea.containsMouse + when: !StudioTheme.Values.isLightTheme && !mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -86,7 +86,7 @@ Item { }, State { name: "lightNormal" - when: StudioTheme.Values.style !== 0 && !mouseArea.containsMouse + when: StudioTheme.Values.isLightTheme && !mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -106,8 +106,8 @@ Item { }, State { name: "hover" - when: (StudioTheme.Values.style === 0 - || StudioTheme.Values.style !== 0) && mouseArea.containsMouse + when: (!StudioTheme.Values.isLightTheme + || StudioTheme.Values.isLightTheme) && mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -132,8 +132,8 @@ Item { }, State { name: "pressed" - when: (StudioTheme.Values.style === 0 - || StudioTheme.Values.style !== 0) + when: (StudioTheme.Values.isLightTheme + || !StudioTheme.Values.isLightTheme) && (mouseArea.containsMouse || !mouseArea.containsMouse) && mouseArea.pressed diff --git a/share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml b/share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml index 062ea10407..987aea86b1 100644 --- a/share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml +++ b/share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.15 -import QtQuick.Controls 2.12 +import QtQuick.Templates 2.15 import WelcomeScreen 1.0 import StudioTheme 1.0 as StudioTheme @@ -74,7 +74,7 @@ Item { states: [ State { name: "darkNormal" - when: StudioTheme.Values.style === 0 && !mouseArea.containsMouse + when: !StudioTheme.Values.isLightTheme && !mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -99,7 +99,7 @@ Item { }, State { name: "lightNormal" - when: StudioTheme.Values.style !== 0 && !mouseArea.containsMouse + when: StudioTheme.Values.isLightTheme && !mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -124,7 +124,7 @@ Item { }, State { name: "darkHover" - when: StudioTheme.Values.style === 0 && mouseArea.containsMouse + when: !StudioTheme.Values.isLightTheme && mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -153,7 +153,7 @@ Item { }, State { name: "lightHover" - when: StudioTheme.Values.style !== 0 && mouseArea.containsMouse + when: StudioTheme.Values.isLightTheme && mouseArea.containsMouse && !mouseArea.pressed PropertyChanges { @@ -183,7 +183,7 @@ Item { }, State { name: "darkPressed" - when: StudioTheme.Values.style === 0 + when: !StudioTheme.Values.isLightTheme && (mouseArea.containsMouse || !mouseArea.containsMouse) && mouseArea.pressed @@ -215,7 +215,7 @@ Item { }, State { name: "lightPressed" - when: StudioTheme.Values.style !== 0 + when: StudioTheme.Values.isLightTheme && (mouseArea.containsMouse || !mouseArea.containsMouse) && mouseArea.pressed |