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

UI: Theme: Scrubbing/Markers shared region

Browse Source 
Continues and depends on #145609, part of #140360 project.

Previously, all 5 animation/video editors had different properties
for Scrubbing/Markers region. This PR adds new Region panel for it,
so that all editors can share one color.

Text color in this region was coming from regular editor text color.
To differentiate between editors (as is the pattern already with other editors),
and allow more modular themeability of regions, new Text color is added
for that region as well.

Video in PR

Pull Request: https://projects.blender.org/blender/blender/pulls/146113
This commit is contained in:
Nika Kutsniashvili
2025-09-12 16:25:56 +02:00
committed by Nika Kutsniashvili
parent f729e639f4
commit 250384dd57
12 changed files with 82 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,17 +287,21 @@ const bTheme U_theme_default = {
.text = RGBA(0xb8b8b8ff),
.text_selected = RGBA(0xffaf23ff),
},
.scrubbing = {
.back = RGBA(0x161616ff),
.text = RGBA(0xc3c3c3ff),
.time_marker = RGBA(0xffffff4d),
.time_marker_selected = RGBA(0xffffffb3),
},
.sidebars = {
.back = RGBA(0x30303000),
.tab_back = RGBA(0x18181800),
}
},
},
.common = {
.anim = {
.playhead = RGBA(0x4772b3ff),
.preview_range = RGBA(0xa14d0066),
.time_marker = RGBA(0xffffff4d),
.time_marker_selected = RGBA(0xffffffb3),
.channels = RGBA(0x194e8080),
.channels_sub = RGBA(0x0f2c4d80),
.channel_group = RGBA(0x1a332d37),
@@ -448,7 +452,6 @@ const bTheme U_theme_default = {
.vertex = RGBA(0x000000ff),
.vertex_select = RGBA(0xff8500ff),
.vertex_active = RGBA(0xffffffff),
.time_scrub_background = RGBA(0x161616ff),
.vertex_size = 6,
.outline_width = 1,
.facedot_size = 4,
@@ -486,7 +489,6 @@ const bTheme U_theme_default = {
.header_text_hi = RGBA(0xffffffff),
.shade1 = RGBA(0xc0c0c000),
.grid = RGBA(0x161616ff),
.time_scrub_background = RGBA(0x1d1d1dff),
.ds_ipoline = RGBA(0x94e575cc),
.keyborder = RGBA(0x000000ff),
.keyborder_select = RGBA(0x000000ff),
@@ -509,7 +511,6 @@ const bTheme U_theme_default = {
.grid = RGBA(0x2a2a2aff),
.strip = RGBA(0x0d0d0d80),
.strip_select = RGBA(0xff8c00ff),
.time_scrub_background = RGBA(0x161616ff),
.keyborder = RGBA(0x000000ff),
.keyborder_select = RGBA(0x000000ff),
.vertex_size = 3,
@@ -540,7 +541,6 @@ const bTheme U_theme_default = {
.bone_pose = RGBA(0x50c8ff50),
.before_current_frame = RGBA(0xf22e23ff),
.after_current_frame = RGBA(0x78f244ff),
.time_scrub_background = RGBA(0x121212ff),
.keyborder = RGBA(0x000000ff),
.keyborder_select = RGBA(0x000000ff),
.vertex_size = 3,
@@ -728,7 +728,6 @@ const bTheme U_theme_default = {
.header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff),
.grid = RGBA(0x181818ff),
.time_scrub_background = RGBA(0x181818ff),
.vertex_size = 3,
.outline_width = 1,
.facedot_size = 4,