archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: Various theme fixes related to contrast

Browse Source 
* Animation channels (Fixes T92612)
* Curve widget (Fixes T92595)
* Pie menu (Fixes T92590)
* Radio and toggle buttons background
* Checkbox background
* Fix highlighted marker name on Dopesheet (text highlight on Dopesheet)


#### Master
{F11697667, size=full}

#### This Patch
{F11697669, size=full}
{F11697849, size=full}
{F11697833, size=full}
{F11697852, size=full}

Reviewed By: #user_interface, campbellbarton, Severin

Maniphest Tasks: T92595, T92612, T92590

Differential Revision: https://developer.blender.org/D13087

# Conflicts:
#	source/blender/blenkernel/BKE_blender_version.h
This commit is contained in:
Pablo Vazquez
2021-11-05 15:06:27 +01:00
parent b4af70563f
commit e65230f0c0
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x545454ff), .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0xffffff80), .item = RGBA(0x1d1d1d80),
.text = RGBA(0xd9d9d9ff), .text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff), .text_sel = RGBA(0xffffffff),
.roundness = 0.2f, .roundness = 0.2f,
@@ -43,7 +43,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x282828ff), .inner = RGBA(0x282828ff),
.inner_sel = RGBA(0x4772b3ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0xffffff80), .item = RGBA(0xffffffb3),
.text = RGBA(0xe6e6e6ff), .text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff), .text_sel = RGBA(0xffffffff),
.roundness = 0.2f, .roundness = 0.2f,
@@ -59,7 +59,7 @@ const bTheme U_theme_default = {
}, },
.wcol_radio = { .wcol_radio = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x282828ff), .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x252525ff), .item = RGBA(0x252525ff),
.text = RGBA(0xe6e6e6ff), .text = RGBA(0xe6e6e6ff),
@@ -68,8 +68,8 @@ const bTheme U_theme_default = {
}, },
.wcol_option = { .wcol_option = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x282828ff), .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x71aaffff), .inner_sel = RGBA(0x6699e6ff),
.item = RGBA(0x111111ff), .item = RGBA(0x111111ff),
.text = RGBA(0xe6e6e6ff), .text = RGBA(0xe6e6e6ff),
.text_sel = RGBA(0xffffffff), .text_sel = RGBA(0xffffffff),
@@ -77,7 +77,7 @@ const bTheme U_theme_default = {
}, },
.wcol_toggle = { .wcol_toggle = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x282828ff), .inner = RGBA(0x545454ff),
.inner_sel = RGBA(0x4772b3ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x252525ff), .item = RGBA(0x252525ff),
.text = RGBA(0xe6e6e6ff), .text = RGBA(0xe6e6e6ff),
@@ -148,11 +148,11 @@ const bTheme U_theme_default = {
.roundness = 0.2f, .roundness = 0.2f,
}, },
.wcol_tooltip = { .wcol_tooltip = {
.outline = RGBA(0x19191aff), .outline = RGBA(0x242424ff),
.inner = RGBA(0x181818ff), .inner = RGBA(0x1d1d1dff),
.inner_sel = RGBA(0x181818ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x181818ff), .item = RGBA(0xd9d9d9ff),
.text = RGBA(0xccccccff), .text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff), .text_sel = RGBA(0xffffffff),
.roundness = 0.2f, .roundness = 0.2f,
}, },
@@ -193,10 +193,10 @@ const bTheme U_theme_default = {
.roundness = 0.2f, .roundness = 0.2f,
}, },
.wcol_pie_menu = { .wcol_pie_menu = {
.outline = RGBA(0x3d3d3dff), .outline = RGBA(0x242424ff),
.inner = RGBA(0x181818ff), .inner = RGBA(0x181818ff),
.inner_sel = RGBA(0x5680c2ff), .inner_sel = RGBA(0x4772b3ff),
.item = RGBA(0x4772b3ff), .item = RGBA(0xd9d9d9ff),
.text = RGBA(0xd9d9d9ff), .text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff), .text_sel = RGBA(0xffffffff),
.roundness = 0.2f, .roundness = 0.2f,
@@ -414,7 +414,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x1d1d1dff), .list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff), .list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {
@@ -497,7 +497,7 @@ const bTheme U_theme_default = {
.back = RGBA(0x30303000), .back = RGBA(0x30303000),
.title = RGBA(0xeeeeeeff), .title = RGBA(0xeeeeeeff),
.text = RGBA(0xa6a6a6ff), .text = RGBA(0xa6a6a6ff),
.text_hi = RGBA(0x143e66ff), .text_hi = RGBA(0xffffffff),
.header = RGBA(0x303030b3), .header = RGBA(0x303030b3),
.header_text = RGBA(0xeeeeeeff), .header_text = RGBA(0xeeeeeeff),
.header_text_hi = RGBA(0xffffffff), .header_text_hi = RGBA(0xffffffff),
@@ -512,7 +512,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x1d1d1dff), .list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff), .list_title = RGBA(0xffffffff),
.list_text = RGBA(0xb8b8b8ff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {
@@ -573,8 +573,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff), .button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x1d1d1dff), .list = RGBA(0x1d1d1dff),
.list_title = RGBA(0xffffffff), .list_title = RGBA(0xffffffff),
.list_text = RGBA(0xe5e5e5ff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {
@@ -811,8 +811,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff), .button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x303030ff), .list = RGBA(0x303030ff),
.list_title = RGBA(0xffffffff), .list_title = RGBA(0xffffffff),
.list_text = RGBA(0xccccccff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {
@@ -935,7 +935,7 @@ const bTheme U_theme_default = {
.list = RGBA(0x303030ff), .list = RGBA(0x303030ff),
.list_title = RGBA(0xffffff00), .list_title = RGBA(0xffffff00),
.list_text = RGBA(0xb8b8b8ff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {
@@ -1046,8 +1046,8 @@ const bTheme U_theme_default = {
.button_text_hi = RGBA(0xffffffff), .button_text_hi = RGBA(0xffffffff),
.list = RGBA(0x303030ff), .list = RGBA(0x303030ff),
.list_title = RGBA(0xc3c3c3ff), .list_title = RGBA(0xc3c3c3ff),
.list_text = RGBA(0xc3c3c3ff), .list_text = RGBA(0xb8b8b8ff),
.list_text_hi = RGBA(0xffffffff), .list_text_hi = RGBA(0xffaf23ff),
.navigation_bar = RGBA(0x1d1d1dff), .navigation_bar = RGBA(0x1d1d1dff),
.execution_buts = RGBA(0x303030ff), .execution_buts = RGBA(0x303030ff),
.panelcolors = { .panelcolors = {

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 40 #define BLENDER_FILE_SUBVERSION 41
/* Minimum Blender version that supports reading file written with the current /* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file * version. Older Blender versions will test this and show a warning if the file

4
source/blender/blenloader/intern/versioning_userdef.c
View File

@@ -325,6 +325,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
memcpy(btheme, &U_theme_default, sizeof(*btheme)); memcpy(btheme, &U_theme_default, sizeof(*btheme));
} }
if (!USER_VERSION_ATLEAST(300, 41)) {
memcpy(btheme, &U_theme_default, sizeof(*btheme));
}
/** /**
* Versioning code until next subversion bump goes here. * Versioning code until next subversion bump goes here.
* *