Browse Source

REPORT-4580 部分视觉验收bug=>15 边框颜色调整

master
plough 7 years ago
parent
commit
81543e850b
  1. 2
      designer_base/src/com/fr/design/constants/UIConstants.java
  2. 4
      designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java
  3. 4
      designer_base/src/com/fr/design/web/CustomIconPane.java

2
designer_base/src/com/fr/design/constants/UIConstants.java

@ -106,7 +106,7 @@ public interface UIConstants {
public static final Color RULER_SCALE_COLOR = new Color(0x4e504f);
public static final Color PROPERTY_PANE_BACKGROUND = new Color(0xdadadd);
public static final Color SPLIT_LINE = new Color(201, 198, 184);
public static final Color TITLED_BORDER_COLOR = new Color(0xededee);
public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9);
public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221);
public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd);
public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235);

4
designer_base/src/com/fr/design/utils/gui/GUICoreUtils.java

@ -172,7 +172,7 @@ public abstract class GUICoreUtils{
public static TitledBorder createTitledBorder(String s, Color c) {
UITitledBorder tb = UITitledBorder.createBorderWithTitle(s);
if (c == null) {
c = new Color(102, 153, 255);
c = Color.black;
}
tb.setTitleColor(c);
return tb;
@ -185,7 +185,7 @@ public abstract class GUICoreUtils{
* @return 同上
*/
public static TitledBorder createTitledBorder(String s) {
return createTitledBorder(s, new Color(102, 153, 255));
return createTitledBorder(s, Color.black);
}
/**

4
designer_base/src/com/fr/design/web/CustomIconPane.java

@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
import com.fr.base.GraphHelper;
import com.fr.base.Icon;
import com.fr.base.IconManager;
import com.fr.design.constants.UIConstants;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ibutton.UIButton;
@ -16,6 +17,7 @@ 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.utils.gui.GUICoreUtils;
import com.fr.form.ui.WidgetManager;
import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
@ -63,7 +65,7 @@ public class CustomIconPane extends BasicPane {
private void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Icon")));
centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Icon")));
JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
centerPane.add(noNamePane, BorderLayout.CENTER);

Loading…
Cancel
Save