MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Don't use same action group when building compilation charts action panel

Browse Source 
IDEA-359472

GitOrigin-RevId: f6f29a31a176e176ec33201f4a2ab0b2ed3e91db
This commit is contained in:
Georgii Ustinov
2024-09-22 19:49:52 +03:00
committed by intellij-monorepo-bot
parent 168e2fc9f2
commit ec98448d79
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
java/compiler/charts/resources/intellij.java.compiler.charts.xml
View File

@@ -9,26 +9,23 @@
description="Show compilation charts" restartRequired="false"/>
</extensions>
<actions resource-bundle="messages.CompilationChartsBundle">
<group id="CompilationChartsActionGroup" class="com.intellij.openapi.actionSystem.DefaultActionGroup">
<separator/>
<action id="CompilationChartsZoomResetAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomResetAction"
icon="AllIcons.Graph.ActualZoom">
<keyboard-shortcut first-keystroke="shift meta EQUALS" keymap="Mac OS X"/>
<keyboard-shortcut first-keystroke="shift ctrl EQUALS" keymap="$default"/>
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsZoomOutAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomOutAction"
icon="AllIcons.Graph.ZoomOut" use-shortcut-of="CollapseAll">
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsZoomInAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomInAction"
icon="AllIcons.Graph.ZoomIn" use-shortcut-of="ExpandAll">
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsScrollToEndAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ScrollToEndAction"
icon="AllIcons.Actions.Forward">
<override-text place="CompilationChartsToolbar"/>
</action>
</group>
<action id="CompilationChartsZoomResetAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomResetAction"
icon="AllIcons.Graph.ActualZoom">
<keyboard-shortcut first-keystroke="shift meta EQUALS" keymap="Mac OS X"/>
<keyboard-shortcut first-keystroke="shift ctrl EQUALS" keymap="$default"/>
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsZoomOutAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomOutAction"
icon="AllIcons.Graph.ZoomOut" use-shortcut-of="CollapseAll">
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsZoomInAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ZoomInAction"
icon="AllIcons.Graph.ZoomIn" use-shortcut-of="ExpandAll">
<override-text place="CompilationChartsToolbar"/>
</action>
<action id="CompilationChartsScrollToEndAction" class="com.intellij.java.compiler.charts.ui.ActionPanel$ScrollToEndAction"
icon="AllIcons.Actions.Forward">
<override-text place="CompilationChartsToolbar"/>
</action>
</actions>
</idea-plugin>

23
java/compiler/charts/src/com/intellij/java/compiler/charts/ui/ActionPanel.kt
View File

@@ -106,21 +106,28 @@ class ActionPanel(private val project: Project, private val vm: CompilationChart
})
// legend
val actionGroup = ActionManager.getInstance().getAction("CompilationChartsActionGroup") as? DefaultActionGroup
if (actionGroup != null) {
actionGroup.addAction(CompilationChartsStatsActionHolder(vm), Constraints.FIRST)
val toolbar = ActionManager.getInstance().createActionToolbar(COMPILATION_CHARTS_TOOLBAR_ID, actionGroup, true).apply {
targetComponent = this@ActionPanel
}
addToRight(toolbar.component)
val actionManager = ActionManager.getInstance()
val actionGroup = DefaultActionGroup(
CompilationChartsStatsActionHolder(vm),
Separator(),
actionManager.getAction("CompilationChartsZoomResetAction"),
actionManager.getAction("CompilationChartsZoomOutAction"),
actionManager.getAction("CompilationChartsZoomInAction"),
actionManager.getAction("CompilationChartsScrollToEndAction"),
)
val toolbar = actionManager.createActionToolbar(COMPILATION_CHARTS_TOOLBAR_ID, actionGroup, true).apply {
targetComponent = this@ActionPanel
}
addToRight(toolbar.component)
DumbAwareAction.create {
val focusManager = IdeFocusManager.getInstance(project)
if (focusManager.getFocusedDescendantFor(this@ActionPanel.component) != null) {
focusManager.requestFocus(searchField, true)
}
}.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND).shortcutSet, this@ActionPanel.component)
}.registerCustomShortcutSet(actionManager.getAction(IdeActions.ACTION_FIND).shortcutSet, this@ActionPanel.component)
}
fun updateLabel(set: Set<CompilationChartsViewModel.Modules.EventKey>?, filter: CompilationChartsViewModel.Filter?) {