From e4de0db47c084d64bf77528b69ef50e145acdf82 Mon Sep 17 00:00:00 2001 From: momeak Date: Mon, 18 Sep 2017 10:23:21 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9=20=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84icon=E5=92=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E8=A7=86=E8=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/SheetNameTabPane.java | 34 +++++++++++++++--- .../fr/design/images/sheet/left_hover@1x.png | Bin 252 -> 157 bytes .../fr/design/images/sheet/left_normal@1x.png | Bin 247 -> 157 bytes .../fr/design/images/sheet/right_hover@1x.png | Bin 240 -> 154 bytes .../design/images/sheet/right_normal@1x.png | Bin 244 -> 170 bytes 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java index 826a48f8a1..56af8d0289 100644 --- a/designer/src/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer/src/com/fr/design/mainframe/SheetNameTabPane.java @@ -25,11 +25,13 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.main.impl.WorkBook; @@ -54,10 +56,10 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse private static final Icon WORK_SHEET_ICON = BaseUtils.readIcon("com/fr/base/images/oem/worksheet.png"); private static final Icon POLY_SHEET_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/polysheet.png"); private static final Image DESIGN_IMAGE = BaseUtils.readImage("com/fr/design/images/sheet/left_right_btn.png"); - private static final Icon DISABLED_LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png"); - private static final Icon DISABLED_RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png"); - private static final Icon LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png"); - private static final Icon RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png"); + private static final Icon LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_normal@1x.png"); + private static final Icon RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_normal@1x.png"); + private static final Icon DISABLED_LEFT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/left_hover@1x.png"); + private static final Icon DISABLED_RIGHT_ICON = BaseUtils.readIcon("com/fr/design/images/sheet/right_hover@1x.png"); private static final int ICON_SEP_DISTANCE = 8; private static final int TOOLBAR_HEIGHT = 16; @@ -145,6 +147,18 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse return new Dimension(super.getPreferredSize().width, TOOLBAR_HEIGHT); } }; + leftButton.setUI(new UIButtonUI() { + @Override + protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { + if (isPressed(b) && b.isPressedPainted()) { + GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.PROPERTY_PANE_BACKGROUND); + } else if (isRollOver(b)) { + GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.PROPERTY_PANE_BACKGROUND); + } else if (b.isNormalPainted()) { + GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); + } + } + }); leftButton.set4ToolbarButton(); leftButton.setDisabledIcon(DISABLED_LEFT_ICON); rightButton = new UIButton(RIGHT_ICON) { @@ -152,6 +166,18 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse return new Dimension(super.getPreferredSize().width, TOOLBAR_HEIGHT); } }; + rightButton.setUI(new UIButtonUI() { + @Override + protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) { + if (isPressed(b) && b.isPressedPainted()) { + GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.PROPERTY_PANE_BACKGROUND); + } else if (isRollOver(b)) { + GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.PROPERTY_PANE_BACKGROUND); + } else if (b.isNormalPainted()) { + GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted()); + } + } + }); rightButton.set4ToolbarButton(); rightButton.setDisabledIcon(DISABLED_RIGHT_ICON); buttonPane = new JPanel(new BorderLayout(3, 0)); diff --git a/designer_base/src/com/fr/design/images/sheet/left_hover@1x.png b/designer_base/src/com/fr/design/images/sheet/left_hover@1x.png index c39b1e022901818dae4467564149704a93e2727b..69a1dd5f426be83ff3debad9a0207747b6fbb651 100644 GIT binary patch delta 115 zcmV-(0F3|q0i6MmF>F^!L_t(I5o2H&1w@5_nVFdhE`?0EBw*qo&Hw-ZH-hoeX}ksy z(hM>Trvb!h#%ln&Q*rTey5Q8QQ)d_%8PDO;2ouL?07wC`hQJKNN#lz~oSH_E1OUHF V6}~=8^}zrD002ovPDHLkV1gAzFjxQp delta 211 zcmV;^04)EV0sH}wF@Ls6L_t(I5v7yC4Z<)CMeV{E9FVAB7S1UvFcd4$oS6kwBo3?r zfp27~wE7`{FHOGxe{rQm3MdI@0d(d;gG^2knnps{4D91A1;APY znU0z73Lv?%t9(42Q_jSCtK~xN7jUF^!L_t(I5o2H&1w@5_iHTVQE`?0EBw*qo&Hw-ZtB3K?X}ksy z(hM>Trvb!h#%ln&Q*rTey5P*2Qw@xaOpUlS!o+bJ08&7#Auz*m()gkgr=}4k0RTvZ V7UGYFNWB06002ovPDHLkV1gR1Ff#xE delta 206 zcmV;<05Sia0rvrrF@Ld1L_t(I5v7w|4uUWY$6Lc28g>9Vke6USc_^P4m+(OB01)-L zrfek2(ov)@TR;B4cF78`(~$M!_`VR)9e~a{9(qK)RaN(^b diff --git a/designer_base/src/com/fr/design/images/sheet/right_hover@1x.png b/designer_base/src/com/fr/design/images/sheet/right_hover@1x.png index aff95761c290eecbca4feee2f3d5e9b62d690984..51d6b4806cb07434332829ed94f4e99b68679797 100644 GIT binary patch delta 112 zcmeysIE!(DVP=S@i(`m|U~+;4tA+D{GiT1QELWMtA}l1``t$$)dgUaZgP9B`On_82 zgJGM13B%F&2n!b8gp?GU@>f?@8b^F-YW*PP;9;!ieDKkcBMfoOZWB}(_B`VA@3+2doTZ^fs+X)ccnKnaX`Gy;RU2)vyE zXec8BUEGdwnzpGqw*_$|kHi$9Wpqe(1s+LOU|#;ekrjl{Q9x*0)3Ync!LXVF4-A1k z<>%|2kd(&lTC%#Kf!trzDaDGZGtxDJdzrUs_s*@!7Md z2T&x?I811K6z>23|LO_31g`-g(+C+t&;S%CVc`%ofRT}@@ywZ14OsMoh430cNHZ=& i!QzAh53lACCJ6w^qZb&VBRSjv0000Eqe3OE~_ zAE^~h^Ht=M*vWfNq?qW>!O9QA`y?V)A~|3__RM@~n(aLZ`u_F6;aq~fF}vd?hG^vs z>l~RR7;nV2bM7}elPL