diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java index 5d1b331122..a1eadbe8fa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java @@ -32,27 +32,19 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam } public UINumberDragPane(double minValue, double maxValue) { - this(minValue, maxValue, 1, (int) maxValue - (int) minValue); - } - - public UINumberDragPane(double minValue, double maxValue, int majorTickSpace) { - this(minValue, maxValue, 1, majorTickSpace); + this(minValue, maxValue, 1); } public UINumberDragPane(double minValue, double maxValue, double dierta) { - this(minValue, maxValue, dierta, (int) maxValue - (int) minValue); - } - - public UINumberDragPane(double minValue, double maxValue, double dierta, int majorTickSpace) { dragBar = new UISlider((int) minValue, (int) maxValue); dragBar.setPaintLabels(true); - dragBar.setMajorTickSpacing(majorTickSpace); + dragBar.setMajorTickSpacing(minValue < 0 ? (int) maxValue : (int) maxValue - (int) minValue); spinner = createUISpinner(minValue, maxValue, dierta); spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); spinner.setValue(dragBar.getValue()); this.setLayout(new BorderLayout()); this.add(Layouts.row( - cell(dragBar).weight(0.8), flex(0.1), cell(spinner).weight(0.6) + cell(dragBar).weight(0.7), flex(0.1), cell(spinner).weight(0.7) ).getComponent()); dragBar.addChangeListener(e -> { if (globalNameListener != null && shouldResponseNameListener()) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java index d290bf2cc6..9a17962b7a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPaneWithPercent.java @@ -14,10 +14,6 @@ public class UINumberDragPaneWithPercent extends UINumberDragPane { super(minValue, maxValue); } - public UINumberDragPaneWithPercent(double minValue, double maxValue, int majorTickSpace) { - super(minValue, maxValue, majorTickSpace); - } - public UINumberDragPaneWithPercent(double minValue, double maxValue, double dierta) { super(minValue, maxValue, dierta); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index ba8a50497e..a8b039c77b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -63,7 +63,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createSeriesStylePane() { isFixedWidth = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); columnWidth = new UISpinnerWithPx(0,1000,1,0); - seriesGap = new UINumberDragPaneWithPercent(-100, 100, 100); + seriesGap = new UINumberDragPaneWithPercent(-100, 100); categoryGap = new UINumberDragPaneWithPercent(0, 100); isFillWithImage = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_YES"), Toolkit.i18nText("Fine-Design_Chart_NO")}); imagePane = new ImageBackgroundQuickPane(false);