Merge pull request #1490 in BA/design from ~MOMEAK/design9.0:feature/9.0 to feature/9.0

* commit '854ad41fd029dd07ecad84f746bd6ddddb625fc9':
  REPORT-5508 加回边框
  REPORT-5695 [9.0三轮回归][8.0]设计器缩放后，报表工具栏显示不全

designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java

@@ -4,6 +4,7 @@ import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
 import com.fr.design.actions.utils.ReportActionUtils;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.MultiTabPane;
 import com.fr.design.gui.style.*;
@@ -12,6 +13,7 @@ import com.fr.design.style.BorderUtils;
 import com.fr.general.Inter;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.util.ArrayList;
@@ -38,6 +40,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
         super();
         tabPane.setOneLineTab(true);
         tabPane.setDrawLine(false);
+        tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
         tabPane.setLayout(new GridLayout(1, 3, 0, 0));
     }
 

designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java

@@ -74,6 +74,7 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
 	 */
 	public UIToggleButton(Icon[] icons, boolean needRelease) {
 		super(icons[0], null, icons[1]);
+		setBorderPainted(true);
 		setSelectedIcon(icons[1]);
 		setExtraPainted(true);
 		if (!needRelease) {

designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java

@@ -5,7 +5,6 @@ import java.awt.*;
 import java.util.ArrayList;
 
 public class UIToolbar extends JToolBar {
-    private static final int TOOLBAR_HEIGNT = 26;
 
     public UIToolbar() {
         this(FlowLayout.LEFT);
@@ -24,13 +23,6 @@ public class UIToolbar extends JToolBar {
         this(align, new UIToolBarUI());
     }
 
-    @Override
-    public Dimension getPreferredSize() {
-        Dimension dim = super.getPreferredSize();
-        dim.height = TOOLBAR_HEIGNT;
-        return dim;
-    }
-
     public void checkComponentsByNames(boolean flag, ArrayList<String> names) {
         for (int i = 0; i < getComponentCount(); i++) {
             Component component = getComponents()[i];