From 18d2294eb58f7c7ee8735875d19bd0b1b4dbbabb Mon Sep 17 00:00:00 2001 From: hzzz Date: Mon, 22 Jan 2018 09:51:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/file/MutilTempalteTabPane.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java index 7fa29ea7c7..e25297b110 100644 --- a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java @@ -370,7 +370,9 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M templateStartX += realWidth; } - paintListDown(g2d, maxWidth); + if (!DesignerMode.isVcsMode()) { + paintListDown(g2d, maxWidth); + } paintUnderLine(templateStartX, maxWidth, g2d); } @@ -549,7 +551,9 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M g2d.drawString(sheetName, (int) templateStartX + sheeticon.getIconWidth() + 2 * GAP, getHeight() - GAP * 2); int closePosition = (int) templateStartX + realWidth - CLOSE.getIconWidth() - SMALLGAP; int closeY = (getHeight() - closeIcon.getIconHeight()) / 2; - closeIcon.paintIcon(this, g2d, closePosition, closeY); + if (!DesignerMode.isVcsMode()) { + closeIcon.paintIcon(this, g2d, closePosition, closeY); + } return closePosition; } @@ -605,7 +609,9 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M g2d.drawString(sheetName, (int) templateStartX + sheeticon.getIconWidth() + 2 * GAP, getHeight() - GAP * 2); int closeY = (getHeight() - closeIcon.getIconHeight()) / 2; int closePosition = (int) templateStartX + realWidth - CLOSE.getIconWidth() - SMALLGAP; - closeIcon.paintIcon(this, g2d, closePosition, closeY); + if (!DesignerMode.isVcsMode()) { + closeIcon.paintIcon(this, g2d, closePosition, closeY); + } return closePosition; } From 381f13e828ad5fed7d8d3c1c4ac8d451855711b0 Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 22 Jan 2018 15:28:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-6492=20=E5=90=8C=E6=AD=A59.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/fun/SubmitProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/fun/SubmitProvider.java b/designer_base/src/com/fr/design/fun/SubmitProvider.java index 729a0abe1f..32f4db02ae 100644 --- a/designer_base/src/com/fr/design/fun/SubmitProvider.java +++ b/designer_base/src/com/fr/design/fun/SubmitProvider.java @@ -10,7 +10,7 @@ public interface SubmitProvider extends Mutable{ String MARK_STRING = "SubmitProvider"; - int CURRENT_LEVEL = 1; + int CURRENT_LEVEL = 2; /**