Skip to content

During edition, widget not really invisible anymore #3926

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

Draft
agaget wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −5
Draft

During edition, widget not really invisible anymore #3926

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions ...ava/org/csstudio/display/builder/representation/javafx/widgets/JFXBaseRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
import java.util.Optional;
import java.util.logging.Level;

import javafx.geometry.Bounds;
import javafx.scene.effect.ColorAdjust;
import javafx.scene.input.*;
import javafx.scene.layout.Pane;
import javafx.scene.shape.Line;
import org.csstudio.display.builder.model.ChildrenProperty;
import org.csstudio.display.builder.model.DirtyFlag;
import org.csstudio.display.builder.model.DisplayModel;
Expand Down Expand Up @@ -336,12 +340,24 @@ private void positionChanged(final WidgetProperty<?> property, final Object old_
@Override
public void updateChanges()
{
if (dirty_position.checkAndClear())
{
if (dirty_position.checkAndClear()) {
jfx_node.relocate(model_widget.propX().getValue(),
model_widget.propY().getValue());
if (visible != null)
jfx_node.setVisible(visible.getValue());
model_widget.propY().getValue());
if (visible != null) {

jfx_node.setVisible(toolkit.isEditMode() || visible.getValue());

if (toolkit.isEditMode() && !visible.getValue()) {
ColorAdjust effect = new ColorAdjust();
effect.setSaturation(-1.0);
effect.setBrightness(0.5);
jfx_node.setOpacity(0.5);
jfx_node.setEffect(effect);
} else {
jfx_node.setOpacity(1.0);
jfx_node.setEffect(null);
}
}
}
}

Expand Down
Loading