MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-313596 Project and VCS popups might don't open on widget clicks

Browse Source 
GitOrigin-RevId: 8ad3031827c4fc53bd1395256e024cff65d18ce2
This commit is contained in:
Mikhail Sokolov
2023-02-24 17:18:49 +00:00
committed by intellij-monorepo-bot
parent 697b0b3502
commit 5a76ff3a64
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/MacToolbarFrameHeader.kt
+1
View File
@@ -62,6 +62,7 @@ internal class MacToolbarFrameHeader(private val frame: JFrame,
private fun createToolBar(): MainToolbar {
val toolbar = MainToolbar()
toolbar.layoutCallBack = { updateCustomDecorationHitTestSpots() }
toolbar.isOpaque = false
toolbar.addComponentListener(object: ComponentAdapter() {
override fun componentResized(e: ComponentEvent?) {
platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt
+1
View File
@@ -118,6 +118,7 @@ internal class ToolbarFrameHeader(frame: JFrame, ideMenu: IdeMenuBar) : FrameHea
removeToolbar()
val toolbar = MainToolbar()
toolbar.layoutCallBack = { updateCustomDecorationHitTestSpots() }
toolbar.init(toolbarActionGroups)
toolbar.isOpaque = false
toolbar.addComponentListener(contentResizeListener)
platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/MainToolbar.kt
+12 -2
View File
@@ -31,9 +31,12 @@ import javax.swing.JComponent
import javax.swing.JPanel
internal class MainToolbar: JPanel(HorizontalLayout(10)) {
private val disposable = Disposer.newDisposable()
private val mainMenuButton: MainMenuButton?
var layoutCallBack : LayoutCallBack? = null
init {
background = JBUI.CurrentTheme.CustomFrameDecorations.mainToolbarBackground(true)
isOpaque = true
@@ -94,7 +97,7 @@ internal class MainToolbar: JPanel(HorizontalLayout(10)) {
}
private fun createActionBar(group: ActionGroup): JComponent {
val toolbar = MyActionToolbarImpl(group = group)
val toolbar = MyActionToolbarImpl(group, layoutCallBack)
toolbar.setActionButtonBorder(JBUI.Borders.empty(mainToolbarButtonInsets()))
toolbar.setCustomButtonLook(HeaderToolbarButtonLook())
@@ -108,7 +111,9 @@ internal class MainToolbar: JPanel(HorizontalLayout(10)) {
}
}
private class MyActionToolbarImpl(group: ActionGroup) : ActionToolbarImpl(ActionPlaces.MAIN_TOOLBAR, group, true) {
typealias LayoutCallBack = () -> Unit
private class MyActionToolbarImpl(group: ActionGroup, val layoutCallBack: LayoutCallBack?) : ActionToolbarImpl(ActionPlaces.MAIN_TOOLBAR, group, true) {
init {
updateFont()
@@ -119,6 +124,11 @@ private class MyActionToolbarImpl(group: ActionGroup) : ActionToolbarImpl(Action
for (i in 0 until bounds.size) fitRectangle(bounds[i], getComponent(i))
}
override fun doLayout() {
super.doLayout()
layoutCallBack?.invoke()
}
private fun fitRectangle(rect: Rectangle, cmp: Component) {
val minSize = ActionToolbar.experimentalToolbarMinimumButtonSize()
if (!isSeparator(cmp)) rect.width = Integer.max(rect.width, minSize.width)