Browse Source

Merge pull request #278 in BA/design from ~XIAOHU/design:dev to dev

* commit 'e4efff53fe49cf2e20936e435450d63aa700c970':
  配色的渐变色滑块固定
  配色的渐变色滑块固定
  update
master
superman 8 years ago
parent
commit
08e6f8bdca
  1. 1
      designer/src/com/fr/design/report/share/ShareButton.java
  2. 19
      designer_base/src/com/fr/design/style/background/gradient/FixedGradientBar.java
  3. 2
      designer_chart/src/com/fr/design/chart/gui/ChartComponent.java
  4. 6
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

1
designer/src/com/fr/design/report/share/ShareButton.java

@ -15,7 +15,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.bbs.BBSConstants;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.general.Inter; import com.fr.general.Inter;

19
designer_base/src/com/fr/design/style/background/gradient/FixedGradientBar.java

@ -0,0 +1,19 @@
package com.fr.design.style.background.gradient;
import com.fr.design.style.background.gradient.GradientBar;
/**
* 这个bar不能拖拽滑动
*/
public class FixedGradientBar extends GradientBar {
private static final long serialVersionUID = 2787525421995954889L;
public FixedGradientBar(int minvalue, int maxvalue) {
super(minvalue, maxvalue);
}
@Override
protected void addMouseDragListener() {
//不添加拖拽事件
}
}

2
designer_chart/src/com/fr/design/chart/gui/ChartComponent.java

@ -319,4 +319,6 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
g2d.drawImage(chartImage, 0, 0, chartWidth, chartHeight, null); g2d.drawImage(chartImage, 0, 0, chartWidth, chartHeight, null);
} }
} }
} }

6
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java

@ -12,7 +12,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.style.background.gradient.GradientBar; import com.fr.design.style.background.gradient.FixedGradientBar;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -33,7 +33,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
protected UIComboBox styleSelectBox; protected UIComboBox styleSelectBox;
protected JPanel customPane; protected JPanel customPane;
protected JPanel changeColorSetPane; protected JPanel changeColorSetPane;
protected GradientBar colorGradient; protected FixedGradientBar colorGradient;
protected CardLayout cardLayout; protected CardLayout cardLayout;
@ -55,7 +55,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
customPane.add(buttonPane, BorderLayout.NORTH); customPane.add(buttonPane, BorderLayout.NORTH);
changeColorSetPane = new JPanel(cardLayout = new CardLayout()); changeColorSetPane = new JPanel(cardLayout = new CardLayout());
changeColorSetPane.add(colorGradient = new GradientBar(4, 130), "gradient"); changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
changeColorSetPane.add(colorAcc = new ChartAccColorPane(), "acc"); changeColorSetPane.add(colorAcc = new ChartAccColorPane(), "acc");
cardLayout.show(changeColorSetPane, "acc"); cardLayout.show(changeColorSetPane, "acc");
customPane.add(changeColorSetPane, BorderLayout.CENTER); customPane.add(changeColorSetPane, BorderLayout.CENTER);

Loading…
Cancel
Save