griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Theme: Shared regions

Browse Source 
Continuing recent attempts to combine theme settings
and reduce complexity. part of #140360
This PR adds new root panel in theme called "Regions" which for now
includes two subpanels:

# Asset Shelf
This is just moving asset shelf from root to regions, where
it's more appropriate and less noisy.
No functional changes. (alternative to #144267)

# Channels
Previously known as "Theme Space List", or "Source List",
but in user interface we refer this region as "Channels".
This region is shared by all animation/video editors, and each had
a separate panel for theme properties. Now they're combined, and all
editors follow settings defined in Regions -> Channels.

Additionally, "Source List Title" property, which was never used is removed.
Properties are also renamed to be more intuitive and shorter.

# Toolbar / Sidebar
Previously was registered separately on every single editor. This allowed
for some extra customization, but in 5.0 need for this is reduced very much,
because elements drawn in those regions (tabs & tools) are also generalized,
so it makes sense to want same background color for them as well.

> This replaces 46 properties with 5, reducing the total by 41.
> Videos in PR

Pull Request: https://projects.blender.org/blender/blender/pulls/145609
This commit is contained in:
Nika Kutsniashvili
2025-09-12 13:22:50 +02:00
committed by Nika Kutsniashvili
parent 1a666b5722
commit 534b5f1f4f
9 changed files with 191 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
release/datafiles/userdef/userdef_default_theme.c
View File

@@ -277,6 +277,21 @@ const bTheme U_theme_default = {
.panel_text = RGBA(0xe6e6e6ff),
.panel_active = RGBA(0x4772b3ff),
},
.regions = {
.asset_shelf = {
.back = RGBA(0x303030ff),
.header_back = RGBA(0x1d1d1dff),
},
.channels = {
.back = RGBA(0x1d1d1dff),
.text = RGBA(0xb8b8b8ff),
.text_selected = RGBA(0xffaf23ff),
},
.sidebars = {
.back = RGBA(0x30303000),
.tab_back = RGBA(0x18181800),
}
},
.common = {
.anim = {
.playhead = RGBA(0x4772b3ff),
@@ -326,8 +341,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x1d1d1d00),
.button = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -342,8 +355,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.grid = RGBA(0x54545480),
.wire = RGBA(0x000000ff),
.wire_edit = RGBA(0x000000ff),
@@ -416,8 +427,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.hilite = RGBA(0x4772b3ff),
.vertex_size = 3,
.outline_width = 1,
@@ -432,12 +441,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.shade1 = RGBA(0x96969600),
.shade2 = RGBA(0x12121264),
.grid = RGBA(0x1a1a1aff),
@@ -480,12 +483,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x22222200),
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.shade1 = RGBA(0xc0c0c000),
.shade2 = RGBA(0x1d1d1d99),
.hilite = RGBA(0x60c04044),
@@ -509,12 +506,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.shade1 = RGBA(0x96969600),
.grid = RGBA(0x2a2a2aff),
.strip = RGBA(0x0d0d0d80),
@@ -545,12 +536,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x18181800),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xffffffff),
.list_text_hi = RGBA(0xffffffff),
.shade1 = RGBA(0xa0a0a000),
.grid = RGBA(0x303030ff),
.vertex_select = RGBA(0xff8500ff),
@@ -591,8 +576,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.grid = RGBA(0x303030ff),
.wire_edit = RGBA(0xc0c0c0ff),
.vertex_select = RGBA(0xff8500ff),
@@ -627,8 +610,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.shade2 = RGBA(0x4d4d4de6),
.hilite = RGBA(0x71a8ffff),
.grid = RGBA(0x1d1d1dff),
@@ -672,12 +653,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x1d1d1db3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x303030ff),
.list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.shade2 = RGBA(0x7f7f7f64),
.grid = RGBA(0x28282800),
.wire = RGBA(0x1a1a1aff),
@@ -724,8 +699,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x30303000),
.button = RGBA(0x303030ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,
@@ -756,12 +729,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x303030ff),
.list_title = RGBA(0xffffff00),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.grid = RGBA(0x181818ff),
.time_scrub_background = RGBA(0x181818ff),
.vertex_size = 3,
@@ -814,12 +781,6 @@ const bTheme U_theme_default = {
.header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.tab_back = RGBA(0x18181800),
.button = RGBA(0x30303000),
.list = RGBA(0x303030ff),
.list_title = RGBA(0xc3c3c3ff),
.list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffaf23ff),
.hilite = RGBA(0x80808080),
.active = RGBA(0x3b5689ff),
.vertex_size = 3,
@@ -832,10 +793,6 @@ const bTheme U_theme_default = {
.edited_object = RGBA(0x00806266),
.row_alternate = RGBA(0xffffff04),
},
.asset_shelf = {
.header_back = RGBA(0x1d1d1dff),
.back = RGBA(0x303030ff),
},
.tarm = {
{
.solid = RGBA(0x9a0000ff),