From 8d61a5ef3d49568200642f3c0eb41df48f029598 Mon Sep 17 00:00:00 2001
From: MoMeak <MoMeak@fanruan.com>
Date: Mon, 21 Aug 2017 19:32:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3983=20[9.0=E4=B8=80=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E9=80=89=E4=B8=AD=E4=B8=80=E7=89=87=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E5=A4=96=E8=BE=B9=E6=A1=86=E3=80=81=E5=86=85=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/settingpane/style/CustomStylePane.java     | 4 ++--
 designer_base/src/com/fr/design/gui/style/BorderPane.java     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index b899071d6..d25788c87 100644
--- a/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -111,7 +111,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
 
 
     public boolean isBorderPaneSelected() {
-        return tabPane.getSelectedIndex() == TWO_INDEX;
+        return tabPane.getSelectedIndex() == ONE_INDEX;
     }
 
     /**
@@ -137,7 +137,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
      *
      */
     public void updateBorder() {
-        BorderUtils.update(reportPane, ((BorderPane) paneList.get(TWO_INDEX)).update());
+        BorderUtils.update(reportPane, ((BorderPane) paneList.get(ONE_INDEX)).update());
     }
 
     /**
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 fd8013677..63d649502 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());
+
         if (style == null) {
             style = Style.DEFAULT_STYLE;
         }
@@ -193,6 +193,7 @@ public class BorderPane extends AbstractBasicStylePane {
 
         style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(),
                 cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor());
+        style = style.deriveBackground(backgroundPane.update());
         return style;
     }