Skip to content

Commit 0be71e9

Browse files
Timur Malaninintellij-monorepo-bot
authored andcommitted
Disable "Python" icons for PTW for non-conda interpreters types
Use `JBEmptyBorder` with configurable gap for tree scroll pane (cherry picked from commit d59ada329387276ff2d098c580c71a1a047682c2) IJ-MR-170445 GitOrigin-RevId: 8fa5e64e68b121b7ae534c72967e8797fda9fd9b
1 parent f89d2c7 commit 0be71e9

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

python/src/com/jetbrains/python/packaging/common/packages.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.jetbrains.python.packaging.normalizePackageName
66
import com.jetbrains.python.packaging.pyRequirementVersionSpec
77
import com.jetbrains.python.packaging.repository.PyPackageRepository
88
import com.jetbrains.python.packaging.requirement.PyRequirementVersionSpec
9-
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
109
import org.jetbrains.annotations.ApiStatus
1110
import org.jetbrains.annotations.Nls
1211
import javax.swing.Icon
@@ -29,7 +28,7 @@ open class PythonPackage(name: String, val version: String, val isEditableMode:
2928
val presentableName: String = name
3029

3130
@ApiStatus.Internal
32-
open val sourceRepoIcon: Icon = PythonPsiApiIcons.Python
31+
open val sourceRepoIcon: Icon? = null
3332

3433
override fun toString(): String {
3534
return "PythonPackage(name='$name', version='$version')"

python/src/com/jetbrains/python/packaging/toolwindow/model/modelComponents.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class InstalledPackage(val instance: PythonPackage, repository: PyPackageReposit
1717
val currentVersion: PyPackageVersion? = PyPackageVersionNormalizer.normalize(instance.version)
1818

1919
val isEditMode: Boolean = instance.isEditableMode
20-
val sourceRepoIcon: Icon = instance.sourceRepoIcon
20+
val sourceRepoIcon: Icon? = instance.sourceRepoIcon
2121

2222
val canBeUpdated: Boolean
2323
get() {
@@ -29,7 +29,7 @@ class InstalledPackage(val instance: PythonPackage, repository: PyPackageReposit
2929
}
3030

3131
class RequirementPackage(val instance: PythonPackage, override val repository: PyPackageRepository, private val requirements: List<RequirementPackage> = emptyList()) : DisplayablePackage(instance.name, repository) {
32-
val sourceRepoIcon: Icon = instance.sourceRepoIcon
32+
val sourceRepoIcon: Icon? = instance.sourceRepoIcon
3333

3434
override fun getRequirements(): List<RequirementPackage> = requirements
3535
}

python/src/com/jetbrains/python/packaging/toolwindow/packages/PyPackagingTreeGroup.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import com.intellij.icons.AllIcons
55
import com.intellij.openapi.util.NlsSafe
66
import com.intellij.ui.components.JBLabel
77
import com.intellij.ui.components.JBScrollPane
8+
import com.intellij.util.ui.JBEmptyBorder
89
import com.intellij.util.ui.JBUI
10+
import com.intellij.util.ui.JBValue
911
import com.jetbrains.python.PyBundle
1012
import com.jetbrains.python.packaging.repository.PyPackageRepository
1113
import com.jetbrains.python.packaging.toolwindow.model.DisplayablePackage
@@ -37,7 +39,7 @@ internal class PyPackagingTreeGroup(
3739
private var itemsCount: Int? = null
3840

3941
val scrollPane = JBScrollPane(tree).apply {
40-
border = JBUI.Borders.empty()
42+
border = JBEmptyBorder(JBUI.insetsLeft(gapValue.get()))
4143
verticalScrollBarPolicy = ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER
4244
horizontalScrollBarPolicy = ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER
4345
}
@@ -143,4 +145,8 @@ internal class PyPackagingTreeGroup(
143145
container.revalidate()
144146
container.repaint()
145147
}
148+
149+
companion object {
150+
private val gapValue = JBValue.UIInteger("TreeTable.gap", 16)
151+
}
146152
}

0 commit comments

Comments
 (0)