Browse Source

Merge pull request #171 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit '885cfa30e65913dedaea1892c912f066e596e651':
  REPORT-9232 【10.0一轮回归】按钮控件自定义背景设置
master
kerry 6 years ago
parent
commit
dfa00ac5e7
  1. 3
      designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java
  2. 3
      designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java

3
designer-base/src/com/fr/design/style/background/impl/ImageBackgroundPane.java

@ -2,6 +2,7 @@ package com.fr.design.style.background.impl;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.base.background.ImageBackground; import com.fr.base.background.ImageBackground;
import com.fr.base.background.ImageFileBackground;
import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.frpane.ImgChooseWrapper;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
@ -192,7 +193,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
@Override @Override
public Background update() throws Exception { public Background update() throws Exception {
ImageBackground imageBackground = new ImageBackground(previewPane.getImageWithSuffix()); ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix());
setImageStyle(); setImageStyle();
imageBackground.setLayout(imageStyle.getImageLayout()); imageBackground.setLayout(imageStyle.getImageLayout());
return imageBackground; return imageBackground;

3
designer-base/src/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java

@ -2,6 +2,7 @@ package com.fr.design.style.background.impl;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.base.background.ImageBackground; import com.fr.base.background.ImageBackground;
import com.fr.base.background.ImageFileBackground;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.general.Background; import com.fr.general.Background;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -81,6 +82,6 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane {
if (previewPane.getImage() == null) { if (previewPane.getImage() == null) {
return null; return null;
} }
return new ImageBackground(previewPane.getImageWithSuffix()); return new ImageFileBackground(previewPane.getImageWithSuffix());
} }
} }

Loading…
Cancel
Save