From 202f482b7e0b533fa63d8512f420f673642ca08f Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Wed, 12 Jul 2017 16:07:45 +0800
Subject: [PATCH] update

---
 .../mainframe/CellElementPropertyPane.java    | 41 -------------------
 .../mainframe/cell/CellElementEditPane.java   |  3 --
 .../com/fr/design/gui/style/BorderPane.java   |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/CellElementPropertyPane.java b/designer/src/com/fr/design/mainframe/CellElementPropertyPane.java
index 6785b17f9..96ca02a5e 100644
--- a/designer/src/com/fr/design/mainframe/CellElementPropertyPane.java
+++ b/designer/src/com/fr/design/mainframe/CellElementPropertyPane.java
@@ -11,13 +11,9 @@ import com.fr.base.BaseUtils;
 import com.fr.design.fun.CellAttributeProvider;
 import com.fr.design.fun.PresentKindProvider;
 import com.fr.design.gui.frpane.UITitlePanel;
-import com.fr.design.gui.ibutton.UIHeadGroup;
-import com.fr.design.gui.ibutton.UISideGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
 import com.fr.design.mainframe.cell.CellElementEditPane;
-import com.fr.design.mainframe.cell.settingpane.AbstractCellAttrPane;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
@@ -87,43 +83,6 @@ public class CellElementPropertyPane extends DockingView {
         }
     };
 
-    public static void main(String[] args){
-        JFrame jf = new JFrame("test");
-        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        GUICoreUtils.centerWindow(jf);
-        final JPanel jPanel = (JPanel) jf.getContentPane();
-        jPanel.setLayout(new BorderLayout());
-        final CardLayout card = new CardLayout();
-        final JPanel center = new JPanel();
-        center.setLayout( new CardLayout());
-
-        final JPanel content = new JPanel();
-        content.setLayout(new BorderLayout());
-        final CellElementPropertyPane pane = new CellElementPropertyPane();
-        content.add(new CellElementPropertyPane(), BorderLayout.CENTER);
-        Icon[] iconArray = new Icon[2];
-        iconArray[0] = BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png");
-        center.add(content,content.getUIClassID());
-        iconArray[1] = BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png");
-        center.add(new JPanel(),"");
-//        for (int i = 0; i < 4; i++) {
-//                iconArray[0] = BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png");
-//                center.add(content,content.getUIClassID());
-//        }
-
-
-        final TitleChangeListener titleChangeListener = null;
-        UISideGroup tabsHeaderIconPane = new UISideGroup(iconArray) {
-        };
-        JPanel j1 = new JPanel();
-        j1.setLayout(new GridLayout(10,1));
-        j1.add(tabsHeaderIconPane);
-        tabsHeaderIconPane.setNeedLeftRightOutLine(false);
-        jPanel.add(j1, BorderLayout.WEST);
-        jPanel.add(center,BorderLayout.CENTER);
-        jf.setSize(500, 500);
-        jf.setVisible(true);
-    }
 
     private CellElementPropertyPane() {
         this.setLayout(new BorderLayout());
diff --git a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
index 8d3980a48..07f95d54f 100644
--- a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
+++ b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java
@@ -13,9 +13,6 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itabpane.TitleChangeListener;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.EastTopArrow;
 import com.fr.design.mainframe.cell.settingpane.*;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.utils.gui.GUICoreUtils;
diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java
index 43238c348..d214198a8 100644
--- a/designer_base/src/com/fr/design/gui/style/BorderPane.java
+++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java
@@ -184,7 +184,7 @@ public class BorderPane extends AbstractBasicStylePane {
 	}
 
 	public Style update(Style style) {
-//		style = style.deriveBackground(backgroundPane.update());
+		style = style.deriveBackground(backgroundPane.update());
 		if (style == null) {
 			style = Style.DEFAULT_STYLE;
 		}