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

IJPL-192020 Convert SUPPRESS_FAST_TRACK to Key

Browse Source 
(cherry picked from commit 53b58350772385740e682c36e7b9c11040fe73d9)

IJ-CR-165957

GitOrigin-RevId: 850614c188a05dd33ad89841692f95f4f3878aa0
This commit is contained in:
Sergei Tachenov
2025-06-17 14:44:53 +03:00
committed by intellij-monorepo-bot
parent fa4639db1b
commit 4146b787f8
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
grid/impl/src/run/ui/table/TableFloatingToolbar.kt
View File

@@ -17,6 +17,7 @@ import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy
import com.intellij.openapi.application.EDT
import com.intellij.openapi.observable.util.whenDisposed
import com.intellij.openapi.progress.checkCanceled
import com.intellij.ui.ClientProperty
import com.intellij.ui.ComponentUtil
import com.intellij.ui.HintHint
import com.intellij.ui.JBColor
@@ -66,7 +67,7 @@ class TableFloatingToolbar(private val tableResultView: TableResultView, private
component.border = JBUI.Borders.empty()
targetComponent = tableResultView
isReservePlaceAutoPopupIcon = false
putClientProperty(ActionToolbarImpl.SUPPRESS_FAST_TRACK, true)
ClientProperty.put(this, ActionToolbarImpl.SUPPRESS_FAST_TRACK, true)
}
private val panel = BorderLayoutPanel().addToCenter(actionToolbar.component).apply {

6
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.kt
View File

@@ -937,8 +937,8 @@ open class ActionToolbarImpl @JvmOverloads constructor(
cancelCurrentUpdate()
val firstTimeFastTrack = !hasVisibleActions() && componentCount == 1 && getClientProperty(SUPPRESS_FAST_TRACK) == null
if (firstTimeFastTrack) putClientProperty(SUPPRESS_FAST_TRACK, true)
val firstTimeFastTrack = !hasVisibleActions() && componentCount == 1 && !ClientProperty.isTrue(this, SUPPRESS_FAST_TRACK)
if (firstTimeFastTrack) ClientProperty.put(this, SUPPRESS_FAST_TRACK, true)
val cs = service<CoreUiCoroutineScopeHolder>().coroutineScope
val job = cs.launch(
@@ -1596,7 +1596,7 @@ open class ActionToolbarImpl @JvmOverloads constructor(
companion object {
const val DO_NOT_ADD_CUSTOMIZATION_HANDLER: String = "ActionToolbarImpl.suppressTargetComponentWarning"
const val SUPPRESS_FAST_TRACK: String = "ActionToolbarImpl.suppressFastTrack"
val SUPPRESS_FAST_TRACK: Key<Boolean> = Key.create("ActionToolbarImpl.suppressFastTrack")
/**
* Put `TRUE` into [.putClientProperty] to mark that toolbar

3
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ToolbarUtils.kt
View File

@@ -3,6 +3,7 @@ package com.intellij.openapi.actionSystem.impl
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.editor.Editor
import com.intellij.ui.ClientProperty
import com.intellij.ui.ComponentUtil
import org.jetbrains.annotations.ApiStatus
import java.awt.Container
@@ -30,7 +31,7 @@ object ToolbarUtils {
init {
this.targetComponent = targetComponent
putClientProperty(SUPPRESS_FAST_TRACK, true)
ClientProperty.put(this, ActionToolbarImpl.SUPPRESS_FAST_TRACK, true)
isReservePlaceAutoPopupIcon = false
ComponentUtil.markAsShowing(this, true)
updateActionsImmediately(true)

2
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.kt
View File

@@ -1812,7 +1812,7 @@ open class EditorInspectionsActionToolbar(
private val prevErrorAction: AnAction?
) : ActionToolbarImpl(ActionPlaces.EDITOR_INSPECTIONS_TOOLBAR, actions, true) {
init {
putClientProperty(SUPPRESS_FAST_TRACK, true)
ClientProperty.put(this, ActionToolbarImpl.SUPPRESS_FAST_TRACK, true)
}
override fun addNotify() {

3
platform/platform-impl/src/com/intellij/openapi/editor/toolbar/floating/AbstractFloatingToolbarComponent.kt
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.actionSystem.ActionPlaces
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl
import com.intellij.openapi.actionSystem.toolbarLayout.ToolbarLayoutStrategy
import com.intellij.ui.ClientProperty
import com.intellij.ui.JBColor
import org.jetbrains.annotations.ApiStatus
import java.awt.*
@@ -102,7 +103,7 @@ abstract class AbstractFloatingToolbarComponent(
private var opacity: Float = 0.0f
init {
toolbar.putClientProperty(SUPPRESS_FAST_TRACK, true)
ClientProperty.put(toolbar, ActionToolbarImpl.SUPPRESS_FAST_TRACK, true)
}
fun getOpacity(): Float = opacity