MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-320571 'Profiler' action added to the toolbar is present in popular action list

Browse Source 
GitOrigin-RevId: f1c1bdb91156a978bd357a095249126ce7e0ea40
This commit is contained in:
Mikhail Sokolov
2023-07-03 12:05:06 +02:00
committed by intellij-monorepo-bot
parent d161fb24ad
commit 946f57caba
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/platform-impl/src/com/intellij/openapi/actionSystem/SplitButtonAction.java
View File

@@ -186,7 +186,7 @@ public class SplitButtonAction extends ActionGroup implements CustomComponentAct
}
}
x = baseRect.x + (x - actionIcon.getIconWidth()) / 2;
x = baseRect.x + (x - baseRect.x - actionIcon.getIconWidth()) / 2;
y = baseRect.y + (baseRect.height - actionIcon.getIconHeight()) / 2;
look.paintIcon(g, this, actionIcon, x, y);
}

8
platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/HeaderToolbarButtonLook.kt
View File

@@ -15,6 +15,7 @@ import com.intellij.util.ui.JBValue
import com.intellij.util.ui.UIUtil
import org.jetbrains.annotations.ApiStatus
import java.awt.Color
import java.awt.Dimension
import java.awt.Graphics
import java.awt.Rectangle
import java.awt.image.RGBImageFilter
@@ -63,7 +64,12 @@ internal class HeaderToolbarButtonLook(
override fun paintIcon(g: Graphics?, actionButton: ActionButtonComponent?, icon: Icon, x: Int, y: Int) {
val scaledIcon = scaleIcon(adjustIconForHeader(icon))
paintIconImpl(g, actionButton, scaledIcon, x, y)
val originalSize = Dimension(icon.iconWidth, icon.iconHeight)
val scaledSize = Dimension(scaledIcon.iconWidth, scaledIcon.iconHeight)
val scaledX = x - (scaledSize.width - originalSize.width) / 2
val scaledY = y - (scaledSize.height - originalSize.height) / 2
paintIconImpl(g, actionButton, scaledIcon, scaledX, scaledY)
}
override fun paintDownArrow(g: Graphics?, actionButton: ActionButtonComponent?, originalIcon: Icon, arrowIcon: Icon) {

3
platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt
View File

@@ -14,6 +14,7 @@ import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.actionSystem.ex.ComboBoxAction
import com.intellij.openapi.actionSystem.ex.ComboBoxAction.ComboBoxButton
import com.intellij.openapi.actionSystem.ex.CustomComponentAction
import com.intellij.openapi.actionSystem.impl.ActionButton
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
import com.intellij.openapi.application.EDT
import com.intellij.openapi.components.serviceAsync
@@ -366,6 +367,8 @@ private class MyActionToolbarImpl(group: ActionGroup,
adjustIcons(presentation)
(component as? ActionButton)?.let { button -> button.setMinimumButtonSize(ActionToolbar.experimentalToolbarMinimumButtonSize()) }
if (action is ComboBoxAction) {
findComboButton(component)?.apply {
margin = JBInsets.emptyInsets()