REPORT-6662 交互验收后问题

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -60,9 +60,9 @@ FR-Designer-Widget-Title_border_color=\u989C\u8272
 FR-Designer_AbsoluteLayout=\u7EDD\u5BF9\u5E03\u5C40
 FR-Designer_Allow_Decimals=\u5141\u8BB8\u5C0F\u6570
 FR-Designer_Allow_Negative=\u5141\u8BB8\u8D1F\u503C
-FR-Designer_Background-Click=\u9F20\u6807\u70B9\u51FB\u80CC\u666F
+FR-Designer_Background-Click=\u70B9\u51FB\u80CC\u666F
 FR-Designer_Background-Initial=\u521D\u59CB\u80CC\u666F
-FR-Designer_Background-Over=\u9F20\u6807\u6D6E\u52A8\u80CC\u666F
+FR-Designer_Background-Over=\u60AC\u6D6E\u80CC\u666F
 FR-Designer_Bar-Code-Exception-Tip=\u6570\u636E\u4E0D\u80FD\u4E3A\u7A7A
 FR-Designer_Block-intersect=\u7981\u6B62\u5757\u4E0E\u5757\u4E4B\u95F4\u7684\u91CD\u53E0
 FR-Designer_BorderLayout=\u8FB9\u754C\u5E03\u5C40

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -59,9 +59,9 @@ FR-Designer-Widget-Title_border_color=\u6A19\u984C\u6846\u7DDA\u984F\u8272
 FR-Designer_AbsoluteLayout=\u7D55\u5C0D\u4F48\u5C40
 FR-Designer_Allow_Decimals=\u5141\u8A31\u5C0F\u6578
 FR-Designer_Allow_Negative=\u5141\u8A31\u8CA0\u503C
-FR-Designer_Background-Click=\u6ED1\u9F20\u9EDE\u64CA\u80CC\u666F
+FR-Designer_Background-Click=\u9EDE\u64CA\u80CC\u666F
 FR-Designer_Background-Initial=\u521D\u59CB\u80CC\u666F
-FR-Designer_Background-Over=\u6ED1\u9F20\u61F8\u6D6E\u80CC\u666F
+FR-Designer_Background-Over=\u61F8\u6D6E\u80CC\u666F
 FR-Designer_Bar-Code-Exception-Tip=\u689D\u78BC\u4F8B\u5916\u63D0\u793A
 FR-Designer_Block-intersect=\u5340\u584A\u91CD\u758A
 FR-Designer_BorderLayout=\u908A\u754C\u5E03\u5C40

designer_base/src/com/fr/design/widget/component/BackgroundCompPane.java

@@ -46,7 +46,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Click")), clickBackgroundEditor},
         };
-        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
+        panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         backgroundHead = new UIButtonGroup(titles);
         JPanel headPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -63,7 +63,7 @@ public class XCardSwitchButton extends XButton {
 
 	// 删除按钮识别区域偏移量
 	private static final int RIGHT_OFFSET = 15;
-	private static final int TOP_OFFSET = 25;
+	private static final int TOP_OFFSET = 15;
 
 	//这边先不计算button的高度,涉及到layout那边的整体高度,先用之前的固定高度
 	private static final int DEFAULT_BUTTON_HEIGHT = 36;
@@ -284,19 +284,18 @@ public class XCardSwitchButton extends XButton {
 		ex -= mainX;
 		ey -= mainY;
 
+		XLayoutContainer titleLayout = tagLayout.getBackupParent();
+		Point titlePoint = titleLayout.getLocation();
 		// button position
 		XCardSwitchButton button = this;
 		Point position = button.getLocation();
 		int width = button.getWidth();
-		int height = button.getHeight();
-
-		ey = ey % DEFAULT_BUTTON_HEIGHT;
 
 		// 鼠标进入按钮右侧删除图标区域
-		double recX = position.getX() + (width - RIGHT_OFFSET);
-		double recY = position.getY() + (height - TOP_OFFSET);
+		double recX = position.getX() + titlePoint.getX() +  (width - RIGHT_OFFSET);
+		double recY = position.getY() + titlePoint.getY() + TOP_OFFSET;
 		
-		return (recX < ex && ex < recX + RIGHT_OFFSET &&  ey < recY);
+		return (recX < ex && ex < recX + RIGHT_OFFSET &&  ey < recY && ey > position.getY());
 	}
 	
 	//将当前switchButton改为选中状态

designer_form/src/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java

@@ -4,7 +4,6 @@ import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
-import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;