MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-285033 Dialog header same color as main window header, and other color keys

Browse Source 
GitOrigin-RevId: a0e6dcf505babcb2dd6387f9416a0662e0b2662b
This commit is contained in:
Mikhail Sokolov
2021-12-30 16:42:07 +03:00
committed by intellij-monorepo-bot
parent 36888a0448
commit 5df6fd5bb9
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.theme.json
View File

@@ -552,13 +552,13 @@
"MainToolbar": {
"background": "#3c3f41",
"icon": {
"Icon": {
"borderInsets": "10,10,10,10",
"background": "#3C3F41",
"hoverBackground": "#4C5052",
"pressedBackground": "#4C5052"
},
"dropdown": {
"Dropdown": {
"borderInsets": "12,6,12,6",
"background": "#3C3F41",
"hoverBackground": "#4C5052",

4
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.theme.json
View File

@@ -915,13 +915,13 @@
"MainToolbar": {
"background": "#f2f2f2",
"icon": {
"Icon": {
"borderInsets": "10,10,10,10",
"background": "#f2f2f2",
"hoverBackground": "#dfdfdf",
"pressedBackground": "#dfdfdf"
},
"dropdown": {
"Dropdown": {
"borderInsets": "12,6,12,6",
"background": "#f2f2f2",
"hoverBackground": "#dfdfdf",

6
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolbarComboWidget.kt
View File

@@ -40,9 +40,9 @@ abstract class ToolbarComboWidget: JComponent() {
override fun updateUI() {
setUI(UIManager.getUI(this))
UIManager.getColor("MainToolbar.dropdown.foreground")?.let { foreground = it }
UIManager.getColor("MainToolbar.dropdown.background")?.let { background = it}
UIManager.getColor("MainToolbar.dropdown.hoverBackground")?.let { hoverBackground = it }
UIManager.getColor("MainToolbar.Dropdown.foreground")?.let { foreground = it }
UIManager.getColor("MainToolbar.Dropdown.background")?.let { background = it}
UIManager.getColor("MainToolbar.Dropdown.hoverBackground")?.let { hoverBackground = it }
}
fun addPressListener(action: ActionListener) {

6
platform/platform-impl/src/com/intellij/openapi/wm/impl/customFrameDecorations/header/toolbar/ToolbarFrameHeader.kt
View File

@@ -155,7 +155,7 @@ internal class ToolbarFrameHeader(frame: JFrame, ideMenu: IdeMenuBar) : Abstract
hoveredStateCallback = { cmp, hovered ->
if (cmp !is AbstractButton) return@addHoverAndPressStateListener
if (hovered) {
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.icon.hoverBackground"))
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.Icon.hoverBackground"))
cmp.isContentAreaFilled = true
}
else {
@@ -166,10 +166,10 @@ internal class ToolbarFrameHeader(frame: JFrame, ideMenu: IdeMenuBar) : Abstract
pressedStateCallback = { cmp, pressed ->
if (cmp !is JComponent) return@addHoverAndPressStateListener
if (pressed) {
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.icon.pressedBackground"))
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.Icon.pressedBackground"))
}
else {
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.icon.hoverBackground"))
cmp.putClientProperty("JButton.backgroundColor", UIManager.getColor("MainToolbar.Icon.hoverBackground"))
}
})

6
platform/platform-impl/src/com/intellij/openapi/wm/impl/headertoolbar/ActionToolbar.kt
View File

@@ -27,7 +27,7 @@ internal class ActionToolbar(actions: List<AnAction>) : JPanel(FlowLayout(FlowLa
}
private fun createButton(action: AnAction): JComponent {
val insets = UIManager.getInsets("MainToolbar.icon.borderInsets") ?: JBUI.insets(10)
val insets = UIManager.getInsets("MainToolbar.Icon.borderInsets") ?: JBUI.insets(10)
val presentation = action.templatePresentation.clone()
presentation.scaleIcon(iconSize)
@@ -53,9 +53,9 @@ private class MainToolbarLook : IdeaActionButtonLook() {
override fun getStateBackground(component: JComponent, state: Int): Color = when (state) {
ActionButtonComponent.NORMAL -> component.background
ActionButtonComponent.PUSHED -> UIManager.getColor("MainToolbar.icon.pressedBackground")
ActionButtonComponent.PUSHED -> UIManager.getColor("MainToolbar.Icon.pressedBackground")
?: UIManager.getColor("ActionButton.pressedBackground")
else -> UIManager.getColor("MainToolbar.icon.hoverBackground")
else -> UIManager.getColor("MainToolbar.Icon.hoverBackground")
?: UIManager.getColor("ActionButton.hoverBackground")
}

4
platform/platform-resources/src/themes/HighContrast.theme.json
View File

@@ -495,13 +495,13 @@
},
"MainToolbar": {
"icon": {
"Icon": {
"borderInsets": "10,10,10,10",
"background": "#000000",
"hoverBackground": "#3333FF",
"pressedBackground": "#3333FF"
},
"dropdown": {
"Dropdown": {
"borderInsets": "12,6,12,6",
"background": "#000000",
"hoverBackground": "#3333FF",

4
platform/platform-resources/src/themes/expUI/expUI_dark.theme.json
View File

@@ -278,13 +278,13 @@
},
"MainToolbar": {
"icon": {
"Icon": {
"borderInsets": "10,10,10,10",
"background": "Grey2",
"hoverBackground": "Blue1",
"pressedBackground": "Blue1"
},
"dropdown": {
"Dropdown": {
"borderInsets": "12,6,12,6"
},
"background": "Grey2"

4
platform/platform-resources/src/themes/expUI/expUI_light.theme.json
View File

@@ -294,13 +294,13 @@
"MainToolbar": {
"background": "Grey2",
"inactiveBackground": "Grey2",
"icon": {
"Icon": {
"borderInsets": "10,10,10,10",
"background": "Grey2",
"hoverBackground": "Grey1",
"pressedBackground": "Grey1"
},
"dropdown": {
"Dropdown": {
"foreground": "Grey11",
"borderInsets": "12,6,12,6",
"background": "Grey2",

4
plugins/laf/macos/src/com/intellij/laf/macos/macintellijlaf.theme.json
View File

@@ -225,8 +225,8 @@
},
"MainToolbar": {
"icon.borderInsets": "10,10,10,10",
"dropdown.borderInsets": "12,6,12,6"
"Icon.borderInsets": "10,10,10,10",
"Dropdown.borderInsets": "12,6,12,6"
},
"window": "#ececec"

4
plugins/laf/win10/src/com/intellij/laf/win10/win10intellijlaf.theme.json
View File

@@ -412,8 +412,8 @@
"MainToolbar": {
"background": "#f2f2f2",
"icon.borderInsets": "10,10,10,10",
"dropdown.borderInsets": "12,6,12,6"
"Icon.borderInsets": "10,10,10,10",
"Dropdown.borderInsets": "12,6,12,6"
},
"control": "#f2f2f2",