Browse Source

Merge pull request #1233 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit 'ba9ff6b1dadda446f514ca26709c34a28e771ac3':
  REPORT-4580 部分视觉验收bug=>18,弹出框悬停背景色
  REPORT-4580 部分视觉验收bug=>6,统一小箭头
  REPORT-4580 部分视觉验收bug=>14(按钮高度调整)
master
superman 7 years ago
parent
commit
d12cda4e28
  1. 1
      designer_base/src/com/fr/design/constants/UIConstants.java
  2. 4
      designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java
  3. 2
      designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java
  4. 2
      designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java
  5. 1
      designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

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

@ -110,6 +110,7 @@ public interface UIConstants {
public static final Color TAB_BUTTON_HOVER_SELECTED = new Color(239, 238, 243);
public static final Color TAB_BUTTON_PRESS = new Color(228, 227, 232);
public static final Color TAB_BUTTON_PRESS_SELECTED = new Color(236, 236, 238);
public static final Color POPUP_TITLE_BACKGROUND = new Color(0xd8f2fd);

4
designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java

@ -37,6 +37,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
protected CardLayout cardLayout;
protected JPanel cardPane;
protected BasePlot plot;
private static final int TOP_TOOLBAR_HEIGHT = 24;
public UIControlPane() {
this.initComponentPane();
@ -192,11 +193,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH
topToolBar.setLayout(new BorderLayout());
ShortCut addItem = addItemShortCut().getShortCut();
addItem.intoJToolBar(topToolBar);
topToolBar.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0));
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double[] columnSize = { p, f};
double[] rowSize = {p};
double[] rowSize = {TOP_TOOLBAR_HEIGHT};
Component[][] components = new Component[][]{
new Component[]{new UILabel(getAddItemText()), topToolBar},
};

2
designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java

@ -308,7 +308,7 @@ public class UIEastResizableContainer extends JPanel {
}
}
// g.drawImage(button, 2, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
g.drawImage(button, 18, 9, 5, 5, null);
g.drawImage(button, 18, 7, 5, 10, null);
}
}

2
designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java

@ -502,7 +502,7 @@ public class UIResizableContainer extends JPanel {
button = UIConstants.DRAG_LEFT_PRESS;
}
}
g.drawImage(button, 3, ARROW_MARGIN_VERTICAL, 5, 5, null);
g.drawImage(button, 3, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
} else {
g.drawImage(UIConstants.DRAG_BAR, 0, 0, toolPaneHeight, getHeight(), null);
if (containerWidth == toolPaneHeight) {

1
designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@ -852,6 +852,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else if (isMovable) {
setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
setBackground(UIConstants.POPUP_TITLE_BACKGROUND);
} else {
setCursor(Cursor.getDefaultCursor());
}

Loading…
Cancel
Save