Browse Source

Merge pull request #1029 in BA/design from ~KERRY/design:9.0 to 9.0

* commit '2fb21df0cd2a0511edb8e4ed79c2ea80ed71dfe9':
  REPORT-3293 9.0设计器控件设置重画
master
superman 7 years ago
parent
commit
d38124d164
  1. 3
      designer/src/com/fr/design/widget/ui/btn/ButtonDetailPaneFactory.java
  2. 4
      designer/src/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java

3
designer/src/com/fr/design/widget/ui/btn/ButtonDetailPaneFactory.java

@ -3,7 +3,6 @@ package com.fr.design.widget.ui.btn;
import com.fr.base.FRContext;
import com.fr.design.module.DesignModuleFactory;
import com.fr.design.widget.btn.ButtonDetailPane;
import com.fr.design.widget.ui.designer.btn.DefaultButtonDetailPane;
import com.fr.form.ui.Button;
import com.fr.form.ui.FreeButton;
import com.fr.form.ui.Widget;
@ -28,7 +27,7 @@ public class ButtonDetailPaneFactory {
static {
detailMap.put(Button.class.getName(), DefaultButtonDetailPane.class);
detailMap.put(FreeButton.class.getName(), com.fr.design.widget.ui.designer.btn.FreeButtonDetailPane.class);
detailMap.put(FreeButton.class.getName(), FreeButtonDetailPane.class);
if (StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class) != null) {
detailMap.put(StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class).getName(), DesignModuleFactory.getButtonDetailPaneClass());
}

4
designer/src/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java

@ -7,11 +7,11 @@ import com.fr.form.ui.FreeButton;
import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
public class FreeButtonDetailPane extends ButtonWithHotkeysDetailPane<FreeButton> {
private com.fr.design.widget.ui.designer.btn.ButtonSytleDefinedPane stylePane;
private ButtonSytleDefinedPane stylePane;
@Override
protected Component createCenterPane() {
return stylePane = new com.fr.design.widget.ui.designer.btn.ButtonSytleDefinedPane();
return stylePane = new ButtonSytleDefinedPane();
}
@Override

Loading…
Cancel
Save