From 1205dfc90b5bb71b9827e87ea7cda4121f2ed99b Mon Sep 17 00:00:00 2001 From: Aleksander Kuznetsov Date: Thu, 18 May 2023 01:28:33 +0200 Subject: [PATCH] [profiler] IDEA-319765 New UI colors for the profiler widget also: - define widget colors to theme schemes - add key for the horizontal axis under the charts - update some Old UI colors as well GitOrigin-RevId: 454e04614b9ad589c90ac9aeaebe2a505017980f --- .../ide/ui/laf/darcula/darcula.theme.json | 31 ++++++++++++++++++- .../ide/ui/laf/intellijlaf.theme.json | 31 ++++++++++++++++++- .../src/themes/HighContrast.theme.json | 31 ++++++++++++++++++- .../src/themes/expUI/expUI_dark.theme.json | 30 +++++++++++++++++- .../src/themes/expUI/expUI_light.theme.json | 30 +++++++++++++++++- 5 files changed, 148 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.theme.json b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.theme.json index 1c25f7bf42be..b05c084db8ea 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.theme.json +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.theme.json @@ -624,7 +624,36 @@ "separatorColor": "#2B2D30", "borderColor": "#1E1F22" }, - + "Profiler": { + "ChartSlider": { + "foreground": "#FEFEFE", + "lineColor": "#9AA7B0" + }, + "CpuChart": { + "background": "#6296554D", + "borderColor": "#629655", + "inactiveBackground": "#62965533", + "inactiveBorderColor": "#4F6A4B", + "pointBackground": "#629625", + "pointBorderColor": "#3C3F41" + }, + "MemoryChart": { + "background": "#589DF680", + "borderColor": "#589DF6", + "inactiveBackground": "#589DF633", + "inactiveBorderColor": "#476589", + "pointBackground": "#589dF6", + "pointBorderColor": "#3C3F41" + }, + "Timer": { + "foreground": "#BBBBBB", + "disabledForeground": "#777777", + "background": "#323232" + }, + "LiveChart": { + "horizontalAxisColor": "#D1D1D1" + } + }, "FlameGraph.Tooltip": { "scaleBackground": "#363839", "scaleColor": "#365880", diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.theme.json b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.theme.json index 452b13238ce6..55dd5e7f9d21 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.theme.json +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.theme.json @@ -999,7 +999,36 @@ "separatorColor": "grey09", "borderColor": "grey09" }, - + "Profiler": { + "ChartSlider": { + "foreground": "#000000", + "lineColor": "#ADADAD" + }, + "CpuChart": { + "background": "#6296554D", + "borderColor": "#629655", + "inactiveBackground": "#62965533", + "inactiveBorderColor": "#A1C099", + "pointBackground": "#629625", + "pointBorderColor": "#FFFFFF" + }, + "MemoryChart": { + "background": "#589DF680", + "borderColor": "#589DF6", + "inactiveBackground": "#589DF633", + "inactiveBorderColor": "#ABCEFA", + "pointBackground": "#589dF6", + "pointBorderColor": "#FFFFFF" + }, + "Timer": { + "foreground": "#000000", + "disabledForeground": "#808080", + "background": "#F2F2F2" + }, + "LiveChart": { + "horizontalAxisColor": "#515151" + } + }, "FlameGraph.Tooltip": { "scaleBackground": "#EBEBEB", "scaleColor": "#A7D1EC", diff --git a/platform/platform-resources/src/themes/HighContrast.theme.json b/platform/platform-resources/src/themes/HighContrast.theme.json index b4227364851e..033794d4fb62 100644 --- a/platform/platform-resources/src/themes/HighContrast.theme.json +++ b/platform/platform-resources/src/themes/HighContrast.theme.json @@ -518,7 +518,36 @@ "hoverBackground": "#00000019", "pressedBackground": "#00000028" }, - + "Profiler": { + "ChartSlider": { + "foreground": "#FEFEFE", + "lineColor": "#1AEBFF" + }, + "CpuChart": { + "background": "#6296554D", + "borderColor": "#629655", + "inactiveBackground": "#62965533", + "inactiveBorderColor": "#314B2A", + "pointBackground": "#629625", + "pointBorderColor": "#FFFFFF" + }, + "MemoryChart": { + "background": "#589DF680", + "borderColor": "#589DF6", + "inactiveBackground": "#589DF633", + "inactiveBorderColor": "#2C4E7B", + "pointBackground": "#196AD0", + "pointBorderColor": "#FFFFFF" + }, + "Timer": { + "foreground": "#FFFFFF", + "disabledForeground": "#6E6E6E", + "background": "#323232" + }, + "LiveChart": { + "horizontalAxisColor": "#E6E6E6" + } + }, "FlameGraph.Tooltip": { "scaleBackground": "#555454", "scaleColor": "#402FF6", diff --git a/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json b/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json index e90afbbc33d1..508b2d9009dd 100644 --- a/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json +++ b/platform/platform-resources/src/themes/expUI/expUI_dark.theme.json @@ -770,7 +770,35 @@ }, "MainWindow.FullScreeControl.Background": "#575A5C", - + "Profiler": { + "ChartSlider": { + "foreground": "Grey12", + "lineColor": "Grey5" + }, + "CpuChart": { + "background": "Green2", + "borderColor": "Green5", + "inactiveBackground": "Green1", + "inactiveBorderColor": "Green2", + "pointBackground": "Green5", + "pointBorderColor": "Grey2" + }, + "MemoryChart": { + "background": "Blue2", + "borderColor": "Blue8", + "inactiveBackground": "Blue1", + "inactiveBorderColor": "Blue3", + "pointBackground": "Blue5", + "pointBorderColor": "Grey2" + }, + "Timer": { + "foreground": "Grey12", + "disabledForeground": "Grey7" + }, + "LiveChart": { + "horizontalAxisColor": "Grey4" + } + }, "FlameGraph.Tooltip": { "scaleBackground": "#43454A", "scaleColor": "#375FAD", diff --git a/platform/platform-resources/src/themes/expUI/expUI_light.theme.json b/platform/platform-resources/src/themes/expUI/expUI_light.theme.json index af9f4e2d795e..23c099018d95 100644 --- a/platform/platform-resources/src/themes/expUI/expUI_light.theme.json +++ b/platform/platform-resources/src/themes/expUI/expUI_light.theme.json @@ -798,7 +798,35 @@ }, "MainWindow.FullScreeControl.Background": "#7A7B80", - + "Profiler": { + "ChartSlider": { + "foreground": "Grey1", + "lineColor": "Grey8" + }, + "CpuChart": { + "background": "Green9", + "borderColor": "Green5", + "inactiveBackground": "#C5E5CC66", + "inactiveBorderColor": "Green8", + "pointBackground": "Green5", + "pointBorderColor": "Grey13" + }, + "MemoryChart": { + "background": "Blue10", + "borderColor": "Blue5", + "inactiveBackground": "#C2D6FC66", + "inactiveBorderColor": "Blue9", + "pointBackground": "Blue5", + "pointBorderColor": "Grey13" + }, + "Timer": { + "foreground": "Grey1", + "disabledForeground": "Grey8" + }, + "LiveChart": { + "horizontalAxisColor": "Grey9" + } + }, "FlameGraph.Tooltip": { "scaleBackground": "#EBECF0", "scaleColor": "#C2D6FC",