Fit-to-icon button layouts should look at the preferred icon dimensio…

…n from the presentation model For #447
kirill-grouchnikov · May 31, 2023 · d6bd896 · d6bd896
1 parent 077417d
commit d6bd896
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git a/...org/pushingpixels/radiance/component/internal/theming/ribbon/ui/RadianceRibbonBandUI.java b/...org/pushingpixels/radiance/component/internal/theming/ribbon/ui/RadianceRibbonBandUI.java
@@ -152,10 +152,15 @@ public int getBandTitleHeight() {
     @Override
     @SuppressWarnings("unchecked")
     protected JCommandButton createExpandButton() {
+        final int fontSize = RadianceSizeUtils.getComponentFontSize(null);
+        int arrowIconWidth = (int) RadianceSizeUtils.getSmallArrowIconWidth(fontSize);
+        int arrowIconHeight = (int) RadianceSizeUtils.getSmallDoubleArrowIconHeight(fontSize);
+
         CommandButtonProjection<Command> expandCommandProjection =
                 new CommandButtonProjection<>(this.expandCommand,
                         CommandButtonPresentationModel.builder()
                                 .setPresentationState(CommandButtonPresentationState.SMALL_FIT_TO_ICON)
+                                .setIconDimension(new Dimension(arrowIconWidth, arrowIconHeight))
                                 .setContentPadding(new Insets(3, 2, 3, 2))
                                 .setSides(RadianceThemingSlices.Sides.CLOSED_RECTANGLE)
                                 .setActionKeyTip(ribbonBand.getExpandButtonKeyTip())

diff --git a/...ingpixels/radiance/component/internal/theming/ribbon/ui/RadianceRibbonFrameTitlePane.java b/...ingpixels/radiance/component/internal/theming/ribbon/ui/RadianceRibbonFrameTitlePane.java
@@ -228,6 +228,7 @@ private TaskbarPanel() {
                     .setTag(TASKBAR_OVERFLOW_BUTTON)
                     .build().project(CommandButtonPresentationModel.builder()
                             .setPresentationState(CommandButtonPresentationState.SMALL_FIT_TO_ICON)
+                            .setIconDimension(new Dimension(arrowIconHeight, arrowIconWidth))
                             .setContentPadding(new Insets(2, 6, 2, 6))
                             .setSides(RadianceThemingSlices.Sides.CLOSED_RECTANGLE)
                             .build());

diff --git a/.../java/org/pushingpixels/radiance/component/internal/ui/common/BasicScrollablePanelUI.java b/.../java/org/pushingpixels/radiance/component/internal/ui/common/BasicScrollablePanelUI.java
@@ -206,6 +206,7 @@ public void layoutContainer(Container parent) {
         // Common scroller command presentation
         CommandButtonPresentationModel scrollerActionsPresentation = CommandButtonPresentationModel.builder()
                 .setPresentationState(CommandButtonPresentationState.SMALL_FIT_TO_ICON)
+                .setIconDimension(new Dimension(arrowIconHeight, arrowIconWidth))
                 .setContentPadding(new Insets(2, 2, 2, 2))
                 .setFocusable(false)
                 .setToDismissPopupsOnActivation(false)

diff --git a/...rg/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerBig.java b/...rg/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerBig.java
@@ -417,10 +417,6 @@ public CommandButtonLayoutInfo getLayoutInfo(JCommandButton commandButton) {
     public static class FitToIcon extends CommandButtonLayoutManagerBig {
         @Override
         public Dimension getPreferredIconSize(JCommandButton commandButton) {
-            RadianceIcon icon = commandButton.getIcon();
-            if (icon != null) {
-                return new Dimension(icon.getIconWidth(), icon.getIconHeight());
-            }
             BaseCommandButtonPresentationModel presentationModel =
                     commandButton.getProjection().getPresentationModel();
             Dimension preferredIconDimension = presentationModel.getIconDimension();

diff --git a/...pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerMedium.java b/...pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerMedium.java
@@ -579,10 +579,6 @@ public CommandButtonLayoutInfo getLayoutInfo(JCommandButton commandButton) {
     public static class FitToIcon extends CommandButtonLayoutManagerMedium {
         @Override
         public Dimension getPreferredIconSize(JCommandButton commandButton) {
-            RadianceIcon icon = commandButton.getIcon();
-            if (icon != null) {
-                return new Dimension(icon.getIconWidth(), icon.getIconHeight());
-            }
             BaseCommandButtonPresentationModel presentationModel =
                     commandButton.getProjection().getPresentationModel();
             Dimension preferredIconDimension = presentationModel.getIconDimension();

diff --git a/.../pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerSmall.java b/.../pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerSmall.java
@@ -402,10 +402,6 @@ public CommandButtonLayoutInfo getLayoutInfo(JCommandButton commandButton) {
     public static class FitToIcon extends CommandButtonLayoutManagerSmall {
         @Override
         public Dimension getPreferredIconSize(JCommandButton commandButton) {
-            RadianceIcon icon = commandButton.getIcon();
-            if (icon != null) {
-                return new Dimension(icon.getIconWidth(), icon.getIconHeight());
-            }
             BaseCommandButtonPresentationModel presentationModel =
                     commandButton.getProjection().getPresentationModel();
             Dimension preferredIconDimension = presentationModel.getIconDimension();

diff --git a/...g/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerTile.java b/...g/pushingpixels/radiance/component/internal/ui/common/CommandButtonLayoutManagerTile.java
@@ -594,10 +594,6 @@ public CommandButtonLayoutInfo getLayoutInfo(JCommandButton commandButton) {
     public static class FitToIcon extends CommandButtonLayoutManagerTile {
         @Override
         public Dimension getPreferredIconSize(JCommandButton commandButton) {
-            RadianceIcon icon = commandButton.getIcon();
-            if (icon != null) {
-                return new Dimension(icon.getIconWidth(), icon.getIconHeight());
-            }
             BaseCommandButtonPresentationModel presentationModel =
                     commandButton.getProjection().getPresentationModel();
             Dimension preferredIconDimension = presentationModel.getIconDimension();

diff --git a/...in/java/org/pushingpixels/radiance/component/internal/ui/ribbon/BasicRibbonGalleryUI.java b/...in/java/org/pushingpixels/radiance/component/internal/ui/ribbon/BasicRibbonGalleryUI.java
@@ -206,20 +206,23 @@ protected void installComponents() {
                 new HashMap<>();
         galleryScrollerOverlays.put(this.scrollUpCommand,
                 CommandButtonPresentationModel.overlay()
+                        .setIconDimension(new Dimension(arrowIconWidth, arrowIconHeight))
                         .setSides(RadianceThemingSlices.Sides.builder()
                                 .setStraightSides(EnumSet.of(RadianceThemingSlices.Side.LEADING))
                                 .build())
                         .setAutoRepeatAction(true)
                         .setAutoRepeatActionIntervals(200, 50));
         galleryScrollerOverlays.put(this.scrollDownCommand,
                 CommandButtonPresentationModel.overlay()
+                        .setIconDimension(new Dimension(arrowIconWidth, arrowIconHeight))
                         .setSides(RadianceThemingSlices.Sides.builder()
                                 .setStraightSides(EnumSet.of(RadianceThemingSlices.Side.LEADING))
                                 .build())
                         .setAutoRepeatAction(true)
                         .setAutoRepeatActionIntervals(200, 50));
         galleryScrollerOverlays.put(this.expandCommand,
                 CommandButtonPresentationModel.overlay()
+                        .setIconDimension(new Dimension(arrowIconWidth, arrowDoubleIconHeight))
                         .setSides(RadianceThemingSlices.Sides.builder()
                                 .setStraightSides(EnumSet.of(RadianceThemingSlices.Side.LEADING))
                                 .build())