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-346408 diff: do not implement CustomComponentAction without need

Browse Source 
GitOrigin-RevId: 6b1cbaedd6d8f1e2e56d1b9da1a5f98b2905b45a
This commit is contained in:
Aleksey Pivovarov
2024-03-25 16:36:46 +00:00
committed by intellij-monorepo-bot
parent f8cd0f252a
commit 740a4c4f34
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.kt
+6 -12
View File
@@ -8,9 +8,10 @@ import com.intellij.diff.tools.util.base.TextDiffSettingsHolder
import com.intellij.diff.util.CombinedDiffToggle
import com.intellij.diff.util.DiffUserDataKeysEx
import com.intellij.icons.AllIcons
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.actionSystem.ex.CustomComponentAction
import com.intellij.openapi.actionSystem.impl.ActionButton
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionUpdateThread
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.actionSystem.impl.ActionMenu
import com.intellij.openapi.actionSystem.impl.PresentationFactory
import com.intellij.openapi.diff.DiffBundle
@@ -24,7 +25,6 @@ import com.intellij.ui.BadgeIcon
import com.intellij.ui.popup.PopupFactoryImpl
import com.intellij.ui.popup.list.PopupListElementRenderer
import com.intellij.util.ui.JBUI
import javax.swing.JComponent
import javax.swing.JList
import javax.swing.ListCellRenderer
import javax.swing.SwingConstants
@@ -32,9 +32,8 @@ import javax.swing.SwingConstants
class SetEditorSettingsAction(
settings: TextDiffSettingsHolder.TextDiffSettings,
editors: List<Editor?>,
) : DumbAwareAction(DiffBundle.message("editor.settings")),
Toggleable,
CustomComponentAction {
) : DumbAwareAction(DiffBundle.message("editor.settings")) {
private val badgeIcon = BadgeIcon(AllIcons.General.GearPlain, JBUI.CurrentTheme.IconBadge.INFORMATION)
private val editorSettingsActionGroup = SetEditorSettingsActionGroup(settings, editors)
@@ -51,7 +50,6 @@ class SetEditorSettingsAction(
override fun actionPerformed(e: AnActionEvent) {
val popup = createMainPopup(editorSettingsActionGroup, e.dataContext)
PopupUtil.addToggledStateListener(popup, e.presentation)
PopupUtil.showForActionButtonEvent(popup, e)
val diffModeToggle = getDiffModeToggle(e) ?: return
@@ -67,10 +65,6 @@ class SetEditorSettingsAction(
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
override fun createCustomComponent(presentation: Presentation, place: String): JComponent {
return ActionButton(this, presentation, place, ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE)
}
fun applyDefaults() {
editorSettingsActionGroup.applyDefaults()
}