From 3a6bb94efe52d38a771e97ab9123aa6031475ea9 Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Wed, 25 Nov 2020 15:03:30 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-42237=20=E7=BB=84=E4=BB=B6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=BF=87=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/EditingMouseListener.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
index 524dd8bf1..0dcab318f 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java
@@ -194,7 +194,7 @@ public class EditingMouseListener extends MouseInputAdapter {
         e.translatePoint(oldX - e.getX(), oldY - e.getY());
     }
 
-    private void offsetEventPoint(MouseEvent e){
+    private void offsetEventPoint(MouseEvent e) {
         int x = designer.getRelativeX(e.getX());
         int y = designer.getRelativeY(e.getY());
         e.translatePoint(x - e.getX(), y - e.getY());
@@ -206,8 +206,8 @@ public class EditingMouseListener extends MouseInputAdapter {
      * @param e 鼠标事件
      */
     public void mouseReleased(MouseEvent e) {
-        MouseEvent transEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
-        MouseEvent clickEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(),  e.getX(), e.getY(),  e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
+        MouseEvent transEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(), e.getX(), e.getY(), e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
+        MouseEvent clickEvent = new MouseEvent(e.getComponent(), MouseEvent.MOUSE_CLICKED, e.getWhen(), e.getModifiers(), e.getX(), e.getY(), e.getXOnScreen(), e.getYOnScreen(), e.getClickCount(), e.isPopupTrigger(), e.getButton());
         int oldX = e.getX();
         int oldY = e.getY();
         offsetEventPoint(e);
@@ -240,7 +240,7 @@ public class EditingMouseListener extends MouseInputAdapter {
         }
     }
 
-    private boolean isAutoFire(MouseEvent transEvent, MouseEvent clickEvent ) {
+    private boolean isAutoFire(MouseEvent transEvent, MouseEvent clickEvent) {
         offsetEventPoint(transEvent);
         XCreator xCreator = designer.getComponentAt(transEvent);
         return (pressX != clickEvent.getX() || pressY != clickEvent.getY())
@@ -662,6 +662,7 @@ public class EditingMouseListener extends MouseInputAdapter {
      */
     public void startEditing(XCreator creator, DesignerEditor<? extends JComponent> designerEditor, ComponentAdapter adapter) {
         if (designerEditor != null) {
+            EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
             Rectangle rect = ComponentUtils.getRelativeBounds(creator);
             currentEditor = designerEditor;
             currentXCreator = creator;
@@ -728,15 +729,15 @@ public class EditingMouseListener extends MouseInputAdapter {
 
     /**
      * 刷新顶层组件
-     * */
-    public void refreshTopXCreator(boolean isEditing){
+     */
+    public void refreshTopXCreator(boolean isEditing) {
         designer.refreshTopXCreator(isEditing);
     }
 
     /**
      * 刷新顶层组件
-     * */
-    public void refreshTopXCreator(){
+     */
+    public void refreshTopXCreator() {
         refreshTopXCreator(false);
     }