Fix menu lock bug with no choices

attah · attah · commit f84d05e5148e · 2022-05-02T21:30:02.000+02:00
diff --git a/qml/components/ChoiceSetting.qml b/qml/components/ChoiceSetting.qml
@@ -14,7 +14,11 @@ Setting {
     displayValue: Utils.ippName(name, choice != undefined ? choice : default_choice, strings)
 
     onClicked: {
-        if(actual_choices.length>num_large_choices)
+        if(hasMenu)
+        {
+            menu.open(this)
+        }
+        else if(actual_choices.length != 0)
         {
             var dialog = pageStack.push("LargeChoiceDialog.qml",
                                         {name:name, choice: choice != undefined ? choice : default_choice, choices: actual_choices,
@@ -24,10 +28,6 @@ Setting {
                                         choice = dialog.choice
                                     })
         }
-        else
-        {
-            menu.open(this)
-        }
     }
 
     menu: ContextMenu {
@@ -45,7 +45,5 @@ Setting {
 
     }
 
-    hasMenu: !actual_choices.length>num_large_choices
-
-
+    hasMenu: actual_choices.length != 0 && (actual_choices.length <= num_large_choices)
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ Setting {`
`14`	`14`	`displayValue: Utils.ippName(name, choice != undefined ? choice : default_choice, strings)`
`15`	`15`
`16`	`16`	`onClicked: {`
`17`		`- if(actual_choices.length>num_large_choices)`
	`17`	`+ if(hasMenu)`
	`18`	`+ {`
	`19`	`+ menu.open(this)`
	`20`	`+ }`
	`21`	`+ else if(actual_choices.length != 0)`
`18`	`22`	`{`
`19`	`23`	`var dialog = pageStack.push("LargeChoiceDialog.qml",`
`20`	`24`	`{name:name, choice: choice != undefined ? choice : default_choice, choices: actual_choices,`
`@@ -24,10 +28,6 @@ Setting {`
`24`	`28`	`choice = dialog.choice`
`25`	`29`	`})`
`26`	`30`	`}`
`27`		`- else`
`28`		`- {`
`29`		`- menu.open(this)`
`30`		`- }`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`menu: ContextMenu {`
`@@ -45,7 +45,5 @@ Setting {`
`45`	`45`
`46`	`46`	`}`
`47`	`47`
`48`		`- hasMenu: !actual_choices.length>num_large_choices`
`49`		`-`
`50`		`-`
	`48`	`+ hasMenu: actual_choices.length != 0 && (actual_choices.length <= num_large_choices)`
`51`	`49`	`}`