diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/CommonWidgetProperties.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/CommonWidgetProperties.java index 17b8f85825..8baf353069 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/CommonWidgetProperties.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/properties/CommonWidgetProperties.java @@ -648,6 +648,17 @@ public WidgetProperty createProperty(final Widget widget, final String d public static final WidgetPropertyDescriptor propLabelsFromPV = newBooleanPropertyDescriptor(WidgetPropertyCategory.DISPLAY, "labels_from_pv", Messages.WidgetProperties_LabelsFromPV); + /** 'gap' property: Gap between repeated elements or instances */ + public static final WidgetPropertyDescriptor propGap = + new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "gap", Messages.WidgetProperties_Gap) + { + @Override + public WidgetProperty createProperty(final Widget widget, final Integer value) + { + return new IntegerWidgetProperty(this, widget, value, 0, 500); + } + }; + /** * 'items_from_pv' property: If PV is enum PV, get items from PV? */ diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ArrayWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ArrayWidget.java index 9d77826b7c..ca36be712d 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ArrayWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/ArrayWidget.java @@ -10,6 +10,7 @@ import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propBackgroundColor; import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propForegroundColor; import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros; +import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propGap; import static org.csstudio.display.builder.model.properties.InsetsWidgetProperty.runtimePropInsets; import java.util.Arrays; @@ -75,6 +76,7 @@ public void writeToXML(final ModelWriter model_writer, final XMLStreamWriter wri private volatile WidgetProperty foreground; private volatile WidgetProperty background; private volatile WidgetProperty insets; + private volatile WidgetProperty gap; /** Constructor */ public ArrayWidget() @@ -93,6 +95,7 @@ protected void defineProperties(final List> properties) properties.add(background = propBackgroundColor.createProperty(this, WidgetColorService.getColor(NamedWidgetColors.BACKGROUND))); properties.add(insets = runtimePropInsets.createProperty(this, new int[] { 0, 0 })); + properties.add(gap = propGap.createProperty(this, 0)); } /** {@inheritDoc} */ @@ -140,4 +143,10 @@ public WidgetProperty runtimePropInsets() { return insets; } + + /** @return 'gap' property */ + public WidgetProperty propGap() + { + return gap; + } } diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TemplateInstanceWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TemplateInstanceWidget.java index 2eb69cdc6d..05080793f3 100644 --- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TemplateInstanceWidget.java +++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/TemplateInstanceWidget.java @@ -10,6 +10,7 @@ import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propFile; import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propHorizontal; import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propMacros; +import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propGap; import static org.csstudio.display.builder.model.properties.CommonWidgetProperties.propTransparent; import java.util.Arrays; @@ -80,17 +81,6 @@ public InstanceProperty(final Widget widget, final int index) (widget, index) -> new InstanceProperty(widget, index), /* minimum count */ 1); - /** 'gap' property: Gap between instances */ - public static final WidgetPropertyDescriptor propGap = - new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "gap", Messages.WidgetProperties_Gap) - { - @Override - public WidgetProperty createProperty(final Widget widget, final Integer value) - { - return new IntegerWidgetProperty(this, widget, value, 0, 500); - } - }; - /** 'wrap_count' property: Optional instance count for wrapping to next row/column */ public static final WidgetPropertyDescriptor propWrapCount = new WidgetPropertyDescriptor<>(WidgetPropertyCategory.DISPLAY, "wrap_count", Messages.WidgetProperties_WrapCount) diff --git a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ArrayRepresentation.java b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ArrayRepresentation.java index ab39ffa03e..7421fd56f6 100644 --- a/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ArrayRepresentation.java +++ b/app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/widgets/ArrayRepresentation.java @@ -90,6 +90,7 @@ protected void registerListeners() model_widget.propWidth().addPropertyListener(sizeChangedListener); model_widget.propForegroundColor().addPropertyListener(colorChangedListener); model_widget.displayBackgroundColor().addPropertyListener(colorChangedListener); + model_widget.propGap().addPropertyListener(sizeChangedListener); childrenChanged(null, null, model_widget.runtimeChildren().getValue()); adjustNumberByLength(); @@ -104,6 +105,7 @@ protected void unregisterListeners() model_widget.propWidth().removePropertyListener(sizeChangedListener); model_widget.propForegroundColor().removePropertyListener(colorChangedListener); model_widget.displayBackgroundColor().removePropertyListener(colorChangedListener); + model_widget.propGap().removePropertyListener(sizeChangedListener); super.unregisterListeners(); } @@ -323,6 +325,7 @@ private void arrangeChildren() : (height = model_widget.propHeight().getValue()) - inset * 2; final int w = vertical ? (width = model_widget.propWidth().getValue()) - inset * 2 : master.propWidth().getValue(); + final int gap = model_widget.propGap().getValue(); int len = 0; for (Widget child : children) { @@ -330,9 +333,10 @@ private void arrangeChildren() child.propWidth().setValue(w); child.propX().setValue(vertical ? 0 : len); child.propY().setValue(vertical ? len : 0); - len += vertical ? h : w; + len += (vertical ? h : w) + gap; } - len += inset * 2; + // No gap after the last element + len += (inset * 2) - gap; if (vertical && len != height) model_widget.propHeight().setValue(height = len); else if (!vertical && len != width) @@ -351,8 +355,9 @@ private void adjustNumberByLength() final boolean vertical = testVerticalStacking(children.get(0)); final int l = vertical ? children.get(0).propHeight().getValue() : children.get(0).propWidth().getValue(); - numChildren = vertical ? (height - inset * 2) / l - : (width - inset * 2) / l; + final int gap = model_widget.propGap().getValue(); + numChildren = vertical ? (height - inset * 2 + gap) / (l + gap) + : (width - inset * 2 + gap) / (l + gap); dirty_number.mark(); toolkit.scheduleUpdate(this); }