From 2323df5eb6f8744d75cd2227d989bd72d39799b7 Mon Sep 17 00:00:00 2001 From: Kirill Grouchnikov Date: Fri, 4 Feb 2022 10:14:50 -0500 Subject: [PATCH] Fix Cerulean skin name Closes #19 --- .../aurora/component/utils/CommandMenuPopupContent.kt | 3 ++- .../kotlin/org/pushingpixels/aurora/theming/CeruleanSkin.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt index 3479374f..904cb1c3 100644 --- a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt +++ b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt @@ -450,7 +450,8 @@ private fun TopLevelPopupContent( ) }) { measurables, _ -> val placeables = measurables.mapIndexed { index, measurable -> - // Measure each child with fixed (widest) width and fixed (tallest) height + // Measure each child with fixed (widest) width and matching height (button + // height or separator height) measurable.measure( Constraints.fixed( width = contentLayoutInfo.generalContentSize.width.roundToInt(), diff --git a/theming/src/desktopMain/kotlin/org/pushingpixels/aurora/theming/CeruleanSkin.kt b/theming/src/desktopMain/kotlin/org/pushingpixels/aurora/theming/CeruleanSkin.kt index f980ff2c..04cba94c 100644 --- a/theming/src/desktopMain/kotlin/org/pushingpixels/aurora/theming/CeruleanSkin.kt +++ b/theming/src/desktopMain/kotlin/org/pushingpixels/aurora/theming/CeruleanSkin.kt @@ -203,7 +203,7 @@ fun ceruleanSkin(): AuroraSkinDefinition { painters.addOverlayPainter(TopShadowOverlayPainter.getInstance(100), DecorationAreaType.Toolbar) return AuroraSkinDefinition( - displayName = "Green Magic", + displayName = "Cerulean", colors = ceruleanSkinColors(), painters = painters, buttonShaper = ClassicButtonShaper()