Skip to content

Fix missing context menu for certain controls widgets #3408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2025
Merged

Fix missing context menu for certain controls widgets #3408

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb2fe5
Fix missing context menu for certain controls widgets
rjwills28 May 21, 2025
f4d76e4
Fix context menu for all other non-control widgets
rjwills28 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...ay/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ContextMenuSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.csstudio.display.builder.runtime.app;

import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propConfirmDialog;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propConfirmDialogOptions;
import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propPassword;

import javafx.collections.ObservableList;
Expand All @@ -21,6 +22,7 @@
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.WidgetProperty;
import org.csstudio.display.builder.model.properties.CommonWidgetProperties;
import org.csstudio.display.builder.model.properties.ConfirmDialog;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.representation.ToolkitListener;
import org.csstudio.display.builder.representation.javafx.widgets.JFXBaseRepresentation;
Expand Down Expand Up @@ -134,8 +136,19 @@ private void fillMenu(Runnable setFocus, final Widget widget) {
// because in here we would invoke actions without those constraints
final Optional<WidgetProperty<String>> pass = widget.checkProperty(propPassword);
final Optional<WidgetProperty<Boolean>> prompt = widget.checkProperty(propConfirmDialog);
final Optional<WidgetProperty<ConfirmDialog>> promptOptions = widget.checkProperty(propConfirmDialogOptions);
Boolean promptBool = false;
if (prompt.isPresent() && promptOptions.isPresent()) {
if (promptOptions.get().getValue() instanceof ConfirmDialog) {
if (((ConfirmDialog) promptOptions.get().getValue()) != ConfirmDialog.NONE) {
promptBool = true;
}
} else {
promptBool = prompt.get().getValue();
}
}
final boolean need_dialog = (pass.isPresent() && !pass.get().getValue().isBlank()) ||
(prompt.isPresent() && prompt.get().getValue());
(prompt.isPresent() && promptBool );

if (! need_dialog)
for (ActionInfo info : widget.propActions().getValue().getActions()) {
Expand Down