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

IJPL-846 cleanup

Browse Source 
GitOrigin-RevId: 60fb90581126c1cf18848eeb5520384a786cc9c6
This commit is contained in:
Vladimir Krivosheev
2024-03-25 10:17:46 +00:00
committed by intellij-monorepo-bot
parent 92f91e1d47
commit 4a5cc8889c
2 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.kt
+23 -33
View File
@@ -30,7 +30,6 @@ import com.intellij.openapi.fileEditor.impl.tabActions.CloseTab
import com.intellij.openapi.fileEditor.impl.text.AsyncEditorLoader
import com.intellij.openapi.fileEditor.impl.text.FileDropHandler
import com.intellij.openapi.options.advanced.AdvancedSettings
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.*
import com.intellij.openapi.util.registry.Registry
import com.intellij.openapi.vfs.VfsUtil
@@ -492,37 +491,28 @@ class EditorTabbedContainer internal constructor(
}
}
class DockableEditor(val img: Image?,
val file: VirtualFile,
private val presentation: Presentation,
private val preferredSize: Dimension,
val isPinned: Boolean,
val isNorthPanelAvailable: Boolean) : DockableContent<VirtualFile?> {
@Suppress("UNUSED_PARAMETER")
@Deprecated("project is not required.")
constructor(project: Project?,
img: Image,
file: VirtualFile,
presentation: Presentation,
preferredSize: Dimension,
isFilePinned: Boolean) : this(img = img,
file = file,
presentation = presentation,
preferredSize = preferredSize,
isPinned = isFilePinned,
isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()))
constructor(img: Image,
file: VirtualFile,
presentation: Presentation,
preferredSize: Dimension,
isFilePinned: Boolean) : this(img = img,
file = file,
presentation = presentation,
preferredSize = preferredSize,
isPinned = isFilePinned,
isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()))
class DockableEditor(
val img: Image?,
val file: VirtualFile,
private val presentation: Presentation,
private val preferredSize: Dimension,
val isPinned: Boolean,
val isNorthPanelAvailable: Boolean,
) : DockableContent<VirtualFile?> {
constructor(
img: Image,
file: VirtualFile,
presentation: Presentation,
preferredSize: Dimension,
isFilePinned: Boolean,
) : this(
img = img,
file = file,
presentation = presentation,
preferredSize = preferredSize,
isPinned = isFilePinned,
isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()),
)
override fun getKey(): VirtualFile = file
@@ -716,7 +706,7 @@ private class EditorTabLabel(info: TabInfo, tabs: JBTabsImpl) : TabLabel(tabs, i
return height - layoutInsets.top - layoutInsets.bottom
}
override fun isShowTabActions(): Boolean = UISettings.getInstance().showCloseButton || isPinned
override fun isShowTabActions(): Boolean = isPinned || UISettings.getInstance().showCloseButton
override fun isTabActionsOnTheRight(): Boolean = UISettings.getInstance().closeTabButtonOnTheRight
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.kt
+1 -2
View File
@@ -60,8 +60,7 @@ class AsyncEditorLoader internal constructor(
@JvmField
internal val FIRST_IN_BULK: Key<Boolean> = Key.create("EditorSplitters.first.in.bulk")
@Internal
fun isFirstInBulk(file: VirtualFile): Boolean = file.getUserData(FIRST_IN_BULK) != null
internal fun isFirstInBulk(file: VirtualFile): Boolean = file.getUserData(FIRST_IN_BULK) != null
@JvmStatic
@RequiresEdt