feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update SocialButtons using isLightTheme

Browse Source 
Change-Id: I7700d30ab523c5ec3cb5ce11f9dac16b069bedb1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-12-06 16:12:41 +01:00
parent acb4858f97
commit cc64384d3a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/qmldesigner/welcomepage/TwitterButton.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 import QtQuick.Templates 2.15
import WelcomeScreen 1.0 import WelcomeScreen 1.0
import StudioTheme 1.0 as StudioTheme import StudioTheme 1.0 as StudioTheme
@@ -66,7 +66,7 @@ Item {
states: [ states: [
State { State {
name: "darkNormal" name: "darkNormal"
when: StudioTheme.Values.style === 0 && !mouseArea.containsMouse when: !StudioTheme.Values.isLightTheme && !mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -86,7 +86,7 @@ Item {
}, },
State { State {
name: "lightNormal" name: "lightNormal"
when: StudioTheme.Values.style !== 0 && !mouseArea.containsMouse when: StudioTheme.Values.isLightTheme && !mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -106,8 +106,8 @@ Item {
}, },
State { State {
name: "hover" name: "hover"
when: (StudioTheme.Values.style === 0 when: (!StudioTheme.Values.isLightTheme
|| StudioTheme.Values.style !== 0) && mouseArea.containsMouse || StudioTheme.Values.isLightTheme) && mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -132,8 +132,8 @@ Item {
}, },
State { State {
name: "pressed" name: "pressed"
when: (StudioTheme.Values.style === 0 when: (StudioTheme.Values.isLightTheme
|| StudioTheme.Values.style !== 0) || !StudioTheme.Values.isLightTheme)
&& (mouseArea.containsMouse || !mouseArea.containsMouse) && (mouseArea.containsMouse || !mouseArea.containsMouse)
&& mouseArea.pressed && mouseArea.pressed

14
share/qtcreator/qmldesigner/welcomepage/YoutubeButton.qml
View File

@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Controls 2.12 import QtQuick.Templates 2.15
import WelcomeScreen 1.0 import WelcomeScreen 1.0
import StudioTheme 1.0 as StudioTheme import StudioTheme 1.0 as StudioTheme
@@ -74,7 +74,7 @@ Item {
states: [ states: [
State { State {
name: "darkNormal" name: "darkNormal"
when: StudioTheme.Values.style === 0 && !mouseArea.containsMouse when: !StudioTheme.Values.isLightTheme && !mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -99,7 +99,7 @@ Item {
}, },
State { State {
name: "lightNormal" name: "lightNormal"
when: StudioTheme.Values.style !== 0 && !mouseArea.containsMouse when: StudioTheme.Values.isLightTheme && !mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -124,7 +124,7 @@ Item {
}, },
State { State {
name: "darkHover" name: "darkHover"
when: StudioTheme.Values.style === 0 && mouseArea.containsMouse when: !StudioTheme.Values.isLightTheme && mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -153,7 +153,7 @@ Item {
}, },
State { State {
name: "lightHover" name: "lightHover"
when: StudioTheme.Values.style !== 0 && mouseArea.containsMouse when: StudioTheme.Values.isLightTheme && mouseArea.containsMouse
&& !mouseArea.pressed && !mouseArea.pressed
PropertyChanges { PropertyChanges {
@@ -183,7 +183,7 @@ Item {
}, },
State { State {
name: "darkPressed" name: "darkPressed"
when: StudioTheme.Values.style === 0 when: !StudioTheme.Values.isLightTheme
&& (mouseArea.containsMouse || !mouseArea.containsMouse) && (mouseArea.containsMouse || !mouseArea.containsMouse)
&& mouseArea.pressed && mouseArea.pressed
@@ -215,7 +215,7 @@ Item {
}, },
State { State {
name: "lightPressed" name: "lightPressed"
when: StudioTheme.Values.style !== 0 when: StudioTheme.Values.isLightTheme
&& (mouseArea.containsMouse || !mouseArea.containsMouse) && (mouseArea.containsMouse || !mouseArea.containsMouse)
&& mouseArea.pressed && mouseArea.pressed