Browse Source

修改颜色配接界面显示不全bug

master
mengao 7 years ago
parent
commit
02eb453887
  1. 14
      designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java
  2. 4
      designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

14
designer_chart/src/com/fr/plugin/chart/designer/component/VanChartAreaSeriesFillColorPane.java

@ -4,7 +4,6 @@ import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.frpane.UINumberDragPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.VanChartAttrHelper;
import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground;
@ -19,7 +18,6 @@ import java.awt.*;
*/ */
public class VanChartAreaSeriesFillColorPane extends BasicPane { public class VanChartAreaSeriesFillColorPane extends BasicPane {
private static final long serialVersionUID = 9166866984438854779L; private static final long serialVersionUID = 9166866984438854779L;
private static final int PANE_WIDTH = 221;
private VanChartMarkerBackgroundPane fillColorPane; private VanChartMarkerBackgroundPane fillColorPane;
private UINumberDragPane transparent; private UINumberDragPane transparent;
@ -41,15 +39,9 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent); JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent);
Component[][] components = new Component[][]{ this.setLayout(new BorderLayout());
new Component[]{fillColorPane}, this.add(fillColorPane, BorderLayout.NORTH);
new Component[]{transparentPane}, this.add(transparentPane, BorderLayout.CENTER);
};
JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, row, col);
contentPane.setPreferredSize(new Dimension(PANE_WIDTH, (int)contentPane.getPreferredSize().getHeight()));
this.add(contentPane);
} }
protected String title4PopupWindow(){ protected String title4PopupWindow(){

4
designer_chart/src/com/fr/plugin/chart/designer/style/axis/VanChartBaseAxisPane.java

@ -252,8 +252,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
axisLimitSize = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); axisLimitSize = new UIButtonGroup<Integer>(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")});
JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize); JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize);
maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion); maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0));
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());
panel.add(limitSizePane, BorderLayout.NORTH); panel.add(limitSizePane, BorderLayout.NORTH);
panel.add(maxProportionPane, BorderLayout.CENTER); panel.add(maxProportionPane, BorderLayout.CENTER);

Loading…
Cancel
Save