From cbbf92cf643b097b40847bd2eb22645b7a88368f Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 3 Sep 2021 14:26:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-58698=20=E4=B8=BB=E9=A2=98=E5=88=87?= =?UTF-8?q?=E6=8D=A2-=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 视觉变更： 修改用于新建模版的主题的标记图标及显示位置 【改动思路】 同上 --- .../mainframe/theme/TemplateThemeBlock.java | 2 +- .../fr/design/form/images/theme4newTemplate.png | Bin 411 -> 611 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java index e00bc445c..7fcfd7310 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java @@ -193,7 +193,7 @@ public class TemplateThemeBlock extends JPanel { } if (displayTheme4NewTemplateMarker && StringUtils.equals(config.getThemeName4NewTemplate(), name)) { - theme4NewTemplateMarkIcon.paintIcon(this, g, 0, 0); + theme4NewTemplateMarkIcon.paintIcon(this, g, 0, thumbnailPane.getHeight() - 16); } if (selected || this.hovering) { diff --git a/designer-form/src/main/resources/com/fr/design/form/images/theme4newTemplate.png b/designer-form/src/main/resources/com/fr/design/form/images/theme4newTemplate.png index 43e7c8ff03fca793c903fcb397b43992b800e0e8..4577218343910d1ef430f0ec604b22d53b5d4e36 100644 GIT binary patch literal 611 zcmeAS@N?(olHy`uVBq!ia0vp^5x>1}(T2$mCJBQe!xf#nn)0c-SWxUtlAn2&WqtW5pw6u4@+@#dS zf(KVDc;GJ2Q&;f%%)09G*}IKdVotohQ=R`j^?BO#kcIA!{HrRe&fWXC#7dzjmD!D9 zlg5@QSC7W+-Q;Qi^dt9;?**<66|bl0>PsKWW?Pou@Lc#oNu0_)!!P?AUUjp!et5K! zMJ-27*h#I=XZ6MnPa+trtp9Q!xH7X-clq;I?spEpi)S&77SmYMzUQQeKxWLp`fqiH z?-tyA(Y$Uao8>Ic=`5w+1+KDglxle&ztZXbMu&BWPncaWmGdYxII#5jtlJMOo!2#Y ztj<61bk@Y4chM_n)`k|yvP{!DxyUEoi81H;&dQ!0Vw1}k)!b3^{LvlwZr&Z+CEc~# zaz%G3wtuN%d|cd|=a?F%5&mmU{)4Ryho$e>zjdfQpYn1x>%RMqpH=_4Sh-KQ%lWEo zlFGYzJl8|wE!DO^@NYk+5wcUT^7Tv8y%DT(U1^On_ioGndt1caA;|yG<@5D`tabm) zJLc`n*tEr2>}tch%jF5JQ{AOoi-p8CnSJ`I$otNd`~PX58t-ks9_mNmPjBO0amZWl jXNYVe|C6^{lP>>ZSeCwAowq162^7Jeu6{1-oD!MPx$RY^oaR5(wa(!EPUVHC&l?@{T+LZd+nax0>usiDSbiyB%A8j5I1!nvWpBZ8o< z2znbt{12jru%(2cAu6aLMB|nwdOcxkX5FjVv)s#bpYu7t=W>M7(j9j<;v7L8?($wk zPsyiHGb#(Ir$U|Ru4fWt3srwZP~~tObQ>HOXg)2AMz{of?@|1q|8zgg5+H$Uc*k23 zE#UqD6mIqqs@F6QvWjWOWa%|lOl$|c+F<4qGI0ox0(pB}I7D@ilo62?vet0dI1I0W zrw>|vMJ)9QFE( From c9403afee47119d762f86b347fd33d50714b9a5a Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 3 Sep 2021 14:48:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-58503=20=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E9=A2=84=E8=A7=88=E5=8C=BAui?= =?UTF-8?q?=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 单元格样式预览显示透明块 【改动思路】 同上 --- .../java/com/fr/design/cell/CellStylePreviewPane.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java index d566bbf98..af4bc8a9b 100644 --- a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java @@ -3,11 +3,7 @@ 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; @@ -25,14 +21,12 @@ 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) { @@ -72,7 +66,7 @@ public class CellStylePreviewPane extends JPanel { Style.paintContent(g2d, paintText, style, width, height, resolution); - Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3); + Style.paintBorder(g2d, style, width, height); } @Override From a98593870e1e5073e0441cf294895d8fcbc7517d Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 3 Sep 2021 14:49:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-58721=20=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E9=9D=A2=E7=A9=BA=E7=99=BD=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E7=81=B0=E8=89=B2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 List自带了白色的背景，导致出现的背景异常 【改动思路】 同上 --- .../cell/settingpane/style/ThemedCellStyleListPane.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/ThemedCellStyleListPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/ThemedCellStyleListPane.java index 17300f00d..eb6f5484e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/ThemedCellStyleListPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/ThemedCellStyleListPane.java @@ -42,6 +42,8 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane imp defaultListModel = new DefaultListModel<>(); styleList = new JList<>(defaultListModel); styleList.setCellRenderer(new RadioButtonListCellRenderer()); + styleList.setOpaque(false); + styleList.setBackground(null); setLayout(FRGUIPaneFactory.createBorderLayout()); add(styleList, BorderLayout.CENTER); setBorder(BorderFactory.createEmptyBorder(0 ,LEFT_BORDER, 0, RIGHT_BORDER)); From d9efa33f14178295d11484ec31706830313ca942 Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 3 Sep 2021 15:21:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-58638=20=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E4=B8=BB=E9=A2=98=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=87=8C=E9=80=89=E4=BA=86=E5=9B=BE=E7=89=87=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E4=B8=8B=E6=BB=91=E5=8A=A8=E5=8D=81=E5=87=A0?= =?UTF-8?q?=E6=AC=A1=E6=89=8D=E8=83=BD=E6=BB=91=E5=88=B0=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 换其他滚动控件实现 【改动思路】 同上 --- .../theme/edit/ComponentStyleEditPane.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ComponentStyleEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ComponentStyleEditPane.java index 87a12a9dd..53e216b0d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ComponentStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ComponentStyleEditPane.java @@ -2,6 +2,7 @@ package com.fr.design.mainframe.theme.edit; import com.fr.base.theme.settings.ThemedComponentStyle; import com.fr.design.designer.IntervalConstants; +import com.fr.design.dialog.AttrScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.style.ComponentBodyStylePane; import com.fr.design.gui.style.ComponentIntegralStylePane; @@ -113,7 +114,7 @@ public class ComponentStyleEditPane extends JPanel { } } - private JComponent createTabContainer(final JComponent component) { + private JComponent createTabContainer(final JPanel component) { JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane(); container.setPreferredSize(new Dimension(container.getPreferredSize().width, 220)); @@ -123,12 +124,12 @@ public class ComponentStyleEditPane extends JPanel { tipLabelPane.add(tipLabel); container.add(tipLabelPane, BorderLayout.NORTH); - JScrollPane scrollPane = new JScrollPane(component); - scrollPane.setPreferredSize(new Dimension(container.getPreferredSize().width, 220)); - scrollPane.setBorder(BorderFactory.createEmptyBorder()); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); - - container.add(scrollPane, BorderLayout.CENTER); + container.add(new AttrScrollPane() { + @Override + protected JPanel createContentPane() { + return component; + } + }, BorderLayout.CENTER); return container; From da1abd51274c7cbca0358b62a96e0e80cfa705e1 Mon Sep 17 00:00:00 2001 From: Starryi Date: Fri, 3 Sep 2021 15:27:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-58722=20=E3=80=90=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=80=E6=AE=B5=E6=97=B6=E9=97=B4=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=B8=BB=E9=A2=98=E4=BF=9D=E5=AD=98=E5=BE=88=E6=85=A2?= =?UTF-8?q?=EF=BC=8C=E7=94=9A=E8=87=B3=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【问题原因】 停止监听时，移除监听器 【改动思路】 同上 --- .../src/main/java/com/fr/design/mainframe/JTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 8bb23786f..70d1f3e0e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -251,7 +251,7 @@ public abstract class JTemplate> if (themeConfigChangeListener != null) { TemplateThemeConfig config = getUsingTemplateThemeConfig(); if (config != null) { - config.addThemeConfigChangeListener(themeConfigChangeListener); + config.removeThemeConfigChangeListener(themeConfigChangeListener); } } }