MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-326561 Refactor toolbars layout

Browse Source 
- fix for popup with hidden items

GitOrigin-RevId: 7206f16fa6724e8e2989b37190b931cd7d3692c9
This commit is contained in:
Mikhail Sokolov
2024-01-12 18:36:10 +01:00
committed by intellij-monorepo-bot
parent 35606cb351
commit 90adde63da
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/editor-ui-api/src/com/intellij/openapi/actionSystem/ActionToolbar.java
View File

@@ -185,6 +185,8 @@ public interface ActionToolbar {
void setReservePlaceAutoPopupIcon(boolean reserve);
boolean isReservePlaceAutoPopupIcon();
void setSecondaryActionsTooltip(@NotNull @NlsContexts.Tooltip String secondaryActionsTooltip);
void setSecondaryActionsShortcut(@NotNull String secondaryActionsShortcut);

25
platform/editor-ui-api/src/com/intellij/openapi/actionSystem/toolbarLayout/AutoLayoutStrategy.kt
View File

@@ -31,8 +31,10 @@ class AutoLayoutStrategy(private val myForceShowFirstComponent: Boolean, private
}
override fun calcMinimumSize(toolbar: ActionToolbar): Dimension {
if (toolbar.component.componentCount == 0) return JBUI.emptySize()
val dimension = Dimension(expandIcon.iconWidth, expandIcon.iconHeight)
var childrenCount = toolbar.component.componentCount
if (childrenCount == 0) return JBUI.emptySize()
val dimension = Dimension()
if (myForceShowFirstComponent) {
val firstChildSize = toolbar.component.components.firstOrNull { it.isVisible }?.preferredSize
@@ -46,6 +48,19 @@ class AutoLayoutStrategy(private val myForceShowFirstComponent: Boolean, private
dimension.width = max(dimension.width, size.width)
}
}
childrenCount--
}
if (childrenCount > 0) {
val minimumButtonSize = toolbar.minimumButtonSize
if (toolbar.orientation == SwingConstants.HORIZONTAL) {
dimension.width += expandIcon.iconWidth
dimension.height = max(max(dimension.height, expandIcon.iconHeight), minimumButtonSize.height)
}
else {
dimension.height += expandIcon.iconHeight
dimension.width = max(max(dimension.width, expandIcon.iconWidth), minimumButtonSize.width)
}
}
JBInsets.addTo(dimension, toolbar.component.insets)
@@ -60,7 +75,7 @@ class AutoLayoutStrategy(private val myForceShowFirstComponent: Boolean, private
val res = List(componentCount) { Rectangle() }
val autoButtonSize = expandIcon.iconWidth
val autoButtonSize = if (toolbar.isReservePlaceAutoPopupIcon) Dimension(expandIcon.iconWidth, expandIcon.iconHeight) else Dimension()
var full = false
val widthToFit: Int = size2Fit.width - insets.left - insets.right
@@ -77,7 +92,7 @@ class AutoLayoutStrategy(private val myForceShowFirstComponent: Boolean, private
maxHeight = max(eachBound.height.toDouble(), maxHeight.toDouble()).toInt()
if (!full) {
val inside = if (isLast) eachX + eachBound.width <= widthToFit else eachX + eachBound.width + autoButtonSize <= widthToFit
val inside = if (isLast) eachX + eachBound.width <= widthToFit else eachX + eachBound.width + autoButtonSize.width <= widthToFit
if (inside) {
val isSecondaryButton = (eachComp as? JComponent)?.getClientProperty(ActionToolbar.SECONDARY_ACTION_PROPERTY) == true
@@ -122,7 +137,7 @@ class AutoLayoutStrategy(private val myForceShowFirstComponent: Boolean, private
val eachBound = Rectangle(getChildPreferredSize(component, i))
if (!full) {
val outside = if (i < componentCount - 1) {
eachY + eachBound.height + autoButtonSize < heightToFit
eachY + eachBound.height + autoButtonSize.height < heightToFit
}
else {
eachY + eachBound.height < heightToFit

5
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
View File

@@ -1455,6 +1455,11 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickAct
myReservePlaceAutoPopupIcon = reserve;
}
@Override
public boolean isReservePlaceAutoPopupIcon() {
return myReservePlaceAutoPopupIcon && !isInsideNavBar();
}
@Override
public void setSecondaryActionsTooltip(@NotNull @NlsContexts.Tooltip String secondaryActionsTooltip) {
mySecondaryActions.getTemplatePresentation().setText(secondaryActionsTooltip);