Skip to content

CSSTUDIO-3429 (1) Restore label height fix and (2) Fix Byte Monitor widget #3537

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 7 commits into from
Sep 18, 2025
Merged

CSSTUDIO-3429 (1) Restore label height fix and (2) Fix Byte Monitor widget #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7c092bf
CSSTUDIO-3429 Restore calls to setMinSize().
abrahamwolk Sep 5, 2025
fce5f18
CSSTUDIO-3429 Call setTextFill(text_color) when square_led == false.
abrahamwolk Sep 5, 2025
f6f64f6
CSSTUDIO-3429 Call pane.layout() on the JavaFX Application Thread at …
abrahamwolk Sep 5, 2025
107c1ce
Revert "CSSTUDIO-3429 Call pane.layout() on the JavaFX Application Th…
abrahamwolk Sep 10, 2025
2a9713d
Revert "CSSTUDIO-3429 Call setTextFill(text_color) when square_led ==…
abrahamwolk Sep 10, 2025
d4c4f18
CSSTUDIO-3429 Call layout() unconditionally in updateChanges().
abrahamwolk Sep 10, 2025
64b7d4e
Merge branch 'master' into CSSTUDIO-3429
abrahamwolk Sep 18, 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
9 changes: 9 additions & 0 deletions ...org/csstudio/display/builder/representation/javafx/widgets/ByteMonitorRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,5 +447,14 @@ public void updateChanges()
}
}
}

if (jfx_node != null) {
jfx_node.layout();
}
for (Label label : labels) {
if (label != null) {
label.layout();
}
}
}
}
4 changes: 4 additions & 0 deletions .../java/org/csstudio/display/builder/representation/javafx/widgets/LabelRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,26 +138,30 @@ public void updateChanges()
{
case NONE:
jfx_node.setPrefSize(width, height);
jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
if (was_ever_transformed)
jfx_node.getTransforms().clear();
break;
case NINETY:
jfx_node.setPrefSize(height, width);
jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
new Translate(-height, 0));
was_ever_transformed = true;
break;
case ONEEIGHTY:
jfx_node.setPrefSize(width, height);
jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
new Translate(-width, -height));
was_ever_transformed = true;
break;
case MINUS_NINETY:
jfx_node.setPrefSize(height, width);
jfx_node.setMinSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.setMaxSize(Control.USE_PREF_SIZE, Control.USE_PREF_SIZE);
jfx_node.getTransforms().setAll(new Rotate(-rotation.getAngle()),
new Translate(0, -width));
Expand Down