REPORT-58503 【主题切换】预览区ui改版

【问题原因】
单元格样式预览显示透明块

【改动思路】
同上

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -0,0 +1,82 @@
+package com.fr.design.cell;
+
+import com.fr.base.NameStyle;
+import com.fr.base.ScreenResolution;
+import com.fr.base.Style;
+import com.fr.design.mainframe.theme.TemplateThemeBlock;
+import com.fr.general.IOUtils;
+
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Toolkit;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/9/3
+ */
+public class CellStylePreviewPane extends JPanel {
+
+    private static final Image transparentBackgroundImage = Toolkit.getDefaultToolkit().createImage(CellStylePreviewPane.class.getResource("/com/fr/design/images/transparent_background.png"));
+    private final float transparentBackgroundWidth;
+    private final float transparentBackgroundHeight;
+    private final float transparentBackgroundAspect;
+    private String paintText = "Report";
+    private Style style = Style.DEFAULT_STYLE;
+
+    public CellStylePreviewPane() {
+        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
+        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
+        transparentBackgroundAspect = 1.0F * transparentBackgroundImage.getWidth(null) / transparentBackgroundImage.getHeight(null);
+    }
+
+    public void setStyle(Style style) {
+        this.style = style;
+        if (style instanceof NameStyle) {
+            paintText = ((NameStyle) style).getName();
+        }
+        repaint();
+    }
+
+    @Override
+    public void paintComponent(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        int resolution = ScreenResolution.getScreenResolution();
+
+        int width = getWidth();
+        int height = getHeight();
+
+        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
+        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
+        float maxScale = Math.max(scaleWidth, scaleHeight);
+
+        if (maxScale <= 1) {
+            scaleWidth = scaleHeight = 1;
+        } else {
+            scaleHeight = scaleWidth = maxScale;
+        }
+        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
+
+        if (style == Style.DEFAULT_STYLE) {
+            // 如果是默认的style,就只写"Report"上去
+            Style.paintContent(g2d, paintText, style, width, height, resolution);
+            return;
+        }
+
+        Style.paintBackground(g2d, style, width, height);
+
+        Style.paintContent(g2d, paintText, style, width, height, resolution);
+
+        Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        return getPreferredSize();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

@@ -1,8 +1,7 @@
 package com.fr.design.mainframe.theme.edit.cell;
 
-import com.fr.base.ScreenResolution;
-import com.fr.base.Style;
 import com.fr.base.theme.settings.ThemedCellStyle;
+import com.fr.design.cell.CellStylePreviewPane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicPane;
@@ -18,12 +17,9 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.theme.ui.BorderUtils;
 
 import javax.swing.BorderFactory;
-import javax.swing.JComponent;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.GridLayout;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,7 +35,7 @@ import static com.fr.design.i18n.Toolkit.i18nText;
  */
 public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
     private ThemedCellStyle cellStyle;
-    private PreviewArea previewArea;
+    private CellStylePreviewPane previewArea;
     private boolean populating;
     private AttributeChangeListener attributeChangeListener;
 
@@ -78,7 +74,7 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
         for (BasicPane basicPane : paneList) {
             ((AbstractBasicStylePane) basicPane).populateBean(ob.getStyle());
-            previewArea.preview(ob.getStyle());
+            previewArea.setStyle(ob.getStyle());
         }
         this.populating = false;
     }
@@ -112,7 +108,8 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
         jPanel.setLayout(new BorderLayout(0, 4));
 
         JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        previewArea = new PreviewArea();
+        previewArea = new CellStylePreviewPane();
+        previewArea.setPreferredSize(new Dimension(223, 30));
         previewPane.setBorder(BorderUtils.createTitleBorder(i18nText("Fine-Design_Basic_Preview")));
         previewPane.add(previewArea, BorderLayout.CENTER);
 
@@ -138,7 +135,7 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
                         }
                         ThemedCellStyle cellStyle = updateBean();
                         if (cellStyle != null) {
-                            previewArea.preview(cellStyle.getStyle());
+                            previewArea.setStyle(cellStyle.getStyle());
                         }
                         fireAttrChangeListener();
                     }
@@ -157,42 +154,4 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
     @Override
     public void updateBean(ThemedCellStyle ob) {}
-
-    private static class PreviewArea extends JComponent {
-
-        private static final String paintText = "Report";
-        private Style style = Style.DEFAULT_STYLE;
-
-        public PreviewArea() {
-            setPreferredSize(new Dimension(223, 30));
-        }
-
-        public void preview(Style style) {
-            this.style = style;
-            repaint();
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            int resolution = ScreenResolution.getScreenResolution();
-
-            if (style == Style.DEFAULT_STYLE) {
-                // 如果是默认的style,就只写"Report"上去
-                Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-                return;
-            }
-
-            Style.paintBackground(g2d, style, getWidth() - 3, getHeight() - 3);
-
-            Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-
-            Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
-        }
-
-        @Override
-        public Dimension getMinimumSize() {
-            return getPreferredSize();
-        }
-    }
 }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/ThemedCellStyleListPane.java

@@ -1,11 +1,11 @@
 package com.fr.design.mainframe.cell.settingpane.style;
 
 import com.fr.base.NameStyle;
-import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyle;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.cell.CellStylePreviewPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.i18n.Toolkit;
@@ -17,7 +17,6 @@ import com.fr.general.ComparatorUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
-import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
@@ -26,8 +25,6 @@ import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
@@ -142,7 +139,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
     private static class RadioButtonListCellRenderer extends JPanel implements ListCellRenderer<Object>, Serializable {
 
         private final UIRadioButton button;
-        private final PreviewArea previewArea;
+        private final CellStylePreviewPane previewArea;
 
         public RadioButtonListCellRenderer() {
             super();
@@ -150,7 +147,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
             setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
             setPreferredSize(new Dimension(getPreferredSize().width, 40));
             button = new UIRadioButton();
-            previewArea = new PreviewArea();
+            previewArea = new CellStylePreviewPane();
             add(button, BorderLayout.WEST);
             add(previewArea, BorderLayout.CENTER);
         }
@@ -162,41 +159,4 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<NameStyle> imp
             return this;
         }
     }
-
-    private static class PreviewArea extends JComponent {
-
-        private String paintText = "Report";
-        private Style style = Style.DEFAULT_STYLE;
-
-        public void setStyle(Style style) {
-            this.style = style;
-            if (style instanceof NameStyle) {
-                paintText = ((NameStyle) style).getName();
-            }
-            repaint();
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-            int resolution = ScreenResolution.getScreenResolution();
-
-            if (style == Style.DEFAULT_STYLE) {
-                // 如果是默认的style,就只写"Report"上去
-                Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-                return;
-            }
-
-            Style.paintBackground(g2d, style, getWidth() - 3, getHeight() - 3);
-
-            Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-
-            Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
-        }
-
-        @Override
-        public Dimension getMinimumSize() {
-            return getPreferredSize();
-        }
-    }
 }

designer-realize/src/main/java/com/fr/design/report/ReportStylePane.java

@@ -1,9 +1,9 @@
 package com.fr.design.report;
 
 import com.fr.base.NameStyle;
-import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.cell.CellStylePreviewPane;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
@@ -52,8 +52,6 @@ import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -66,7 +64,7 @@ public class ReportStylePane extends BasicPane {
 	};
 	public static final int DEFAULT_SELECTED_INDEX = 0;
 
-	private final PreviewArea previewArea;
+	private final CellStylePreviewPane previewArea;
 	private final UIButtonGroup<String> followingThemeButtonGroup;
 	private final CustomFloatStyleSettingPane customStylePane;
 	private final ThemedCellStyleListPane themedCellStyleListPane;
@@ -78,7 +76,7 @@ public class ReportStylePane extends BasicPane {
 		setLayout(FRGUIPaneFactory.createBorderLayout());
 		setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10));
 
-		previewArea = new PreviewArea();
+		previewArea = new CellStylePreviewPane();
 		followingThemeButtonGroup = new UIButtonGroup<>(FOLLOWING_THEME_STRING_ARRAYS);
 		customStylePane = new CustomFloatStyleSettingPane();
 		themedCellStyleListPane = new ThemedCellStyleListPane();
@@ -333,40 +331,6 @@ public class ReportStylePane extends BasicPane {
 		previewArea.setStyle(updateBean());
 	}
 
-	private static class PreviewArea extends JComponent {
-
-		private static final String paintText = "Report";
-		private Style style = Style.DEFAULT_STYLE;
-
-		public void setStyle(Style style) {
-			this.style = style;
-			repaint();
-		}
-
-		@Override
-		public void paintComponent(Graphics g) {
-			Graphics2D g2d = (Graphics2D) g;
-			int resolution = ScreenResolution.getScreenResolution();
-
-			if (style == Style.DEFAULT_STYLE) {
-				// 如果是默认的style,就只写"Report"上去
-				Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-				return;
-			}
-
-			Style.paintBackground(g2d, style, getWidth() - 3, getHeight() - 3);
-
-			Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
-
-			Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
-		}
-
-		@Override
-		public Dimension getMinimumSize() {
-			return getPreferredSize();
-		}
-	}
-
 	private static class CustomFloatStyleSettingPane extends BasicPane implements ChangeListener {
 		private static final int ALIGNMENT_INDEX = 1;
 		private static final int FONT_INDEX = 2;