From 9b0444cbba3d7bd92c8e2e785d07c8c3f3c72f17 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 22 Aug 2017 10:58:20 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-3163=20=E5=90=88=E4=BD=9C=E5=BC=80?= =?UTF-8?q?=E5=8F=919.0=E8=AE=BE=E8=AE=A1=E5=99=A8=3D>=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=3D=E3=80=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=BC=B9=E5=87=BA=E6=97=B6=EF=BC=8C=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E8=A1=A8=E7=A4=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E7=9A=84=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/EastRegionContainerPane.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java index 272eaa7b9..a9edafd92 100644 --- a/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java @@ -38,7 +38,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { // 弹出对话框高度 private static final int POPUP_MIN_HEIGHT = 145; private static final int POPUP_MAX_HEIGHT = 480; - private static final int POPUP_DEFAULT_HEIGHT = 360; + private static final int POPUP_DEFAULT_HEIGHT = 356; public static final String KEY_CELL_ELEMENT = "cellElement"; public static final String KEY_CELL_ATTR = "cellAttr"; public static final String KEY_FLOAT_ELEMENT = "floatElement"; @@ -883,7 +883,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private class PopupDialog extends JDialog { private Container container; - private static final int RESIZE_RANGE = 4; + private static final int RESIZE_RANGE = 8; private Cursor originCursor; private Cursor southResizeCursor = Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR); private Point mouseDownCompCoords; @@ -904,8 +904,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer { contentWrapper.add(contentPane, BorderLayout.CENTER); contentWrapper.setBorder(BorderFactory.createLineBorder(UIConstants.PROPERTY_DIALOG_BORDER)); + JPanel horizontalToolPane = new JPanel() { + @Override + public void paint(Graphics g) { + g.drawImage(UIConstants.DRAG_BAR, 0, 0, getWidth(), getHeight(), null); + g.drawImage(UIConstants.DRAG_DOT, (getWidth() - RESIZE_RANGE) / 2, 3, RESIZE_RANGE, 5, null); + } + }; + contentWrapper.add(horizontalToolPane, BorderLayout.SOUTH); + container.add(contentWrapper, BorderLayout.CENTER); - setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT); + setSize(CONTENT_WIDTH, POPUP_DEFAULT_HEIGHT + RESIZE_RANGE); adjustLocation(); initListener();