Skip to content

Change setModified to destructively overwrite target in OpenDisplayAction #3720

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

Open
vincent-hve wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change setModified to destructively overwrite target in OpenDisplayAction #3720

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d20ded8
setModified now does not destructively overwrite target in OpenDispla…
vincent-hve Feb 9, 2026
323f27b
Updated to allow all possible target operations.
vincent-hve Mar 4, 2026
d251980
Replaced modifier CTRL+SHIFT from REPLACE to STANDALONE, renamed modi…
vincent-hve Mar 4, 2026
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
17 changes: 11 additions & 6 deletions app/display/actions/src/main/java/org/csstudio/display/actions/OpenDisplayAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class OpenDisplayAction extends ActionInfoBase {
/**
* Default {@link Target} is new tab.
*/
private Target target = Target.TAB;
private Target target = Target.REPLACE;
private Target modifierTarget = null;

private Macros macros;

Expand Down Expand Up @@ -116,7 +117,7 @@ public OpenDisplayAction(final String description, final String file, final Macr
}

public Target getTarget() {
return target;
return modifierTarget != null ? modifierTarget : target;
}

public Macros getMacros() {
Expand Down Expand Up @@ -197,10 +198,14 @@ public void writeToXML(ModelWriter modelWriter, XMLStreamWriter writer) throws E
@Override
public void setModifiers(final MouseEvent event) {
boolean middle_click = event.isMiddleButtonDown();
if (event.isShortcutDown() || middle_click) {
target = Target.TAB;
} else if (event.isShiftDown()) {
target = Target.WINDOW;
if (event.isShiftDown() && event.isShortcutDown()) {
modifierTarget = Target.STANDALONE;
} else if (event.isShortcutDown()) {
modifierTarget = Target.TAB;
} else if (event.isShiftDown() || middle_click) {
modifierTarget = Target.WINDOW;
} else {
modifierTarget = null;
}
}

Expand Down