Skip to content

Vertical progress bar causes Group widget to extend further than it should #3833

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
rjwills28 wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −11
Open

Vertical progress bar causes Group widget to extend further than it should #3833

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a692819
Fix vertical progress bar sizing bug in Group widget
rjwills28 Jun 15, 2026
1c905aa
Add @Override annotation
rjwills28 Jun 15, 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
31 changes: 20 additions & 11 deletions ...org/csstudio/display/builder/representation/javafx/widgets/ProgressBarRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*******************************************************************************/
package org.csstudio.display.builder.representation.javafx.widgets;

import javafx.scene.layout.Pane;
import org.csstudio.display.builder.model.DirtyFlag;
import org.csstudio.display.builder.model.UntypedWidgetPropertyListener;
import org.csstudio.display.builder.model.WidgetProperty;
Expand All @@ -28,7 +29,7 @@
* @author Amanda Carpenter
*/
@SuppressWarnings("nls")
public class ProgressBarRepresentation extends RegionBaseRepresentation<ProgressBar, ProgressBarWidget>
public class ProgressBarRepresentation extends RegionBaseRepresentation<Pane, ProgressBarWidget>
{
private final DirtyFlag dirty_look = new DirtyFlag();
private final DirtyFlag dirty_value = new DirtyFlag();
Expand All @@ -39,11 +40,13 @@ public class ProgressBarRepresentation extends RegionBaseRepresentation<Progress

private volatile double percentage = 0.0;

private ProgressBar bar;

@Override
public ProgressBar createJFXNode() throws Exception
public Pane createJFXNode() throws Exception
{
final ProgressBar bar = new ProgressBar();
return bar;
bar = new ProgressBar();
return new Pane(bar);
}

@Override
Expand Down Expand Up @@ -172,6 +175,10 @@ else if (percentage > 1.0)
toolkit.scheduleUpdate(this);
}

@Override
protected boolean isFilteringEditModeClicks() {
return true;
}

@Override
public void updateChanges()
Expand All @@ -187,29 +194,31 @@ public void updateChanges()

if (!horizontal)
{
jfx_node.getTransforms().setAll(
bar.getTransforms().setAll(
new Translate(0, height),
new Rotate(-90, 0, 0));
jfx_node.setPrefSize(height, width);
bar.setPrefSize(height, width);
jfx_node.setPrefSize(width, height);

if (min_val > max_val)
{
jfx_node.getTransforms().setAll(
bar.getTransforms().setAll(
new Translate(0, height),
new Rotate(-90, 0, 0, 0),
new Translate(height, 0),
new Rotate(180, 0, 0, 0, Rotate.Y_AXIS));
jfx_node.setPrefSize(height, width);
bar.setPrefSize(height, width);
}
}
else
{
jfx_node.getTransforms().clear();
bar.getTransforms().clear();
bar.setPrefSize(width, height);
jfx_node.setPrefSize(width, height);

if (min_val > max_val)
{
jfx_node.getTransforms().setAll(
bar.getTransforms().setAll(
new Translate(width, 0),
new Rotate(180, 0, 0, 0, Rotate.Y_AXIS));
}
Expand Down Expand Up @@ -259,6 +268,6 @@ public void updateChanges()
jfx_node.setStyle(style.toString());
}
if (dirty_value.checkAndClear())
jfx_node.setProgress(percentage);
bar.setProgress(percentage);
}
}
Loading