From 56bc20e0941817d56ae2d9a13ed5fd703beaebeb Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Tue, 23 Jan 2018 09:09:43 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6709=20master=E8=BF=99=E8=BE=B9=E8=AF=AF?=
 =?UTF-8?q?=E5=88=A0=E4=BA=86=E4=B8=80=E8=A1=8C=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/xpane/LayoutBorderPreviewPane.java       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java
index e03013fd5c..434f431b0a 100644
--- a/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java
+++ b/designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java
@@ -13,11 +13,15 @@ import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
-import javax.swing.*;
 
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Shape;
 import java.awt.geom.Rectangle2D;
-import java.awt.geom.Rectangle2D.Double;
 import java.awt.geom.RoundRectangle2D;
 
 /**
@@ -26,7 +30,7 @@ import java.awt.geom.RoundRectangle2D;
  * Date: 14-9-18
  * Time: 下午3:31
  */
-public class LayoutBorderPreviewPane extends JPanel{
+public class LayoutBorderPreviewPane extends JPanel {
     private titlePreviewPane jp;
     private LayoutBorderStyle borderStyle;
     private int smallGAP = 5;
@@ -91,6 +95,7 @@ public class LayoutBorderPreviewPane extends JPanel{
             jp.setPreferredSize(new Dimension(getWidth() - GAP, height));
             jp.setBounds(smallGAP,smallGAP, getWidth() - GAP, height);
             borderStyle.paint(g, new Rectangle2D.Double(smallGAP, smallGAP, getWidth() - GAP, getHeight() - GAP));
+            jp.setFontObject(borderStyle.getTitle().getFrFont());
             showTitlePreviewPane();
         }
     }
@@ -106,6 +111,7 @@ public class LayoutBorderPreviewPane extends JPanel{
             frFont = FRContext.getDefaultValues().getFRFont();
         }
 
+        @Override
         public void paintComponent(Graphics g) {
             Graphics2D g2d = (Graphics2D) g;
             Dimension d = getSize();
@@ -147,7 +153,7 @@ public class LayoutBorderPreviewPane extends JPanel{
             }
             g.setColor(borderStyle.getColor());
             int line = GraphHelper.getLineStyleSize(borderStyle.getBorder());
-            Double double1 =  new Rectangle2D.Double(0, getHeight()-1, getWidth(), getHeight());
+            Rectangle2D.Double double1 =  new Rectangle2D.Double(0, getHeight()-1, getWidth(), getHeight());
             double x = double1.getX() + (line == 1 ? 1 : 2) - line - 1;
             double y = double1.getY() + (line == 1 ? 1 : 2) - line ;
             RoundRectangle2D.Double  double2 = new RoundRectangle2D.Double(x, y, double1.getWidth() + line, double1.getHeight() + line,  0, 0);