Skip to content

Commit

Permalink
Second pass for level 2 command menu buttons
Browse files Browse the repository at this point in the history 
* Center icon + text if there is no extra text
* Force same (max) height on all level 2 buttons
* Initial detection on whether vertical scrolling is needed

For #56
  • Loading branch information
@kirill-grouchnikov
kirill-grouchnikov committed Feb 15, 2023
1 parent 4310188 commit f2c52d6
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 26 deletions.
18 changes: 15 additions & 3 deletions ...g/pushingpixels/aurora/component/utils/appmenu/CommandButtonLayoutManagerAppMenuLevel2.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,11 @@ internal class CommandButtonLayoutManagerAppMenuLevel2(
var separatorArea = Rect.Zero
val verticalSeparatorWidth = SeparatorSizingConstants.Thickness.toPx()

val iconTop = presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
val iconTop = if (buttonExtraText != null) {
presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
} else {
(finalHeight - iconHeight) / 2.0f
}
if (ltr) {
var x = presentationModel.horizontalGapScaleFactor *
paddingValues.startPadding.toPx() + shiftX - layoutHGap
Expand Down Expand Up @@ -323,7 +327,11 @@ internal class CommandButtonLayoutManagerAppMenuLevel2(
)

textHeight = paragraph.height
val textTop = presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
val textTop = if (buttonExtraText != null) {
presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
} else {
(finalHeight - paragraph.height) / 2.0f
}
val lineLayoutInfo = CommandButtonLayoutManager.TextLayoutInfo(
text = command.text,
textRect = Rect(
Expand Down Expand Up @@ -543,7 +551,11 @@ internal class CommandButtonLayoutManagerAppMenuLevel2(
)

textHeight = paragraph.height
val textTop = presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
val textTop = if (buttonExtraText != null) {
presentationModel.verticalGapScaleFactor * paddingValues.topPadding.toPx()
} else {
(finalHeight - paragraph.height) / 2.0f
}
val lineLayoutInfo = CommandButtonLayoutManager.TextLayoutInfo(
text = command.text,
textRect = Rect(
Expand Down
84 changes: 78 additions & 6 deletions ...otlin/org/pushingpixels/aurora/component/utils/popup/RibbonApplicationMenuPopupHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ import org.pushingpixels.aurora.component.projection.CommandButtonProjection
import org.pushingpixels.aurora.component.ribbon.RibbonApplicationMenuCommandPopupMenuPresentationModel
import org.pushingpixels.aurora.component.ribbon.RibbonApplicationMenuContentModel
import org.pushingpixels.aurora.component.utils.TitleLabel
import org.pushingpixels.aurora.component.utils.appmenu.CommandButtonLayoutManagerAppMenuLevel2
import org.pushingpixels.aurora.component.utils.getLabelPreferredHeight
import org.pushingpixels.aurora.component.utils.getPlacementAwarePopupShift
import org.pushingpixels.aurora.theming.*
import org.pushingpixels.aurora.theming.colorscheme.AuroraSkinColors
Expand All @@ -47,6 +49,7 @@ import java.awt.geom.Rectangle2D
import javax.swing.JPopupMenu
import javax.swing.border.Border
import kotlin.math.ceil
import kotlin.math.max

internal data class RibbonApplicationMenuLevel1ContentLayoutInfo(
val fullSize: Size,
Expand Down Expand Up @@ -295,6 +298,11 @@ internal class RibbonApplicationMenuPopupHandler(
@Composable
private fun generateLevel2Content(
modifier: Modifier,
dpSize: DpSize,
layoutDirection: LayoutDirection,
density: Density,
textStyle: TextStyle,
fontFamilyResolver: FontFamily.Resolver,
level1Command: Command?,
itemPresentationState: CommandButtonPresentationState,
menuPresentationModel: RibbonApplicationMenuCommandPopupMenuPresentationModel,
Expand All @@ -319,6 +327,58 @@ internal class RibbonApplicationMenuPopupHandler(
.padding(all = 1.0.dp)
) {
if (level1Command?.secondaryContentModel != null) {
// Determine the height of the tallest button
var maxButtonHeight = 0.0f
val regularButtonLayoutManager = itemPresentationState.createLayoutManager(
layoutDirection = layoutDirection,
density = density,
textStyle = textStyle,
fontFamilyResolver = fontFamilyResolver
)
for (commandGroup in level1Command.secondaryContentModel.groups) {
for (secondaryCommand in commandGroup.commands) {
val preferredSize = regularButtonLayoutManager.getPreferredSize(
command = secondaryCommand,
presentationModel = itemButtonPresentationModel,
preLayoutInfo = regularButtonLayoutManager.getPreLayoutInfo(
command = secondaryCommand,
presentationModel = itemButtonPresentationModel
)
)
maxButtonHeight = max(maxButtonHeight, preferredSize.height)
if (regularButtonLayoutManager is CommandButtonLayoutManagerAppMenuLevel2) {
maxButtonHeight = max(
maxButtonHeight,
regularButtonLayoutManager.getPreferredHeight(
fixedWidth = dpSize.width,
command = secondaryCommand,
presentationModel = itemButtonPresentationModel
)
)
}
}
}

var combinedHeight = 0.0f
for (commandGroup in level1Command.secondaryContentModel.groups) {
if (commandGroup.title != null) {
combinedHeight += getLabelPreferredHeight(
contentModel = LabelContentModel(text = commandGroup.title),
presentationModel = LabelPresentationModel(
horizontalAlignment = HorizontalAlignment.Leading
),
resolvedTextStyle = textStyle,
layoutDirection = layoutDirection,
density = density,
fontFamilyResolver = fontFamilyResolver,
availableWidth = dpSize.width.value * density.density
)
}

combinedHeight += (commandGroup.commands.size * maxButtonHeight)
}
println("Combined height is $combinedHeight vs available ${dpSize.height.value * density.density}")

for (commandGroup in level1Command.secondaryContentModel.groups) {
if (commandGroup.title != null) {
TitleLabel(
Expand All @@ -343,7 +403,7 @@ internal class RibbonApplicationMenuPopupHandler(
presentationModel = currSecondaryPresentationModel,
overlays = overlays
).project(
modifier = Modifier.fillMaxWidth(),
modifier = Modifier.fillMaxWidth().height(height = (maxButtonHeight / density.density).dp),
actionInteractionSource = remember { MutableInteractionSource() },
popupInteractionSource = remember { MutableInteractionSource() }
)
Expand Down Expand Up @@ -569,14 +629,17 @@ internal class RibbonApplicationMenuPopupHandler(
val backgroundColorScheme = AuroraSkin.colors.getBackgroundColorScheme(
decorationAreaType = AuroraSkin.decorationAreaType
)
val level1PanelWidthDp = (level1ContentLayoutInfo.fullSize.width / density.density).dp
val level2PanelWidthDp = presentationModel.level2PanelWidth
val panelHeightDp = (level1ContentLayoutInfo.fullSize.height / density.density).dp
Column {
Row(
modifier = Modifier.fillMaxWidth(1.0f)
.height(height = (level1ContentLayoutInfo.fullSize.height / density.density).dp)
.height(height = panelHeightDp)
.background(color = backgroundColorScheme.backgroundFillColor)
) {
generateLevel1Content(
modifier = Modifier.width(width = (level1ContentLayoutInfo.fullSize.width / density.density).dp),
modifier = Modifier.width(width = level1PanelWidthDp),
menuContentModel = contentModel.value!!,
menuPresentationModel = presentationModel,
overlays = overlays,
Expand All @@ -585,11 +648,20 @@ internal class RibbonApplicationMenuPopupHandler(
},
level1ContentLayoutInfo = level1ContentLayoutInfo
)
val level2PresentationState = if ((secondaryStates != null) && (activeLevel1Command != null))
secondaryStates.getOrDefault(activeLevel1Command!!, CommandButtonPresentationState.Medium)
else CommandButtonPresentationState.Medium
val level2PresentationState =
if ((secondaryStates != null) && (activeLevel1Command != null))
secondaryStates.getOrDefault(
activeLevel1Command!!,
CommandButtonPresentationState.Medium
)
else CommandButtonPresentationState.Medium
generateLevel2Content(
modifier = Modifier.weight(1.0f, true),
dpSize = DpSize(width = level2PanelWidthDp, height = panelHeightDp),
layoutDirection = layoutDirection,
density = density,
textStyle = textStyle,
fontFamilyResolver = fontFamilyResolver,
level1Command = activeLevel1Command,
itemPresentationState = level2PresentationState,
menuPresentationModel = presentationModel,
Expand Down
23 changes: 6 additions & 17 deletions demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/AuroraCommandDemo.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ fun DemoCommandRow(
contentModel = commandSecondaryOnly,
presentationModel = CommandButtonPresentationModel(
presentationState = presentationState,
backgroundAppearanceStrategy = backgroundAppearanceStrategy
backgroundAppearanceStrategy = backgroundAppearanceStrategy,
popupMenuPresentationModel = CommandPopupMenuPresentationModel(maxVisibleItems = 6)
)
).project()

Expand Down Expand Up @@ -662,26 +663,14 @@ fun AuroraWindowScope.DemoCommandContent(
secondaryContentModel = CommandMenuContentModel(
CommandGroup(
title = resourceBundle.getString("Group.titleSimple"),
commands = listOf(
Command(
text = entrySimpleMf.format(arrayOf<Any>(1)),
icon = computer(),
action = { println("popup1 activated!") },
isActionEnabled = actionEnabled
),
commands = (1..10).map {
Command(
text = entrySimpleMf.format(arrayOf<Any>(2)),
text = entrySimpleMf.format(arrayOf<Any>(it)),
icon = computer(),
action = { println("popup2 activated!") },
isActionEnabled = actionEnabled
),
Command(
text = entrySimpleMf.format(arrayOf<Any>(3)),
icon = computer(),
action = { println("popup3 activated!") },
action = { println("popup$it activated!") },
isActionEnabled = actionEnabled
)
)
}
)
),
secondaryRichTooltip = RichTooltip(
Expand Down

0 comments on commit f2c52d6

Please sign in to comment.