Skip to content

Commit 4fc17d4

Browse files
author
kasemir
committed
Check for pw or dialog
1 parent cedcd0c commit 4fc17d4

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ContextMenuSupport.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*******************************************************************************/
88
package org.csstudio.display.builder.runtime.app;
99

10-
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propConfirmMessage;
10+
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propConfirmDialog;
1111
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propPassword;
1212

1313
import javafx.collections.ObservableList;
@@ -133,9 +133,10 @@ private void fillMenu(Runnable setFocus, final Widget widget) {
133133
// Skip if widget requires password or confirmation dialog,
134134
// because in here we would invoke actions without those constraints
135135
final Optional<WidgetProperty<String>> pass = widget.checkProperty(propPassword);
136-
final Optional<WidgetProperty<String>> prompt = widget.checkProperty(propConfirmMessage);
136+
final Optional<WidgetProperty<Boolean>> prompt = widget.checkProperty(propConfirmDialog);
137137
final boolean need_dialog = (pass.isPresent() && !pass.get().getValue().isBlank()) ||
138-
(prompt.isPresent() && !prompt.get().getValue().isBlank());
138+
(prompt.isPresent() && prompt.get().getValue());
139+
139140
if (! need_dialog)
140141
for (ActionInfo info : widget.propActions().getValue().getActions()) {
141142
List<MenuItem> actionMenuItems = info.getContextMenuItems(RuntimeUtil.getExecutor(), widget);

0 commit comments

Comments
 (0)