Browse Source

REPORT-5508 加回边框

master
MoMeak 7 years ago
parent
commit
854ad41fd0
  1. 3
      designer/src/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
  2. 1
      designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java

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

1
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) { public UIToggleButton(Icon[] icons, boolean needRelease) {
super(icons[0], null, icons[1]); super(icons[0], null, icons[1]);
setBorderPainted(true);
setSelectedIcon(icons[1]); setSelectedIcon(icons[1]);
setExtraPainted(true); setExtraPainted(true);
if (!needRelease) { if (!needRelease) {

Loading…
Cancel
Save