Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -219,7 +219,7 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
             }
             popupEditDialog.setVisible(true);
             PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
-            osBasedAction.execute(this, popupEditDialog);
+            osBasedAction.register(this, popupEditDialog);
         }
     }
 

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -27,6 +27,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.style.color.ColorCell;
 import com.fr.design.style.color.ColorFactory;
 import com.fr.design.style.color.ColorSelectBox;
@@ -387,31 +388,35 @@ public final class GUICoreUtils {
 	 * @param y y坐标
 	 */
 	public static void showPopupMenu(JPopupMenu popup, Component parentComponent, int x, int y) {
-		if (popup == null) {// check null.
-			return;
-		}
-
-		Point point = new Point(x, y);
-		SwingUtilities.convertPointToScreen(point, parentComponent);
-
-		Dimension size = popup.getPreferredSize();
-		Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-		screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
-
-		int showOnScreenX = Math.min(screen.width, parentComponent.getLocationOnScreen().x + parentComponent.getWidth());
-
-		// peter:调整X的高度.
-		if (point.x + size.width > showOnScreenX && size.width < showOnScreenX) {
-			x += (showOnScreenX - point.x - size.width);
-		}
-
-		// peter:调整y高度.
-		if (point.y + size.height > screen.height && size.height < screen.height) {
-			y -= size.height;
-		}
-
-		popup.show(parentComponent, x, y);
-	}
+        if (popup == null) {// check null.
+            return;
+        }
+
+        Point point = new Point(x, y);
+        SwingUtilities.convertPointToScreen(point, parentComponent);
+
+        Dimension size = popup.getPreferredSize();
+        Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+        screen.setSize(screen.getSize().width, screen.height - HEIGHT_GAP);
+        //父元素右边界的坐标
+        int parentComponentRightBorderPosition = parentComponent.getLocationOnScreen().x + parentComponent.getWidth();
+        //设计器右边界的坐标
+        Rectangle rectangle = DesignerContext.getDesignerFrame().getBounds();
+        int designerRightBorderPosition = rectangle.x + rectangle.width;
+        rectangle = SwingUtilities.getWindowAncestor(parentComponent).getBounds();
+        designerRightBorderPosition = Math.max(designerRightBorderPosition, rectangle.x + rectangle.width);
+        // peter:调整X的高度.
+        if (point.x + size.width > designerRightBorderPosition && size.width < designerRightBorderPosition) {
+            x += (parentComponentRightBorderPosition - point.x - size.width);
+        }
+
+        // peter:调整y高度.
+        if (point.y + size.height > screen.height && size.height < screen.height) {
+            y -= size.height;
+        }
+
+        popup.show(parentComponent, x, y);
+    }
 
 	/**
 	 * Set enabled.<br>