From d41aca61440d2176a7082e9044146fc8823b7c03 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Tue, 16 Jan 2024 12:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=20REPORT-107973=20=E4=BF=AE=E6=94=B9frm=20?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E8=83=8C=E6=99=AF=EF=BC=9Bfrm?= =?UTF-8?q?=E4=B8=8B=E7=82=B9=E5=87=BB=E6=8A=A5=E8=A1=A8=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=E4=B8=8B=E7=A7=BB=20=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91frm=E4=B8=8B?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8A=A5=E8=A1=A8=E5=9D=97=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=9D=97=E4=B8=8B=E7=A7=BB=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86frm=E7=9A=84=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=B8=83?= =?UTF-8?q?=E5=B1=80=EF=BC=8C=E4=B9=8B=E5=89=8D=E7=9A=84=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E7=94=A8setPreferredSize=E5=AF=BC=E8=87=B4=20=20?= =?UTF-8?q?=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fine/theme/light/ui/FineLightIconSet.java | 1 + .../com/fr/design/gui/ibutton/UIButton.java | 8 ++-- .../design/mainframe/FormParaWidgetPane.java | 39 +++++++------------ 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java index 2409e9246..8c9b68cc1 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java @@ -35,6 +35,7 @@ public class FineLightIconSet extends AbstractIconSet { new SvgIconSource("drag_left", "com/fine/theme/icon/drag_left.svg", true), new SvgIconSource("drag_right", "com/fine/theme/icon/drag_right.svg", true), new SvgIconSource("down_arrow", "com/fine/theme/icon/down_arrow.svg", true), + new SvgIconSource("up_arrow", "com/fine/theme/icon/up_arrow.svg", true), new SvgIconSource("down_arrow_12", "com/fine/theme/icon/down_arrow.svg", true, 12), new SvgIconSource("up_arrow_12", "com/fine/theme/icon/up_arrow.svg", true, 12), new SvgIconSource("select", "com/fine/theme/icon/select.svg", true), diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java index 736a34029..c54c39cb4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java @@ -25,7 +25,9 @@ import java.awt.event.ActionListener; import java.awt.geom.RoundRectangle2D; import static com.fine.theme.utils.FineUIStyle.STYLE_PRIMARY; +import static com.fine.theme.utils.FineUIStyle.STYLE_TEXT; import static com.fine.theme.utils.FineUIStyle.hasStyle; +import static com.fine.theme.utils.FineUIStyle.setStyle; public class UIButton extends JButton implements UIObserver, UITextComponent { @@ -91,7 +93,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { setRolloverIcon(rollOver); setPressedIcon(pressed); setExtraPainted(false); - setBackground(null); + setStyle(this, STYLE_TEXT); setOpaque(false); initListener(); } @@ -132,7 +134,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { public void set4ToolbarButton() { setNormalPainted(false); Dimension dim = getPreferredSize(); - setBackground(null); + setStyle(this, STYLE_TEXT); setOpaque(false); setSize(dim); setBorderPaintedOnlyWhenPressed(true); @@ -140,7 +142,7 @@ public class UIButton extends JButton implements UIObserver, UITextComponent { public void set4LargeToolbarButton() { setNormalPainted(false); - setBackground(null); + setStyle(this, STYLE_TEXT); setOpaque(false); setBorderPainted(false); setSize(new Dimension(40, 40)); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index 33eae2a9f..42d6ea377 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.ExtraDesignClassManager; @@ -25,7 +26,6 @@ import com.fr.design.mainframe.share.ui.online.mini.MiniComponentShopDialog; import com.fr.design.mainframe.share.util.OnlineShopUtils; import com.fr.design.module.DesignModuleFactory; import com.fr.design.ui.util.UIUtil; -import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.UserDefinedWidgetConfig; import com.fr.form.ui.Widget; import com.fr.form.ui.WidgetConfig; @@ -50,8 +50,6 @@ import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -142,26 +140,6 @@ public class FormParaWidgetPane extends UIToolbar { public FormParaWidgetPane() { setLayout(new FlowLayout(FlowLayout.LEFT)); - DesignerContext.getDesignerFrame().getCenterTemplateCardPane().addComponentListener(new ComponentAdapter() { - @Override - public void componentResized(ComponentEvent e) { - if (FormParaWidgetPane.this.getParent() != null) { - JPanel parent = (JPanel) FormParaWidgetPane.this.getParent(); - int deltaWidth = 0; - for (int i = 0; i < parent.getComponentCount() - 1; i++) { - deltaWidth += parent.getComponent(i).getWidth(); - } - - if (deltaWidth == 0) { - return; - } - - Dimension d = parent.getSize(); - setPreferredSize(new Dimension(d.width - deltaWidth, d.height)); - LayoutUtils.layoutContainer(parent); - } - } - }); initFormParaComponent(); } @@ -306,6 +284,8 @@ public class FormParaWidgetPane extends UIToolbar { jPanel.add(uiLabel, BorderLayout.NORTH); jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse_Apply_Widget")), BorderLayout.CENTER); jPanel.setToolTipText(Toolkit.i18nText("Fine-Design_Share_Component")); + jPanel.setOpaque(false); + uiLabel.setOpaque(false); return jPanel; } @@ -360,6 +340,9 @@ public class FormParaWidgetPane extends UIToolbar { labelPane.add(label, BorderLayout.CENTER); reportPane.add(labelPane, BorderLayout.SOUTH); reportPane.setPreferredSize(new Dimension((int) reportPane.getPreferredSize().getWidth(), (int) reportPane.getPreferredSize().getHeight())); + reportPane.setOpaque(false); + jComponent.setOpaque(false); + labelPane.setOpaque(false); return reportPane; } @@ -381,6 +364,9 @@ public class FormParaWidgetPane extends UIToolbar { }); labelPane.add(chartPopUpButton, BorderLayout.EAST); chartPane.add(labelPane, BorderLayout.SOUTH); + jComponent.setOpaque(false); + chartPane.setOpaque(false); + labelPane.setOpaque(false); return chartPane; } @@ -408,6 +394,9 @@ public class FormParaWidgetPane extends UIToolbar { }); labelPane.add(chartPopUpButton, BorderLayout.EAST); widgetPane.add(labelPane, BorderLayout.SOUTH); + jComponent.setOpaque(false); + widgetPane.setOpaque(false); + labelPane.setOpaque(false); return widgetPane; } @@ -435,13 +424,13 @@ public class FormParaWidgetPane extends UIToolbar { } private UIButton createPopUpButton() { - UIButton popUpButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/buttonicon/arrowdown.png")); + UIButton popUpButton = new UIButton(new LazyIcon("down_arrow")); popUpButton.set4ToolbarButton(); return popUpButton; } private UIButton createPopDownButton() { - UIButton popUpButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/buttonicon/arrowup.png")); + UIButton popUpButton = new UIButton(new LazyIcon("up_arrow")); popUpButton.set4ToolbarButton(); return popUpButton; }