Browse Source

Pull request #5574: REPORT-58211 【主题切换】单元格样式的背景渐变色,右边按钮不好点

Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x

* commit '2aa1e476ca140d7dd3449df5823e9d731696da9f':
  REPORT-58211 【主题切换】单元格样式的背景渐变色,右边按钮不好点
research/11.0
starryi 3 years ago
parent
commit
e949220ea2
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java
  3. 2
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@ -63,7 +63,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
public static final int PREVIEW_PANE_WIDTH = LEFT_TITLE_PANE_WIDTH - 10; public static final int PREVIEW_PANE_WIDTH = LEFT_TITLE_PANE_WIDTH - 10;
public static final int PREVIEW_PANE_HEIGHT = LEFT_TITLE_PANE_HEIGHT - TITLE_BORDER_FONT - 16; public static final int PREVIEW_PANE_HEIGHT = LEFT_TITLE_PANE_HEIGHT - TITLE_BORDER_FONT - 16;
public static final int RIGHT_PANE_WIDTH = 352; public static final int RIGHT_PANE_WIDTH = 362;
public static final int RIGHT_PANE_HEIGHT = LEFT_TITLE_PANE_HEIGHT; public static final int RIGHT_PANE_HEIGHT = LEFT_TITLE_PANE_HEIGHT;
public static final int COLOR_SCHEME_TITLE_PANE_WIDTH = 298; public static final int COLOR_SCHEME_TITLE_PANE_WIDTH = 298;
public static final int COLOR_SCHEME_TITLE_PANE_HEIGHT = 174 + TITLE_BORDER_FONT / 2; public static final int COLOR_SCHEME_TITLE_PANE_HEIGHT = 174 + TITLE_BORDER_FONT / 2;
@ -275,7 +275,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
return container; return container;
} }
public void addCustomEditorPane(String title, JComponent component) { public void addCustomEditorPane(String title, JComponent component) {
component.setPreferredSize(new Dimension(350, 260)); component.setPreferredSize(new Dimension(360, 260));
uiTabbedPane.addTab(title, component); uiTabbedPane.addTab(title, component);
} }
protected JPanel createCellStyleSettingPane() { protected JPanel createCellStyleSettingPane() {

2
designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeProfileDialog.java

@ -36,7 +36,7 @@ public class TemplateThemeProfileDialog<T extends TemplateTheme> extends Templat
public static TemplateThemeProfilePane<? extends TemplateTheme> currentVisibleProfilePane; public static TemplateThemeProfilePane<? extends TemplateTheme> currentVisibleProfilePane;
public static final int CONTENT_WIDTH = 900; public static final int CONTENT_WIDTH = 910;
public static final int CONTENT_HEIGHT = 570; public static final int CONTENT_HEIGHT = 570;
public TemplateThemeProfileDialog(Window parent, TemplateThemeProfilePane<T> profilePane) { public TemplateThemeProfileDialog(Window parent, TemplateThemeProfilePane<T> profilePane) {

2
designer-base/src/main/java/com/fr/design/mainframe/theme/edit/CellStyleListEditPane.java

@ -139,7 +139,7 @@ public class CellStyleListEditPane extends JListControlPane {
initCardPane(); initCardPane();
JPanel leftPane = getLeftPane(); JPanel leftPane = getLeftPane();
leftPane.setPreferredSize(new Dimension(90, 0)); leftPane.setPreferredSize(new Dimension(90, 0));
cardPane.setPreferredSize(new Dimension(260, 0)); cardPane.setPreferredSize(new Dimension(270, 0));
JPanel mainSplitPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel mainSplitPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
mainSplitPane.add(leftPane, BorderLayout.WEST); mainSplitPane.add(leftPane, BorderLayout.WEST);
mainSplitPane.add(cardPane, BorderLayout.CENTER); mainSplitPane.add(cardPane, BorderLayout.CENTER);

Loading…
Cancel
Save