remove disabled property on MMButton and MMRoundButton

MerginMaps · Apr 16, 2024 · 67363aa · 67363aa
1 parent c01cb81
commit 67363aa
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/app/qml/account/MMHowYouFoundUsPage.qml b/app/qml/account/MMHowYouFoundUsPage.qml
@@ -172,11 +172,11 @@ MMPage {
 
       text: qsTr("Continue")
 
-      disabled: {
-        if ( listView.currentIndex < 0 ) return true
-        if ( listView.model.get(listView.currentIndex).key === "social" ) return true
-        if ( ( listView.model.get(listView.currentIndex).key === "other" ) && root.selectedText === "" ) return true
-        return false
+      enabled: {
+        if ( listView.currentIndex < 0 ) return false
+        if ( listView.model.get(listView.currentIndex).key === "social" ) return false
+        if ( ( listView.model.get(listView.currentIndex).key === "other" ) && root.selectedText === "" ) return false
+        return true
       }
 
       onClicked: {

diff --git a/app/qml/account/MMLoginPage.qml b/app/qml/account/MMLoginPage.qml
@@ -112,7 +112,7 @@ MMPage {
 
           text: qsTr( "Sign in" )
 
-          disabled: root.pending
+          enabled: !root.pending
 
           onClicked: root.signInClicked( username.text, password.text )
         }
@@ -134,7 +134,7 @@ MMPage {
 
           type: MMButton.Types.Secondary
 
-          disabled: root.pending
+          enabled: !root.pending
 
           onClicked: root.signUpClicked()
         }

diff --git a/app/qml/account/MMSignUpPage.qml b/app/qml/account/MMSignUpPage.qml
@@ -122,7 +122,7 @@ MMPage {
 
         text: qsTr( "Sign up" )
 
-        disabled: root.pending
+        enabled: !root.pending
 
         onClicked: {
           root.signUpClicked(

diff --git a/app/qml/account/MMWhichIndustryPage.qml b/app/qml/account/MMWhichIndustryPage.qml
@@ -172,10 +172,10 @@ MMPage {
 
       text: qsTr("Continue")
 
-      disabled: {
-        if ( gridView.currentIndex < 0 ) return true
-        if ( ( gridView.model.get(gridView.currentIndex).key === "other" ) && root.selectedText === "" ) return true
-        return false
+      enabled: {
+        if ( gridView.currentIndex < 0 ) return false
+        if ( ( gridView.model.get(gridView.currentIndex).key === "other" ) && root.selectedText === "" ) return false
+        return true
       }
 
       onClicked: {

diff --git a/app/qml/components/MMButton.qml b/app/qml/components/MMButton.qml
@@ -72,15 +72,13 @@ Button {
     if ( type === MMButton.Types.Tertiary ) return __style.transparentColor
   }
 
-  property bool disabled: false
-
   property string iconSourceRight
   property string iconSourceLeft
 
   states: [
     State {
       name: "default"
-      when: !root.hovered && !root.disabled
+      when: !root.hovered && root.enabled
 
       PropertyChanges {
         target: buttonContent
@@ -107,7 +105,7 @@ Button {
 
     State {
       name: "hovered"
-      when: root.hovered && !root.disabled
+      when: root.hovered && root.enabled
 
       PropertyChanges {
         target: buttonContent
@@ -134,7 +132,7 @@ Button {
 
     State {
       name: "disabled"
-      when: root.disabled
+      when: !root.enabled
 
       PropertyChanges {
         target: buttonContent
@@ -161,7 +159,6 @@ Button {
   ]
 
   state: "default"
-  enabled: !disabled
 
   implicitHeight: root.type === MMButton.Types.Tertiary ? buttonContent.height : buttonContent.height + topPadding + bottomPadding
   implicitWidth: row.paintedChildrenWidth + 2 * __style.margin20

diff --git a/app/qml/components/MMRoundButton.qml b/app/qml/components/MMRoundButton.qml
@@ -24,10 +24,6 @@ RoundButton {
   property color bgndColor: __style.polarColor
   property color bgndHoverColor: __style.mediumGreenColor
 
-  property bool disabled: false
-
-  enabled: !disabled
-
   contentItem: MMIcon {
     color: root.iconColor
     source: root.iconSource

diff --git a/app/qml/dialogs/MMCloseAccountDialog.qml b/app/qml/dialogs/MMCloseAccountDialog.qml
@@ -101,7 +101,7 @@ MMDrawer {
           fontColorDisabled: __style.negativeColor
           bgndColorDisabled: __style.negativeLightColor
 
-          disabled: usernameInput.text !== root.username
+          enabled: usernameInput.text === root.username
 
           onClicked: {
             close()

diff --git a/gallery/qml/pages/ButtonsPage.qml b/gallery/qml/pages/ButtonsPage.qml
@@ -64,7 +64,7 @@ ScrollView {
 
             width: parent.width / 2 - parent.spacing
 
-            disabled: true
+            enabled: false
 
             onClicked: text = (text === "Clicked" ? "Primary" : "Clicked")
           }
@@ -119,7 +119,7 @@ ScrollView {
             width: parent.width / 2 - parent.spacing
 
             type: MMButton.Types.Secondary
-            disabled: true
+            enabled: false
 
             onClicked: text = (text === "Clicked" ? "Secondary" : "Clicked")
           }
@@ -177,7 +177,7 @@ ScrollView {
             width: parent.width / 2 - parent.spacing
 
             type: MMButton.Types.Tertiary
-            disabled: true
+            enabled: false
 
             iconSourceLeft: __style.uploadIcon