Add fill horizontal arrangement

For #56
kirill-grouchnikov · Dec 14, 2022 · c6f619b · c6f619b
1 parent c3bd7cc
commit c6f619b
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/...Main/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerMedium.kt b/...Main/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerMedium.kt
@@ -193,9 +193,12 @@ internal open class CommandButtonLayoutManagerMedium(
                 when (presentationModel.horizontalAlignment) {
                     HorizontalAlignment.Leading ->
                         shiftX = 0.0f
-                    HorizontalAlignment.Center ->
+
+                    HorizontalAlignment.Center,
+                    HorizontalAlignment.Fill ->
                         // shift everything to be centered horizontally
                         shiftX = (finalWidth - preferredSize.width) / 2
+
                     HorizontalAlignment.Trailing -> if (ltr) {
                         // shift everything to the right
                         shiftX = finalWidth - preferredSize.width
@@ -317,7 +320,7 @@ internal open class CommandButtonLayoutManagerMedium(
                 }
             }
 
-            val xBorderBetweenActionAndPopup : Float
+            val xBorderBetweenActionAndPopup: Float
             when (preLayoutInfo.commandButtonKind) {
                 CommandButtonKind.ActionOnly -> {
                     actionClickArea = Rect(
@@ -327,6 +330,7 @@ internal open class CommandButtonLayoutManagerMedium(
                         bottom = finalHeight
                     )
                 }
+
                 CommandButtonKind.PopupOnly -> {
                     popupClickArea = Rect(
                         left = 0.0f,
@@ -335,6 +339,7 @@ internal open class CommandButtonLayoutManagerMedium(
                         bottom = finalHeight
                     )
                 }
+
                 CommandButtonKind.ActionAndPopupMainAction ->
                     // 1. break before popup icon if button has text or icon
                     // 2. no break (all popup) if button has no text and no icon
@@ -375,6 +380,7 @@ internal open class CommandButtonLayoutManagerMedium(
                             bottom = finalHeight
                         )
                     }
+
                 CommandButtonKind.ActionAndPopupMainPopup ->
                     // 1. break after icon if button has icon
                     // 2. no break (all popup) if button has no icon
@@ -440,7 +446,7 @@ internal open class CommandButtonLayoutManagerMedium(
             }
 
             // text
-            val textHeight : Float
+            val textHeight: Float
             if (hasText) {
                 x -= if (hasIcon) {
                     layoutHGap * iconTextGapFactor
@@ -519,7 +525,7 @@ internal open class CommandButtonLayoutManagerMedium(
                 }
             }
 
-            val xBorderBetweenActionAndPopup : Float
+            val xBorderBetweenActionAndPopup: Float
             when (preLayoutInfo.commandButtonKind) {
                 CommandButtonKind.ActionOnly -> {
                     actionClickArea = Rect(
@@ -529,6 +535,7 @@ internal open class CommandButtonLayoutManagerMedium(
                         bottom = finalHeight
                     )
                 }
+
                 CommandButtonKind.PopupOnly -> {
                     popupClickArea = Rect(
                         left = 0.0f,
@@ -537,6 +544,7 @@ internal open class CommandButtonLayoutManagerMedium(
                         bottom = finalHeight
                     )
                 }
+
                 CommandButtonKind.ActionAndPopupMainAction ->
                     // 1. break before popup icon if button has text or icon
                     // 2. no break (all popup) if button has no text and no icon
@@ -577,6 +585,7 @@ internal open class CommandButtonLayoutManagerMedium(
                             bottom = finalHeight
                         )
                     }
+
                 CommandButtonKind.ActionAndPopupMainPopup ->
                     // 1. break after icon if button has icon
                     // 2. no break (all popup) if button has no icon

diff --git a/...pMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerSmall.kt b/...pMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerSmall.kt
@@ -154,7 +154,8 @@ internal open class CommandButtonLayoutManagerSmall(
                 when (presentationModel.horizontalAlignment) {
                     HorizontalAlignment.Leading ->
                         shiftX = 0.0f
-                    HorizontalAlignment.Center ->
+                    HorizontalAlignment.Center,
+                    HorizontalAlignment.Fill ->
                         // shift everything to be centered horizontally
                         shiftX = (finalWidth - preferredSize.width) / 2
                     HorizontalAlignment.Trailing -> if (ltr) {

diff --git a/...opMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerTile.kt b/...opMain/kotlin/org/pushingpixels/aurora/component/layout/CommandButtonLayoutManagerTile.kt
@@ -192,7 +192,8 @@ internal open class CommandButtonLayoutManagerTile(
                         // shift everything to the right
                         shiftX = finalWidth - preferredSize.width
                     }
-                    HorizontalAlignment.Center ->
+                    HorizontalAlignment.Center,
+                    HorizontalAlignment.Fill ->
                         // shift everything to be centered horizontally
                         shiftX = (finalWidth - preferredSize.width) / 2
                     HorizontalAlignment.Trailing -> if (ltr) {

diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/model/Command.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/model/Command.kt
@@ -84,10 +84,27 @@ enum class TextClick {
     Popup
 }
 
-enum class HorizontalAlignment(var arrangement: Arrangement.Horizontal) {
-    Leading(Arrangement.Start), Center(Arrangement.Center), Trailing(Arrangement.End)
+enum class HorizontalAlignment {
+    Leading {
+        override var arrangement = Arrangement.Start
+    },
+
+    Trailing {
+        override var arrangement = Arrangement.End
+    },
+
+    Center {
+        override var arrangement: Arrangement.Horizontal = Arrangement.Center
+    },
+
+    Fill {
+        override var arrangement: Arrangement.Horizontal = throw UnsupportedOperationException()
+    };
+
+    internal abstract var arrangement: Arrangement.Horizontal
 }
 
+
 /**
  * Enumerates the available command button kinds.
  */

diff --git a/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/ribbon/AuroraRibbonDemo.kt b/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/ribbon/AuroraRibbonDemo.kt
@@ -945,7 +945,7 @@ private class RibbonBuilder(val resourceBundle: ResourceBundle) {
                             icon = applications_games(),
                             keyTip = "AG",
                             isResizingAware = true,
-                            horizontalAlignment = HorizontalAlignment.Leading
+                            horizontalAlignment = HorizontalAlignment.Fill
                         ),
                         ComboBoxProjection(
                             contentModel = internetComboBoxContentModel,
@@ -955,7 +955,7 @@ private class RibbonBuilder(val resourceBundle: ResourceBundle) {
                             icon = applications_internet(),
                             keyTip = "AI",
                             isResizingAware = true,
-                            horizontalAlignment = HorizontalAlignment.Leading
+                            horizontalAlignment = HorizontalAlignment.Fill
                         ),
                         ComboBoxProjection(
                             contentModel = multimediaComboBoxContentModel,
@@ -964,7 +964,7 @@ private class RibbonBuilder(val resourceBundle: ResourceBundle) {
                             caption = resourceBundle.getString("Multimedia.text"),
                             keyTip = "AM",
                             isResizingAware = true,
-                            horizontalAlignment = HorizontalAlignment.Leading
+                            horizontalAlignment = HorizontalAlignment.Fill
                         )
                     )
                 )