Merge pull request #1628 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit '14a899fcc94ec4d05457ca9ed0c6287939c61fc5':
  REPORT-6769 tab添加一个选中背景

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

@@ -2167,3 +2167,4 @@ FR-Designer_Tab_Menu_Style=Menu Style
 FR-Designer_Tab_Pentagon_Style=Pentagon Style
 FR-Designer_Tab_Trapezoid_Style=Trapezoid Style
 FR-Designer_Tab_Display_Position=Display Position
+FR-Designer_Background_Select=Select Background

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

@@ -2166,3 +2166,4 @@ FR-Designer_Tab_Menu_Style=Menu Style
 FR-Designer_Tab_Pentagon_Style=Pentagon Style
 FR-Designer_Tab_Trapezoid_Style=Trapezoid Style
 FR-Designer_Tab_Display_Position=Display Position
+FR-Designer_Background_Select=Select Background

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

@@ -2167,3 +2167,4 @@ FR-Designer_Tab_Menu_Style=
 FR-Designer_Tab_Pentagon_Style=
 FR-Designer_Tab_Trapezoid_Style=
 FR-Designer_Tab_Display_Position=
+FR-Designer_Background_Select=

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

@@ -2167,3 +2167,4 @@ FR-Designer_Tab_Menu_Style=
 FR-Designer_Tab_Pentagon_Style=
 FR-Designer_Tab_Trapezoid_Style=
 FR-Designer_Tab_Display_Position=
+FR-Designer_Background_Select=

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

@@ -2167,3 +2167,4 @@ FR-Designer_Tab_Menu_Style=\u83DC\u5355\u5F0F
 FR-Designer_Tab_Pentagon_Style=\u4E94\u8FB9\u5F62
 FR-Designer_Tab_Trapezoid_Style=\u68AF\u5F62
 FR-Designer_Tab_Display_Position=\u663E\u793A\u4F4D\u7F6E
+FR-Designer_Background_Select=\u9009\u4E2D\u80CC\u666F

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

@@ -2166,3 +2166,4 @@ FR-Designer_Tab_Menu_Style=\u83DC\u55AE\u5F0F
 FR-Designer_Tab_Pentagon_Style=\u4E94\u908A\u5F62
 FR-Designer_Tab_Trapezoid_Style=\u68AF\u5F62
 FR-Designer_Tab_Display_Position=\u986F\u793A\u4F4D\u7F6E
+FR-Designer_Background_Select=\u9078\u4E2D\u80CC\u666F

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

@@ -42,7 +42,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Initial")), initalBackgroundEditor},
                 new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor},
-                new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Click")), clickBackgroundEditor},
+                new Component[]{getClickLabel(), clickBackgroundEditor},
         };
         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));
@@ -61,6 +61,10 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
         clickBackgroundEditor = new AccessibleImgBackgroundEditor();
     }
 
+    protected UILabel getClickLabel(){
+        return new UILabel(Inter.getLocText("FR-Designer_Background-Click"));
+    }
+
     protected UILabel createUILable(){
         return new UILabel(Inter.getLocText("FR-Designer_Background"));
     }

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

@@ -325,10 +325,9 @@ public class XCardSwitchButton extends XButton {
 		Background background = widgetTitle.getBackground();
 		TemplateStyle templateStyle = ((WCardTagLayout) tagLayout.toData()).getTemplateStyle();
 		Background initialBackground = button.getInitialBackground();
-		Background defaultSelectBackground = templateStyle.getSelectBackground();
+		Background selectBackground = button.getClickBackground();
-		//todo 这边先这么改，之后会加一个选中背景设置再做调整
 		if (button.isShowButton()) {
-			this.setContentBackground(defaultSelectBackground);
+			this.setContentBackground(selectBackground == null ? templateStyle.getSelectBackground() : selectBackground);
 		} else {
 			this.setContentBackground(initialBackground == null ? background : initialBackground);
 		}

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

@@ -24,6 +24,11 @@ public class TabFitLayoutBackgroundPane extends BackgroundCompPane<WTabFitLayout
         clickBackgroundEditor = new AccessibleTabBackgroundEditor();
     }
 
+    @Override
+    protected UILabel getClickLabel(){
+        return new UILabel(Inter.getLocText("FR-Designer_Background_Select"));
+    }
+
     public void update(CardSwitchButton cardSwitchButton){
         int selectIndex = backgroundHead.getSelectedIndex();
         if(selectIndex == 0){

designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java

@@ -157,7 +157,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
             button.setInitialBackground(defaultStyle ? null : templateStyle.getTabDefaultBackground());
             button.setOverBackground(null);
             button.setClickBackground(null);
-            button.setCustomStyle(true);
+            button.setCustomStyle(!defaultStyle);
         }
     }
 }