Browse Source

Merge pull request #1598 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '9c1defb11acd3a677c56677696b41f2d8af56f06':
  REPORT-29462 设计器菜单栏-模板-纸张背景-渐变色,滑动右边游标,确定后再次查看,位置回到初始位置
  REPORT-29882 8.0工程升级10.0后,模板web属性打不开
feature/big-screen
Hades 5 years ago
parent
commit
1c39bae7e3
  1. 3
      designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java

3
designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java

@ -118,6 +118,9 @@ public class BackgroundPane extends BasicPane {
*/ */
public void populate(Background background) { public void populate(Background background) {
BackgroundUIWrapper wrapper = getBackgroundUIWrapper(background); BackgroundUIWrapper wrapper = getBackgroundUIWrapper(background);
if (wrapper == null) {
return;
}
int index = wrapper.getIndex(); int index = wrapper.getIndex();
BackgroundDetailPane quickPane = getTabItemPane(background, index); BackgroundDetailPane quickPane = getTabItemPane(background, index);
quickPane.populate(background); quickPane.populate(background);

2
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java

@ -244,6 +244,7 @@ public class GradientBar extends JComponent implements UIObserver, ColorSelectab
*/ */
public void setStartValue(double startValue) { public void setStartValue(double startValue) {
startLabel.setValue(startValue); startLabel.setValue(startValue);
p1.setX(startValue);
} }
/** /**
@ -251,6 +252,7 @@ public class GradientBar extends JComponent implements UIObserver, ColorSelectab
*/ */
public void setEndValue(double endValue) { public void setEndValue(double endValue) {
endLabel.setValue(endValue); endLabel.setValue(endValue);
p2.setX(endValue);
} }
/** /**

Loading…
Cancel
Save