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

IJPL-160250 git: remove regular push/update actions from the main toolbar

Browse Source 
(cherry picked from commit 9ae1fcfd31912de9710acda1fe03e319639cac34)

IJ-MR-144460

GitOrigin-RevId: dda1fe4a03ac5684576e30849a570691d72f8622
This commit is contained in:
Aleksandr Krasilnikov
2024-09-03 18:52:03 +02:00
committed by intellij-monorepo-bot
parent 477033be06
commit b7baeb409a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import com.intellij.ide.ui.customization.CustomActionsListener
import com.intellij.ide.ui.customization.CustomActionsSchema
import com.intellij.ide.ui.customization.CustomizationUtil
import com.intellij.ide.ui.laf.darcula.ui.MainToolbarComboBoxButtonUI
import com.intellij.idea.AppMode
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.actionSystem.ex.ActionUtil
@@ -159,6 +160,18 @@ class MainToolbar(
}
migratePreviousCustomizations(schema)
migrateVcsActions(schema)
}
private fun migrateVcsActions(schema: CustomActionsSchema) {
if (AppMode.isRemoteDevHost()) return
val allActions = schema.getActions().toMutableList()
val actionsToRemove = setOf("Vcs.Push", "Vcs.UpdateProject")
val wereRemoved = allActions.removeIf { it.groupPath.contains("Main Toolbar") && it.component in actionsToRemove }
if (wereRemoved) {
schema.setActions(allActions)
schemaChanged()
}
}
/*
@@ -385,7 +398,7 @@ internal class MyActionToolbarImpl(group: ActionGroup, customizationGroup: Actio
}
override fun getSeparatorColor(): Color {
return JBColor.namedColor("MainToolbar.separatorColor", super.getSeparatorColor())
return JBColor.namedColor("MainToolbar.separatorColor", super.separatorColor)
}
private fun findComboButton(c: Container): ComboBoxButton? {