From e45bdfd90d8a8f5ab72d6dd6eef55edc3b20ff28 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Tue, 18 Feb 2025 10:39:43 -0800 Subject: [PATCH] linearize theme from srgba on load, use linear colors everywhere; begin simplifying ui colors --- src/raddbg/generated/raddbg.meta.c | 186 +++++++++++----- src/raddbg/generated/raddbg.meta.h | 30 ++- src/raddbg/raddbg.mdesk | 82 +++---- src/raddbg/raddbg_core.c | 206 +++++++++++------- src/raddbg/raddbg_views.c | 11 +- src/raddbg/raddbg_widgets.c | 4 +- .../d3d11/generated/render_d3d11.meta.h | 8 +- src/render/d3d11/render_d3d11.mdesk | 8 +- src/ui/ui_core.h | 63 +++--- 9 files changed, 377 insertions(+), 221 deletions(-) diff --git a/src/raddbg/generated/raddbg.meta.c b/src/raddbg/generated/raddbg.meta.c index b8a7a024..c8f34e16 100644 --- a/src/raddbg/generated/raddbg.meta.c +++ b/src/raddbg/generated/raddbg.meta.c @@ -859,52 +859,60 @@ str8_lit_comp("negative_pop_button_background"), str8_lit_comp("neutral_pop_button_background"), }; -Vec4F32 rd_theme_preset_colors__default_dark[76] = +Vec4F32 rd_theme_preset_colors__default_dark[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0xe5e5e5ff), rgba_from_u32_lit_comp(0x4dc221ff), rgba_from_u32_lit_comp(0xc56452ff), rgba_from_u32_lit_comp(0x307eb2ff), -rgba_from_u32_lit_comp(0xa4a4a4fe), +rgba_from_u32_lit_comp(0xa4a4a4ff), rgba_from_u32_lit_comp(0x8aff00ff), rgba_from_u32_lit_comp(0xb23217ff), rgba_from_u32_lit_comp(0xfda200ff), rgba_from_u32_lit_comp(0xffffffff), -rgba_from_u32_lit_comp(0x0000007f), -rgba_from_u32_lit_comp(0x0000003f), -rgba_from_u32_lit_comp(0xffffff0c), -rgba_from_u32_lit_comp(0x0000002f), -rgba_from_u32_lit_comp(0x99ccff4c), -rgba_from_u32_lit_comp(0xffffff1e), -rgba_from_u32_lit_comp(0x5f12005f), -rgba_from_u32_lit_comp(0x1b1b1bfe), -rgba_from_u32_lit_comp(0x222222fe), -rgba_from_u32_lit_comp(0x3f3f3ffe), -rgba_from_u32_lit_comp(0x3e4c577f), -rgba_from_u32_lit_comp(0x3e4c577f), -rgba_from_u32_lit_comp(0xffffff19), -rgba_from_u32_lit_comp(0x33333333), -rgba_from_u32_lit_comp(0x33333333), -rgba_from_u32_lit_comp(0x3f3f3ffd), +rgba_from_u32_lit_comp(0x000000ff), +rgba_from_u32_lit_comp(0x000000ff), +rgba_from_u32_lit_comp(0xffffffff), +rgba_from_u32_lit_comp(0x000000ff), +rgba_from_u32_lit_comp(0x99ccffff), +rgba_from_u32_lit_comp(0xffffffff), +rgba_from_u32_lit_comp(0x5f1200ff), +rgba_from_u32_lit_comp(0x1b1b1bff), +rgba_from_u32_lit_comp(0x222222ff), +rgba_from_u32_lit_comp(0x404040ff), +rgba_from_u32_lit_comp(0x2b3740ff), +rgba_from_u32_lit_comp(0x2b3740ff), +rgba_from_u32_lit_comp(0x3e4c57ff), +rgba_from_u32_lit_comp(0x333333ff), +rgba_from_u32_lit_comp(0x333333ff), +rgba_from_u32_lit_comp(0x3f3f3fff), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0xffffffff), rgba_from_u32_lit_comp(0x00000000), -rgba_from_u32_lit_comp(0x1b1b1bfe), -rgba_from_u32_lit_comp(0x3f3f3ffe), +rgba_from_u32_lit_comp(0x1b1b1bff), +rgba_from_u32_lit_comp(0xffffffff), +rgba_from_u32_lit_comp(0x3f3f3fff), rgba_from_u32_lit_comp(0x2c5b36ff), -rgba_from_u32_lit_comp(0x3f3f3ffd), +rgba_from_u32_lit_comp(0xffc800ff), +rgba_from_u32_lit_comp(0x3f3f3fff), rgba_from_u32_lit_comp(0x803425ff), -rgba_from_u32_lit_comp(0x3f3f3ffd), +rgba_from_u32_lit_comp(0xe88774ff), +rgba_from_u32_lit_comp(0x3f3f3fff), rgba_from_u32_lit_comp(0x355b6eff), -rgba_from_u32_lit_comp(0x3f3f3ffd), -rgba_from_u32_lit_comp(0x2b2b2bfe), -rgba_from_u32_lit_comp(0x3f3f3ffe), -rgba_from_u32_lit_comp(0x6f5135fe), -rgba_from_u32_lit_comp(0xfefefe4d), -rgba_from_u32_lit_comp(0x3e4c577f), -rgba_from_u32_lit_comp(0xffffff19), +rgba_from_u32_lit_comp(0xffbb00ff), +rgba_from_u32_lit_comp(0x3f3f3fff), +rgba_from_u32_lit_comp(0x2b2b2bff), +rgba_from_u32_lit_comp(0xffffffff), +rgba_from_u32_lit_comp(0x3f3f3fff), +rgba_from_u32_lit_comp(0x6f5135ff), +rgba_from_u32_lit_comp(0xffa600ff), +rgba_from_u32_lit_comp(0x8a6e54ff), +rgba_from_u32_lit_comp(0x2b3740ff), +rgba_from_u32_lit_comp(0xffa600ff), +rgba_from_u32_lit_comp(0x3e4c57ff), rgba_from_u32_lit_comp(0xcbcbcbff), -rgba_from_u32_lit_comp(0x42a2cffe), +rgba_from_u32_lit_comp(0x42a2cfff), rgba_from_u32_lit_comp(0xfec746ff), rgba_from_u32_lit_comp(0x98bc80ff), rgba_from_u32_lit_comp(0xb7afd5ff), @@ -917,14 +925,14 @@ rgba_from_u32_lit_comp(0xd96759ff), rgba_from_u32_lit_comp(0x717171ff), rgba_from_u32_lit_comp(0x7f7f7fff), rgba_from_u32_lit_comp(0xbebebeff), -rgba_from_u32_lit_comp(0x99503d3f), -rgba_from_u32_lit_comp(0xfe82493f), -rgba_from_u32_lit_comp(0xffba173f), -rgba_from_u32_lit_comp(0xcefd693f), -rgba_from_u32_lit_comp(0x99503d3f), -rgba_from_u32_lit_comp(0xfe82493f), -rgba_from_u32_lit_comp(0xffba173f), -rgba_from_u32_lit_comp(0xcefd693f), +rgba_from_u32_lit_comp(0x99503dff), +rgba_from_u32_lit_comp(0xfe8249ff), +rgba_from_u32_lit_comp(0xffba17ff), +rgba_from_u32_lit_comp(0xcefd69ff), +rgba_from_u32_lit_comp(0x99503dff), +rgba_from_u32_lit_comp(0xfe8249ff), +rgba_from_u32_lit_comp(0xffba17ff), +rgba_from_u32_lit_comp(0xcefd69ff), rgba_from_u32_lit_comp(0xffcb7fff), rgba_from_u32_lit_comp(0xb2ff65ff), rgba_from_u32_lit_comp(0xff99e5ff), @@ -939,7 +947,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x355b6eff), }; -Vec4F32 rd_theme_preset_colors__default_light[76] = +Vec4F32 rd_theme_preset_colors__default_light[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x4c4c4cff), @@ -969,19 +977,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0xa4a4a4fe), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x65f534ff), +rgba_from_u32_lit_comp(0x65f534ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0xff694cff), +rgba_from_u32_lit_comp(0xff694cff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0xa6becaff), +rgba_from_u32_lit_comp(0xa6becaff), rgba_from_u32_lit_comp(0xa6a6a6fd), rgba_from_u32_lit_comp(0xa9a9a9fe), +rgba_from_u32_lit_comp(0xa9a9a9fe), rgba_from_u32_lit_comp(0xc0c0c0fe), rgba_from_u32_lit_comp(0xa98b6fff), +rgba_from_u32_lit_comp(0xa98b6fff), rgba_from_u32_lit_comp(0xffffff4d), rgba_from_u32_lit_comp(0x8282827f), +rgba_from_u32_lit_comp(0x8282827f), rgba_from_u32_lit_comp(0xffffff19), rgba_from_u32_lit_comp(0x4d4d4dff), rgba_from_u32_lit_comp(0x205670fe), @@ -1019,7 +1035,7 @@ rgba_from_u32_lit_comp(0xff2800ff), rgba_from_u32_lit_comp(0xa6becaff), }; -Vec4F32 rd_theme_preset_colors__vs_dark[76] = +Vec4F32 rd_theme_preset_colors__vs_dark[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0xe5e5e5ff), @@ -1049,19 +1065,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x2c5b36ff), +rgba_from_u32_lit_comp(0x2c5b36ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x803425ff), +rgba_from_u32_lit_comp(0x803425ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x355b6eff), +rgba_from_u32_lit_comp(0x355b6eff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x2b2b2bfe), +rgba_from_u32_lit_comp(0x2b2b2bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x0079ccff), +rgba_from_u32_lit_comp(0x0079ccff), rgba_from_u32_lit_comp(0xfefefe4d), rgba_from_u32_lit_comp(0xfefefe14), +rgba_from_u32_lit_comp(0xfefefe14), rgba_from_u32_lit_comp(0xffffff00), rgba_from_u32_lit_comp(0xcbcbcbff), rgba_from_u32_lit_comp(0xdcdcaaff), @@ -1099,7 +1123,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x355b6eff), }; -Vec4F32 rd_theme_preset_colors__vs_light[76] = +Vec4F32 rd_theme_preset_colors__vs_light[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x000000ff), @@ -1129,19 +1153,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0x84ce93ff), +rgba_from_u32_lit_comp(0x84ce93ff), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0xbd3e24ff), +rgba_from_u32_lit_comp(0xbd3e24ff), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0x6e9db5ff), +rgba_from_u32_lit_comp(0x6e9db5ff), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0xe8e8e8fe), +rgba_from_u32_lit_comp(0xe8e8e8fe), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0xfffffffe), +rgba_from_u32_lit_comp(0xfffffffe), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0xcdd4dc7f), +rgba_from_u32_lit_comp(0xcdd4dc7f), rgba_from_u32_lit_comp(0xb6b6b6ff), rgba_from_u32_lit_comp(0x000000ff), rgba_from_u32_lit_comp(0x000000ff), @@ -1179,7 +1211,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x6e9db5ff), }; -Vec4F32 rd_theme_preset_colors__solarized_dark[76] = +Vec4F32 rd_theme_preset_colors__solarized_dark[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x999999ff), @@ -1209,19 +1241,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0xfdfdfd3a), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0xfefefe3a), rgba_from_u32_lit_comp(0x2c5b36ff), +rgba_from_u32_lit_comp(0x2c5b36ff), rgba_from_u32_lit_comp(0xfefefe3a), rgba_from_u32_lit_comp(0x803425ff), +rgba_from_u32_lit_comp(0x803425ff), rgba_from_u32_lit_comp(0xfefefe3a), rgba_from_u32_lit_comp(0x355b6eff), +rgba_from_u32_lit_comp(0x355b6eff), rgba_from_u32_lit_comp(0xfefefe3a), rgba_from_u32_lit_comp(0x005e77fe), +rgba_from_u32_lit_comp(0x005e77fe), rgba_from_u32_lit_comp(0xfefefe3a), rgba_from_u32_lit_comp(0x005e77fe), +rgba_from_u32_lit_comp(0x005e77fe), rgba_from_u32_lit_comp(0xfefefe4d), rgba_from_u32_lit_comp(0x3e4c577f), +rgba_from_u32_lit_comp(0x3e4c577f), rgba_from_u32_lit_comp(0xffffff19), rgba_from_u32_lit_comp(0xcbcbcbff), rgba_from_u32_lit_comp(0xcb4a15ff), @@ -1259,7 +1299,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x355b6eff), }; -Vec4F32 rd_theme_preset_colors__solarized_light[76] = +Vec4F32 rd_theme_preset_colors__solarized_light[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x333333ff), @@ -1288,20 +1328,28 @@ rgba_from_u32_lit_comp(0xffffff7c), rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0xbdb9aa00), rgba_from_u32_lit_comp(0x1b1b1bfe), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xb6ddbeff), +rgba_from_u32_lit_comp(0xb6ddbeff), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xf8b0a1ff), +rgba_from_u32_lit_comp(0xf8b0a1ff), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xb2d3e3ff), +rgba_from_u32_lit_comp(0xb2d3e3ff), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xe3dbc7fe), +rgba_from_u32_lit_comp(0xe3dbc7fe), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xfdf6e3ff), +rgba_from_u32_lit_comp(0xfdf6e3ff), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0xd4cfc0fe), +rgba_from_u32_lit_comp(0xd4cfc0fe), rgba_from_u32_lit_comp(0xbebaabfe), rgba_from_u32_lit_comp(0x657b83ff), rgba_from_u32_lit_comp(0xcb4a15ff), @@ -1339,7 +1387,7 @@ rgba_from_u32_lit_comp(0xff684bff), rgba_from_u32_lit_comp(0xb2d3e3ff), }; -Vec4F32 rd_theme_preset_colors__handmade_hero[76] = +Vec4F32 rd_theme_preset_colors__handmade_hero[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0xa08462ff), @@ -1369,18 +1417,26 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0x423425fe), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x132e19ff), +rgba_from_u32_lit_comp(0x132e19ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x803425ff), +rgba_from_u32_lit_comp(0x803425ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x15445cff), +rgba_from_u32_lit_comp(0x15445cff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x1f1f27fe), -rgba_from_u32_lit_comp(0xfefefe4d), rgba_from_u32_lit_comp(0x1f1f27fe), rgba_from_u32_lit_comp(0xfefefe4d), +rgba_from_u32_lit_comp(0x1f1f27fe), +rgba_from_u32_lit_comp(0x1f1f27fe), +rgba_from_u32_lit_comp(0xfefefe4d), +rgba_from_u32_lit_comp(0x131315ee), rgba_from_u32_lit_comp(0x131315ee), rgba_from_u32_lit_comp(0xffffff19), rgba_from_u32_lit_comp(0xa08462ff), @@ -1419,7 +1475,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x15445cff), }; -Vec4F32 rd_theme_preset_colors__four_coder[76] = +Vec4F32 rd_theme_preset_colors__four_coder[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x90b080ff), @@ -1449,19 +1505,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x152f1bff), +rgba_from_u32_lit_comp(0x152f1bff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x43150cff), +rgba_from_u32_lit_comp(0x43150cff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x1b323eff), +rgba_from_u32_lit_comp(0x1b323eff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x212721fe), +rgba_from_u32_lit_comp(0x212721fe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x212721fe), +rgba_from_u32_lit_comp(0x212721fe), rgba_from_u32_lit_comp(0xfefefe4d), rgba_from_u32_lit_comp(0x3a3a3a7f), +rgba_from_u32_lit_comp(0x3a3a3a7f), rgba_from_u32_lit_comp(0x00000019), rgba_from_u32_lit_comp(0x90b080ff), rgba_from_u32_lit_comp(0x42a2cffe), @@ -1499,7 +1563,7 @@ rgba_from_u32_lit_comp(0xa72911ff), rgba_from_u32_lit_comp(0x1b323eff), }; -Vec4F32 rd_theme_preset_colors__far_manager[76] = +Vec4F32 rd_theme_preset_colors__far_manager[84] = { rgba_from_u32_lit_comp(0xff00ffff), rgba_from_u32_lit_comp(0x00fefeff), @@ -1529,19 +1593,27 @@ rgba_from_u32_lit_comp(0x33333333), rgba_from_u32_lit_comp(0x00ffff55), rgba_from_u32_lit_comp(0x00000000), rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x00000000), +rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x2c5b36ff), +rgba_from_u32_lit_comp(0x2c5b36ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x803425ff), +rgba_from_u32_lit_comp(0x803425ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x933100ff), +rgba_from_u32_lit_comp(0x933100ff), rgba_from_u32_lit_comp(0x3f3f3ffd), rgba_from_u32_lit_comp(0x007d7dff), +rgba_from_u32_lit_comp(0x007d7dff), rgba_from_u32_lit_comp(0x3f3f3ffe), rgba_from_u32_lit_comp(0x007d7dff), +rgba_from_u32_lit_comp(0x007d7dff), rgba_from_u32_lit_comp(0xfefefe4d), rgba_from_u32_lit_comp(0x3e4c577f), +rgba_from_u32_lit_comp(0x3e4c577f), rgba_from_u32_lit_comp(0xfefefe19), rgba_from_u32_lit_comp(0x00fefeff), rgba_from_u32_lit_comp(0x65b1ffff), @@ -1592,7 +1664,7 @@ rd_theme_preset_colors__four_coder, rd_theme_preset_colors__far_manager, }; -String8 rd_theme_color_display_string_table[76] = +String8 rd_theme_color_display_string_table[84] = { str8_lit_comp("Null"), str8_lit_comp("Text"), @@ -1621,20 +1693,28 @@ str8_lit_comp("Floating Background"), str8_lit_comp("Floating Background (Alternate)"), str8_lit_comp("Floating Border"), str8_lit_comp("Implicit Button Background"), +str8_lit_comp("Implicit Button Hover"), str8_lit_comp("Implicit Button Border"), str8_lit_comp("Plain Button Background"), +str8_lit_comp("Plain Button Hover"), str8_lit_comp("Plain Button Border"), str8_lit_comp("Positive Pop Button Background"), +str8_lit_comp("Positive Pop Button Hover"), str8_lit_comp("Positive Pop Button Border"), str8_lit_comp("Negative Pop Button Background"), +str8_lit_comp("Negative Pop Button Hover"), str8_lit_comp("Negative Pop Button Border"), str8_lit_comp("Neutral Pop Button Background"), +str8_lit_comp("Neutral Pop Button Hover"), str8_lit_comp("Neutral Pop Button Border"), str8_lit_comp("Scroll Bar Button Background"), +str8_lit_comp("Scroll Bar Button Hover"), str8_lit_comp("Scroll Bar Button Border"), str8_lit_comp("Tab Background"), +str8_lit_comp("Tab Hover"), str8_lit_comp("Tab Border"), str8_lit_comp("Tab Background (Inactive)"), +str8_lit_comp("Tab Hover (Inactive)"), str8_lit_comp("Tab Border (Inactive)"), str8_lit_comp("Code (Default)"), str8_lit_comp("Code (Symbol)"), @@ -1672,7 +1752,7 @@ str8_lit_comp("Breakpoint"), str8_lit_comp("Cache Line Boundary"), }; -String8 rd_theme_color_cfg_string_table[76] = +String8 rd_theme_color_cfg_string_table[84] = { str8_lit_comp("null"), str8_lit_comp("text"), @@ -1701,20 +1781,28 @@ str8_lit_comp("floating_background"), str8_lit_comp("floating_background_alt"), str8_lit_comp("floating_border"), str8_lit_comp("implicit_button_background"), +str8_lit_comp("implicit_button_hover"), str8_lit_comp("implicit_button_border"), str8_lit_comp("plain_button_background"), +str8_lit_comp("plain_button_hover"), str8_lit_comp("plain_button_border"), str8_lit_comp("positive_pop_button_background"), +str8_lit_comp("positive_pop_button_hover"), str8_lit_comp("positive_pop_button_border"), str8_lit_comp("negative_pop_button_background"), +str8_lit_comp("negative_pop_button_hover"), str8_lit_comp("negative_pop_button_border"), str8_lit_comp("neutral_pop_button_background"), +str8_lit_comp("neutral_pop_button_hover"), str8_lit_comp("neutral_pop_button_border"), str8_lit_comp("scroll_bar_button_background"), +str8_lit_comp("scroll_bar_button_hover"), str8_lit_comp("scroll_bar_button_border"), str8_lit_comp("tab_background"), +str8_lit_comp("tab_hover"), str8_lit_comp("tab_border"), str8_lit_comp("tab_background_inactive"), +str8_lit_comp("tab_hover_inactive"), str8_lit_comp("tab_border_inactive"), str8_lit_comp("code_default"), str8_lit_comp("code_symbol"), diff --git a/src/raddbg/generated/raddbg.meta.h b/src/raddbg/generated/raddbg.meta.h index 87712d4d..e079cef6 100644 --- a/src/raddbg/generated/raddbg.meta.h +++ b/src/raddbg/generated/raddbg.meta.h @@ -370,20 +370,28 @@ RD_ThemeColor_FloatingBackground, RD_ThemeColor_FloatingBackgroundAlt, RD_ThemeColor_FloatingBorder, RD_ThemeColor_ImplicitButtonBackground, +RD_ThemeColor_ImplicitButtonHover, RD_ThemeColor_ImplicitButtonBorder, RD_ThemeColor_PlainButtonBackground, +RD_ThemeColor_PlainButtonHover, RD_ThemeColor_PlainButtonBorder, RD_ThemeColor_PositivePopButtonBackground, +RD_ThemeColor_PositivePopButtonHover, RD_ThemeColor_PositivePopButtonBorder, RD_ThemeColor_NegativePopButtonBackground, +RD_ThemeColor_NegativePopButtonHover, RD_ThemeColor_NegativePopButtonBorder, RD_ThemeColor_NeutralPopButtonBackground, +RD_ThemeColor_NeutralPopButtonHover, RD_ThemeColor_NeutralPopButtonBorder, RD_ThemeColor_ScrollBarButtonBackground, +RD_ThemeColor_ScrollBarButtonHover, RD_ThemeColor_ScrollBarButtonBorder, RD_ThemeColor_TabBackground, +RD_ThemeColor_TabHover, RD_ThemeColor_TabBorder, RD_ThemeColor_TabBackgroundInactive, +RD_ThemeColor_TabHoverInactive, RD_ThemeColor_TabBorderInactive, RD_ThemeColor_CodeDefault, RD_ThemeColor_CodeSymbol, @@ -565,18 +573,18 @@ extern String8 rd_theme_preset_display_string_table[9]; extern String8 rd_theme_preset_code_string_table[9]; extern String8 rd_theme_color_version_remap_old_name_table[22]; extern String8 rd_theme_color_version_remap_new_name_table[22]; -extern Vec4F32 rd_theme_preset_colors__default_dark[76]; -extern Vec4F32 rd_theme_preset_colors__default_light[76]; -extern Vec4F32 rd_theme_preset_colors__vs_dark[76]; -extern Vec4F32 rd_theme_preset_colors__vs_light[76]; -extern Vec4F32 rd_theme_preset_colors__solarized_dark[76]; -extern Vec4F32 rd_theme_preset_colors__solarized_light[76]; -extern Vec4F32 rd_theme_preset_colors__handmade_hero[76]; -extern Vec4F32 rd_theme_preset_colors__four_coder[76]; -extern Vec4F32 rd_theme_preset_colors__far_manager[76]; +extern Vec4F32 rd_theme_preset_colors__default_dark[84]; +extern Vec4F32 rd_theme_preset_colors__default_light[84]; +extern Vec4F32 rd_theme_preset_colors__vs_dark[84]; +extern Vec4F32 rd_theme_preset_colors__vs_light[84]; +extern Vec4F32 rd_theme_preset_colors__solarized_dark[84]; +extern Vec4F32 rd_theme_preset_colors__solarized_light[84]; +extern Vec4F32 rd_theme_preset_colors__handmade_hero[84]; +extern Vec4F32 rd_theme_preset_colors__four_coder[84]; +extern Vec4F32 rd_theme_preset_colors__far_manager[84]; extern Vec4F32* rd_theme_preset_colors_table[9]; -extern String8 rd_theme_color_display_string_table[76]; -extern String8 rd_theme_color_cfg_string_table[76]; +extern String8 rd_theme_color_display_string_table[84]; +extern String8 rd_theme_color_cfg_string_table[84]; read_only global U8 rd_icon_font_bytes__data[] = { 0x00,0x01,0x00,0x00,0x00,0x0f,0x00,0x80,0x00,0x03,0x00,0x70,0x47,0x53,0x55,0x42,0x20,0x8b,0x25,0x7a,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x54,0x4f,0x53,0x2f,0x32,0x56,0x44,0x49,0xa0,0x00,0x00,0x01,0x50,0x00,0x00,0x00,0x60,0x63,0x6d,0x61,0x70,0x2a,0x09,0xe2,0xc2,0x00,0x00,0x01,0xb0,0x00,0x00,0x05,0xec,0x63,0x76,0x74,0x20, diff --git a/src/raddbg/raddbg.mdesk b/src/raddbg/raddbg.mdesk index af104bc6..a5395ca8 100644 --- a/src/raddbg/raddbg.mdesk +++ b/src/raddbg/raddbg.mdesk @@ -1003,55 +1003,63 @@ RD_ThemeColorTable: {TextPositive "Text (Positive)" text_positive 0x4dc221ff 0x4d9e2eff 0x4dc221ff 0x4dc221ff 0x4dc221ff 0x4dc221ff 0x4dc221ff 0x4dc221ff 0x4dc221ff ""} {TextNegative "Text (Negative)" text_negative 0xc56452ff 0xbd371eff 0xc56452ff 0xc46451ff 0xc56452ff 0xc56452ff 0xc56452ff 0xc56452ff 0xc56452ff ""} {TextNeutral "Text (Neutral)" text_neutral 0x307eb2ff 0x0064a7ff 0x307eb2ff 0x307eb2ff 0x307eb2ff 0x307eb2ff 0x307eb2ff 0x307eb2ff 0x307eb2ff ""} - {TextWeak "Text (Weak)" text_weak 0xa4a4a4fe 0x4c4c4cff 0xa4a4a4fe 0x0000007f 0x9999998a 0x818181ff 0x6e512eff 0x566e4bff 0x00a9a9ff ""} + {TextWeak "Text (Weak)" text_weak 0xa4a4a4ff 0x4c4c4cff 0xa4a4a4fe 0x0000007f 0x9999998a 0x818181ff 0x6e512eff 0x566e4bff 0x00a9a9ff ""} {Cursor "Cursor" cursor 0x8aff00ff 0x699830ff 0x8aff00ff 0x000000ff 0x8aff00ff 0x586e75ff 0x8aff00ff 0x8aff00ff 0x8aff00ff ""} {CursorInactive "Cursor (Inactive)" cursor_inactive 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff 0xb23217ff ""} {Focus "Focus" focus 0xfda200ff 0x9c5900ff 0xfda200ff 0x002affff 0xfda200ff 0x92743dff 0xfda200ff 0xfda200ff 0x00fefeff ""} {Hover "Hover" hover 0xffffffff 0xffffffff 0xffffffff 0x000000ff 0xffffffff 0x747474ff 0xffffffff 0xffffffff 0xffffffff ""} - {DropShadow "Drop Shadow" drop_shadow 0x0000007f 0x0000004c 0x0000007f 0xa3a3a37e 0x0000007f 0xc9bfa394 0x0000007f 0x0000007f 0x0000007f ""} - {DisabledOverlay "Disabled Overlay" disabled_overlay 0x0000003f 0xa6a6a63f 0x0000003f 0x0000003f 0x0000003f 0xe4dac090 0x0000003f 0x0000003f 0x0000003f ""} - {DropSiteOverlay "Drop Site Overlay" drop_site_overlay 0xffffff0c 0x4848480c 0xffffff0c 0x0000000c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c ""} - {InactivePanelOverlay "Inactive Panel Overlay" inactive_panel_overlay 0x0000002f 0xa4a4a43f 0x0000003f 0xfefefe53 0x0000003f 0x0000001c 0x0000003f 0x0000003f 0x0000003f ""} - {SelectionOverlay "Selection Overlay" selection_overlay 0x99ccff4c 0x003d7a48 0x99ccff4c 0x3d74ab4b 0x99ccff4c 0x678cb24c 0x99ccff4c 0x99ccff4c 0x99ccff4c ""} - {HighlightOverlay "Highlight Overlay" highlight_overlay 0xffffff1e 0xffffff1e 0xffffff1e 0x0000001e 0xffffff1e 0xffffff1e 0xffffff1e 0xffffff1e 0xffffff1e ""} - {HighlightOverlayError "Error Highlight Overlay" error_highlight_overlay 0x5f12005f 0xff30005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f ""} + {DropShadow "Drop Shadow" drop_shadow 0x000000ff 0x0000004c 0x0000007f 0xa3a3a37e 0x0000007f 0xc9bfa394 0x0000007f 0x0000007f 0x0000007f ""} + {DisabledOverlay "Disabled Overlay" disabled_overlay 0x000000ff 0xa6a6a63f 0x0000003f 0x0000003f 0x0000003f 0xe4dac090 0x0000003f 0x0000003f 0x0000003f ""} + {DropSiteOverlay "Drop Site Overlay" drop_site_overlay 0xffffffff 0x4848480c 0xffffff0c 0x0000000c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c ""} + {InactivePanelOverlay "Inactive Panel Overlay" inactive_panel_overlay 0x000000ff 0xa4a4a43f 0x0000003f 0xfefefe53 0x0000003f 0x0000001c 0x0000003f 0x0000003f 0x0000003f ""} + {SelectionOverlay "Selection Overlay" selection_overlay 0x99ccffff 0x003d7a48 0x99ccff4c 0x3d74ab4b 0x99ccff4c 0x678cb24c 0x99ccff4c 0x99ccff4c 0x99ccff4c ""} + {HighlightOverlay "Highlight Overlay" highlight_overlay 0xffffffff 0xffffff1e 0xffffff1e 0x0000001e 0xffffff1e 0xffffff1e 0xffffff1e 0xffffff1e 0xffffff1e ""} + {HighlightOverlayError "Error Highlight Overlay" error_highlight_overlay 0x5f1200ff 0xff30005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f 0x5f12005f ""} //- rjf: base ui container colors - {BaseBackground "Base Background" base_background 0x1b1b1bfe 0xccccccfe 0x1b1b1bfe 0xfefefefe 0x002a35fe 0xfcf5e2fe 0x0c0c0cfe 0x0c0c0cfe 0x000081fe ""} - {BaseBackgroundAlt "Base Background (Alternate)" base_background_alt 0x222222fe 0x2b2b2bfe 0x1b1b1bfe 0xe7e7e7fe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe ""} - {BaseBorder "Base Border" base_border 0x3f3f3ffe 0xa4a4a4fe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x423525fe 0x3f3f3ffe 0x0000fffe ""} + {BaseBackground "Base Background" base_background 0x1b1b1bff 0xccccccfe 0x1b1b1bfe 0xfefefefe 0x002a35fe 0xfcf5e2fe 0x0c0c0cfe 0x0c0c0cfe 0x000081fe ""} + {BaseBackgroundAlt "Base Background (Alternate)" base_background_alt 0x222222ff 0x2b2b2bfe 0x1b1b1bfe 0xe7e7e7fe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe 0x2b2b2bfe ""} + {BaseBorder "Base Border" base_border 0x404040ff 0xa4a4a4fe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x423525fe 0x3f3f3ffe 0x0000fffe ""} //- rjf: menu bar ui container colors - {MenuBarBackground "Menu Bar Background" menu_bar_background 0x3e4c577f 0xeaeaea7f 0x1b1b1bfd 0xffffff7f 0x00202bff 0xeee8d5ff 0x0c0c0cfe 0x0c0c0cfe 0x007d7dff ""} - {MenuBarBackgroundAlt "Menu Bar Background (Alternate)" menu_bar_background_alt 0x3e4c577f 0x3e4c577f 0x1b1b1bfd 0xffffff7f 0x3e4c577f 0x3e4c577f 0x3e4c577f 0x3e4c577f 0x007d7dff ""} - {MenuBarBorder "Menu Bar Border" menu_bar_border 0xffffff19 0xa4a4a4fe 0x3f3f3ffe 0xb6b6b6ff 0xffffff19 0xbebaabfe 0xffffff19 0xffffff19 0xfefefe00 ""} + {MenuBarBackground "Menu Bar Background" menu_bar_background 0x2b3740ff 0xeaeaea7f 0x1b1b1bfd 0xffffff7f 0x00202bff 0xeee8d5ff 0x0c0c0cfe 0x0c0c0cfe 0x007d7dff ""} + {MenuBarBackgroundAlt "Menu Bar Background (Alternate)" menu_bar_background_alt 0x2b3740ff 0x3e4c577f 0x1b1b1bfd 0xffffff7f 0x3e4c577f 0x3e4c577f 0x3e4c577f 0x3e4c577f 0x007d7dff ""} + {MenuBarBorder "Menu Bar Border" menu_bar_border 0x3e4c57ff 0xa4a4a4fe 0x3f3f3ffe 0xb6b6b6ff 0xffffff19 0xbebaabfe 0xffffff19 0xffffff19 0xfefefe00 ""} //- rjf: floating ui container colors - {FloatingBackground "Floating Background" floating_background 0x33333333 0xccccccc0 0x33333333 0xfefefec7 0x007fa14e 0xffffff7c 0x0c0c0c32 0x0c0c0c3e 0x007c7c55 ""} - {FloatingBackgroundAlt "Floating Background (Alternate)" floating_background_alt 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 ""} - {FloatingBorder "Floating Border" floating_border 0x3f3f3ffd 0xa4a4a4fe 0x3f3f3ffd 0xb6b6b6ff 0xfdfdfd3a 0xbebaabfe 0x423425fe 0x3f3f3ffd 0x00ffff55 ""} + {FloatingBackground "Floating Background" floating_background 0x333333ff 0xccccccc0 0x33333333 0xfefefec7 0x007fa14e 0xffffff7c 0x0c0c0c32 0x0c0c0c3e 0x007c7c55 ""} + {FloatingBackgroundAlt "Floating Background (Alternate)" floating_background_alt 0x333333ff 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 0x33333333 ""} + {FloatingBorder "Floating Border" floating_border 0x3f3f3fff 0xa4a4a4fe 0x3f3f3ffd 0xb6b6b6ff 0xfdfdfd3a 0xbebaabfe 0x423425fe 0x3f3f3ffd 0x00ffff55 ""} //- rjf: ui element colors {ImplicitButtonBackground "Implicit Button Background" implicit_button_background 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""} + {ImplicitButtonHover "Implicit Button Hover" implicit_button_hover 0xffffffff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""} {ImplicitButtonBorder "Implicit Button Border" implicit_button_border 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0xbdb9aa00 0x00000000 0x00000000 0x00000000 ""} - {PlainButtonBackground "Plain Button Background" plain_button_background 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe ""} - {PlainButtonBorder "Plain Button Border" plain_button_border 0x3f3f3ffe 0x3f3f3ffe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffe 0x3f3f3ffe 0x3f3f3ffe ""} + {PlainButtonBackground "Plain Button Background" plain_button_background 0x1b1b1bff 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe ""} + {PlainButtonHover "Plain Button Hover" plain_button_hover 0xffffffff 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe 0x1b1b1bfe ""} + {PlainButtonBorder "Plain Button Border" plain_button_border 0x3f3f3fff 0x3f3f3ffe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffe 0x3f3f3ffe 0x3f3f3ffe ""} {PositivePopButtonBackground "Positive Pop Button Background" positive_pop_button_background 0x2c5b36ff 0x65f534ff 0x2c5b36ff 0x84ce93ff 0x2c5b36ff 0xb6ddbeff 0x132e19ff 0x152f1bff 0x2c5b36ff ""} - {PositivePopButtonBorder "Positive Pop Button Border" positive_pop_button_border 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} + {PositivePopButtonHover "Positive Pop Button Hover" positive_pop_button_hover 0xffc800ff 0x65f534ff 0x2c5b36ff 0x84ce93ff 0x2c5b36ff 0xb6ddbeff 0x132e19ff 0x152f1bff 0x2c5b36ff ""} + {PositivePopButtonBorder "Positive Pop Button Border" positive_pop_button_border 0x3f3f3fff 0x3f3f3ffd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} {NegativePopButtonBackground "Negative Pop Button Background" negative_pop_button_background 0x803425ff 0xff694cff 0x803425ff 0xbd3e24ff 0x803425ff 0xf8b0a1ff 0x803425ff 0x43150cff 0x803425ff ""} - {NegativePopButtonBorder "Negative Pop Button Border" negative_pop_button_border 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} + {NegativePopButtonHover "Negative Pop Button Hover" negative_pop_button_hover 0xe88774ff 0xff694cff 0x803425ff 0xbd3e24ff 0x803425ff 0xf8b0a1ff 0x803425ff 0x43150cff 0x803425ff ""} + {NegativePopButtonBorder "Negative Pop Button Border" negative_pop_button_border 0x3f3f3fff 0x3f3f3ffd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} {NeutralPopButtonBackground "Neutral Pop Button Background" neutral_pop_button_background 0x355b6eff 0xa6becaff 0x355b6eff 0x6e9db5ff 0x355b6eff 0xb2d3e3ff 0x15445cff 0x1b323eff 0x933100ff ""} - {NeutralPopButtonBorder "Neutral Pop Button Border" neutral_pop_button_border 0x3f3f3ffd 0xa6a6a6fd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} - {ScrollBarButtonBackground "Scroll Bar Button Background" scroll_bar_button_background 0x2b2b2bfe 0xa9a9a9fe 0x2b2b2bfe 0xe8e8e8fe 0x005e77fe 0xe3dbc7fe 0x1f1f27fe 0x212721fe 0x007d7dff ""} - {ScrollBarButtonBorder "Scroll Bar Button Border" scroll_bar_button_border 0x3f3f3ffe 0xc0c0c0fe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0xfefefe4d 0x3f3f3ffe 0x3f3f3ffe ""} - {TabBackground "Tab Background" tab_background 0x6f5135fe 0xa98b6fff 0x0079ccff 0xfffffffe 0x005e77fe 0xfdf6e3ff 0x1f1f27fe 0x212721fe 0x007d7dff ""} - {TabBorder "Tab Border" tab_border 0xfefefe4d 0xffffff4d 0xfefefe4d 0xb6b6b6ff 0xfefefe4d 0xbebaabfe 0xfefefe4d 0xfefefe4d 0xfefefe4d ""} - {TabBackgroundInactive "Tab Background (Inactive)" tab_background_inactive 0x3e4c577f 0x8282827f 0xfefefe14 0xcdd4dc7f 0x3e4c577f 0xd4cfc0fe 0x131315ee 0x3a3a3a7f 0x3e4c577f ""} - {TabBorderInactive "Tab Border (Inactive)" tab_border_inactive 0xffffff19 0xffffff19 0xffffff00 0xb6b6b6ff 0xffffff19 0xbebaabfe 0xffffff19 0x00000019 0xfefefe19 ""} + {NeutralPopButtonHover "Neutral Pop Button Hover" neutral_pop_button_hover 0xffbb00ff 0xa6becaff 0x355b6eff 0x6e9db5ff 0x355b6eff 0xb2d3e3ff 0x15445cff 0x1b323eff 0x933100ff ""} + {NeutralPopButtonBorder "Neutral Pop Button Border" neutral_pop_button_border 0x3f3f3fff 0xa6a6a6fd 0x3f3f3ffd 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0x3f3f3ffd 0x3f3f3ffd 0x3f3f3ffd ""} + {ScrollBarButtonBackground "Scroll Bar Button Background" scroll_bar_button_background 0x2b2b2bff 0xa9a9a9fe 0x2b2b2bfe 0xe8e8e8fe 0x005e77fe 0xe3dbc7fe 0x1f1f27fe 0x212721fe 0x007d7dff ""} + {ScrollBarButtonHover "Scroll Bar Button Hover" scroll_bar_button_hover 0xffffffff 0xa9a9a9fe 0x2b2b2bfe 0xe8e8e8fe 0x005e77fe 0xe3dbc7fe 0x1f1f27fe 0x212721fe 0x007d7dff ""} + {ScrollBarButtonBorder "Scroll Bar Button Border" scroll_bar_button_border 0x3f3f3fff 0xc0c0c0fe 0x3f3f3ffe 0xb6b6b6ff 0xfefefe3a 0xbebaabfe 0xfefefe4d 0x3f3f3ffe 0x3f3f3ffe ""} + {TabBackground "Tab Background" tab_background 0x6f5135ff 0xa98b6fff 0x0079ccff 0xfffffffe 0x005e77fe 0xfdf6e3ff 0x1f1f27fe 0x212721fe 0x007d7dff ""} + {TabHover "Tab Hover" tab_hover 0xffa600ff 0xa98b6fff 0x0079ccff 0xfffffffe 0x005e77fe 0xfdf6e3ff 0x1f1f27fe 0x212721fe 0x007d7dff ""} + {TabBorder "Tab Border" tab_border 0x8a6e54ff 0xffffff4d 0xfefefe4d 0xb6b6b6ff 0xfefefe4d 0xbebaabfe 0xfefefe4d 0xfefefe4d 0xfefefe4d ""} + {TabBackgroundInactive "Tab Background (Inactive)" tab_background_inactive 0x2b3740ff 0x8282827f 0xfefefe14 0xcdd4dc7f 0x3e4c577f 0xd4cfc0fe 0x131315ee 0x3a3a3a7f 0x3e4c577f ""} + {TabHoverInactive "Tab Hover (Inactive)" tab_hover_inactive 0xffa600ff 0x8282827f 0xfefefe14 0xcdd4dc7f 0x3e4c577f 0xd4cfc0fe 0x131315ee 0x3a3a3a7f 0x3e4c577f ""} + {TabBorderInactive "Tab Border (Inactive)" tab_border_inactive 0x3e4c57ff 0xffffff19 0xffffff00 0xb6b6b6ff 0xffffff19 0xbebaabfe 0xffffff19 0x00000019 0xfefefe19 ""} //- rjf: code colors {CodeDefault "Code (Default)" code_default 0xcbcbcbff 0x4d4d4dff 0xcbcbcbff 0x000000ff 0xcbcbcbff 0x657b83ff 0xa08462ff 0x90b080ff 0x00fefeff ""} - {CodeSymbol "Code (Symbol)" code_symbol 0x42a2cffe 0x205670fe 0xdcdcaaff 0x000000ff 0xcb4a15ff 0xcb4a15ff 0xcc5634ff 0x42a2cffe 0x65b1ffff ""} + {CodeSymbol "Code (Symbol)" code_symbol 0x42a2cfff 0x205670fe 0xdcdcaaff 0x000000ff 0xcb4a15ff 0xcb4a15ff 0xcc5634ff 0x42a2cffe 0x65b1ffff ""} {CodeType "Code (Type)" code_type 0xfec746ff 0x996b00ff 0x4ec9afff 0xa33700ff 0xcb4a15ff 0xcb4a15ff 0xd8a51bff 0xfd7c52ff 0xfec746ff ""} {CodeLocal "Code (Local)" code_local 0x98bc80ff 0x446a2bff 0x9cdbfeff 0x007666ff 0x98bc80ff 0x258ad2ff 0xc04047ff 0x98bc80ff 0x00ff00ff ""} {CodeRegister "Code (Register)" code_register 0xb7afd5ff 0x4c35a1ff 0xb7afd5ff 0xb7afd5ff 0xb7afd5ff 0x373345ff 0xb7afd5ff 0xb7afd5ff 0xb7afd5ff ""} @@ -1066,14 +1074,14 @@ RD_ThemeColorTable: {CodeLineNumbersSelected "Code Line Numbers (Selected)" code_line_numbers_selected 0xbebebeff 0x000000ff 0x9ddaecff 0x123d4bfe 0xa2aaacff 0x111e22ef 0xc8b399ff 0xbebebeff 0x00fefeff ""} //- rjf: debugging colors - {LineInfoBackground0 "Line Info Background 0" line_info_background_0 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""} - {LineInfoBackground1 "Line Info Background 1" line_info_background_1 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""} - {LineInfoBackground2 "Line Info Background 2" line_info_background_2 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""} - {LineInfoBackground3 "Line Info Background 3" line_info_background_3 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f ""} - {LineInfoBackground4 "Line Info Background 4" line_info_background_4 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""} - {LineInfoBackground5 "Line Info Background 5" line_info_background_5 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""} - {LineInfoBackground6 "Line Info Background 6" line_info_background_6 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""} - {LineInfoBackground7 "Line Info Background 7" line_info_background_7 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f ""} + {LineInfoBackground0 "Line Info Background 0" line_info_background_0 0x99503dff 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""} + {LineInfoBackground1 "Line Info Background 1" line_info_background_1 0xfe8249ff 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""} + {LineInfoBackground2 "Line Info Background 2" line_info_background_2 0xffba17ff 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""} + {LineInfoBackground3 "Line Info Background 3" line_info_background_3 0xcefd69ff 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f ""} + {LineInfoBackground4 "Line Info Background 4" line_info_background_4 0x99503dff 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""} + {LineInfoBackground5 "Line Info Background 5" line_info_background_5 0xfe8249ff 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""} + {LineInfoBackground6 "Line Info Background 6" line_info_background_6 0xffba17ff 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""} + {LineInfoBackground7 "Line Info Background 7" line_info_background_7 0xcefd69ff 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f ""} {Thread0 "Thread 0" thread_0 0xffcb7fff 0x945800ff 0xffcb7fff 0x945800ff 0xffcb7fff 0x945800ff 0xffcb7fff 0xffcb7fff 0xffcb7fff ""} {Thread1 "Thread 1" thread_1 0xb2ff65ff 0x3f5b23ff 0xb2ff65ff 0x3f5b23ff 0xb2ff65ff 0x3f5b23ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff ""} {Thread2 "Thread 2" thread_2 0xff99e5ff 0x642a55ff 0xff99e5ff 0x642a55ff 0xff99e5ff 0x642a55ff 0xff99e5ff 0xff99e5ff 0xff99e5ff ""} diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c index dd81dbb0..0ff81e2e 100644 --- a/src/raddbg/raddbg_core.c +++ b/src/raddbg/raddbg_core.c @@ -4536,54 +4536,66 @@ rd_window_frame(void) ws->cfg_palettes[code].cursor = current->colors[RD_ThemeColor_Cursor]; ws->cfg_palettes[code].selection = current->colors[RD_ThemeColor_SelectionOverlay]; } - ws->cfg_palettes[RD_PaletteCode_Base].background = current->colors[RD_ThemeColor_BaseBackground]; - ws->cfg_palettes[RD_PaletteCode_Base].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_Base].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_Base].border = current->colors[RD_ThemeColor_BaseBorder]; - ws->cfg_palettes[RD_PaletteCode_MenuBar].background = current->colors[RD_ThemeColor_MenuBarBackground]; - ws->cfg_palettes[RD_PaletteCode_MenuBar].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_MenuBar].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_MenuBar].border = current->colors[RD_ThemeColor_MenuBarBorder]; - ws->cfg_palettes[RD_PaletteCode_Floating].background = current->colors[RD_ThemeColor_FloatingBackground]; - ws->cfg_palettes[RD_PaletteCode_Floating].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_Floating].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_Floating].border = current->colors[RD_ThemeColor_FloatingBorder]; - ws->cfg_palettes[RD_PaletteCode_ImplicitButton].background = current->colors[RD_ThemeColor_ImplicitButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_ImplicitButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_ImplicitButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_ImplicitButton].border = current->colors[RD_ThemeColor_ImplicitButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_PlainButton].background = current->colors[RD_ThemeColor_PlainButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_PlainButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_PlainButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_PlainButton].border = current->colors[RD_ThemeColor_PlainButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_PositivePopButton].background = current->colors[RD_ThemeColor_PositivePopButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_PositivePopButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_PositivePopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_PositivePopButton].border = current->colors[RD_ThemeColor_PositivePopButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_NegativePopButton].background = current->colors[RD_ThemeColor_NegativePopButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_NegativePopButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_NegativePopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_NegativePopButton].border = current->colors[RD_ThemeColor_NegativePopButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].background = current->colors[RD_ThemeColor_NeutralPopButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].border = current->colors[RD_ThemeColor_NeutralPopButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].background = current->colors[RD_ThemeColor_ScrollBarButtonBackground]; - ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].border = current->colors[RD_ThemeColor_ScrollBarButtonBorder]; - ws->cfg_palettes[RD_PaletteCode_Tab].background = current->colors[RD_ThemeColor_TabBackground]; - ws->cfg_palettes[RD_PaletteCode_Tab].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_Tab].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_Tab].border = current->colors[RD_ThemeColor_TabBorder]; - ws->cfg_palettes[RD_PaletteCode_TabInactive].background = current->colors[RD_ThemeColor_TabBackgroundInactive]; - ws->cfg_palettes[RD_PaletteCode_TabInactive].text = current->colors[RD_ThemeColor_Text]; - ws->cfg_palettes[RD_PaletteCode_TabInactive].text_weak = current->colors[RD_ThemeColor_TextWeak]; - ws->cfg_palettes[RD_PaletteCode_TabInactive].border = current->colors[RD_ThemeColor_TabBorderInactive]; - ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].background = current->colors[RD_ThemeColor_DropSiteOverlay]; - ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].text = current->colors[RD_ThemeColor_DropSiteOverlay]; - ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].text_weak = current->colors[RD_ThemeColor_DropSiteOverlay]; - ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].border = current->colors[RD_ThemeColor_BaseBorder]; + ws->cfg_palettes[RD_PaletteCode_Base].background = current->colors[RD_ThemeColor_BaseBackground]; + ws->cfg_palettes[RD_PaletteCode_Base].background_alt = current->colors[RD_ThemeColor_BaseBackgroundAlt]; + ws->cfg_palettes[RD_PaletteCode_Base].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_Base].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_Base].border = current->colors[RD_ThemeColor_BaseBorder]; + ws->cfg_palettes[RD_PaletteCode_MenuBar].background = current->colors[RD_ThemeColor_MenuBarBackground]; + ws->cfg_palettes[RD_PaletteCode_MenuBar].background_alt = current->colors[RD_ThemeColor_MenuBarBackgroundAlt]; + ws->cfg_palettes[RD_PaletteCode_MenuBar].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_MenuBar].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_MenuBar].border = current->colors[RD_ThemeColor_MenuBarBorder]; + ws->cfg_palettes[RD_PaletteCode_Floating].background = current->colors[RD_ThemeColor_FloatingBackground]; + ws->cfg_palettes[RD_PaletteCode_Floating].background_alt = current->colors[RD_ThemeColor_FloatingBackgroundAlt]; + ws->cfg_palettes[RD_PaletteCode_Floating].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_Floating].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_Floating].border = current->colors[RD_ThemeColor_FloatingBorder]; + ws->cfg_palettes[RD_PaletteCode_ImplicitButton].background = current->colors[RD_ThemeColor_ImplicitButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_ImplicitButton].background_alt = current->colors[RD_ThemeColor_ImplicitButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_ImplicitButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_ImplicitButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_ImplicitButton].border = current->colors[RD_ThemeColor_ImplicitButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_PlainButton].background = current->colors[RD_ThemeColor_PlainButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_PlainButton].background_alt = current->colors[RD_ThemeColor_PlainButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_PlainButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_PlainButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_PlainButton].border = current->colors[RD_ThemeColor_PlainButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_PositivePopButton].background = current->colors[RD_ThemeColor_PositivePopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_PositivePopButton].background_alt = current->colors[RD_ThemeColor_PositivePopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_PositivePopButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_PositivePopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_PositivePopButton].border = current->colors[RD_ThemeColor_PositivePopButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_NegativePopButton].background = current->colors[RD_ThemeColor_NegativePopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_NegativePopButton].background_alt = current->colors[RD_ThemeColor_NegativePopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_NegativePopButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_NegativePopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_NegativePopButton].border = current->colors[RD_ThemeColor_NegativePopButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].background = current->colors[RD_ThemeColor_NeutralPopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].background_alt = current->colors[RD_ThemeColor_NeutralPopButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_NeutralPopButton].border = current->colors[RD_ThemeColor_NeutralPopButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].background = current->colors[RD_ThemeColor_ScrollBarButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].background_alt = current->colors[RD_ThemeColor_ScrollBarButtonBackground]; + ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_ScrollBarButton].border = current->colors[RD_ThemeColor_ScrollBarButtonBorder]; + ws->cfg_palettes[RD_PaletteCode_Tab].background = current->colors[RD_ThemeColor_TabBackground]; + ws->cfg_palettes[RD_PaletteCode_Tab].background_alt = current->colors[RD_ThemeColor_TabBackground]; + ws->cfg_palettes[RD_PaletteCode_Tab].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_Tab].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_Tab].border = current->colors[RD_ThemeColor_TabBorder]; + ws->cfg_palettes[RD_PaletteCode_TabInactive].background = current->colors[RD_ThemeColor_TabBackgroundInactive]; + ws->cfg_palettes[RD_PaletteCode_TabInactive].background_alt = current->colors[RD_ThemeColor_TabBackgroundInactive]; + ws->cfg_palettes[RD_PaletteCode_TabInactive].text = current->colors[RD_ThemeColor_Text]; + ws->cfg_palettes[RD_PaletteCode_TabInactive].text_weak = current->colors[RD_ThemeColor_TextWeak]; + ws->cfg_palettes[RD_PaletteCode_TabInactive].border = current->colors[RD_ThemeColor_TabBorderInactive]; + ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].background = current->colors[RD_ThemeColor_DropSiteOverlay]; + ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].background_alt = current->colors[RD_ThemeColor_DropSiteOverlay]; + ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].text = current->colors[RD_ThemeColor_DropSiteOverlay]; + ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].text_weak = current->colors[RD_ThemeColor_DropSiteOverlay]; + ws->cfg_palettes[RD_PaletteCode_DropSiteOverlay].border = current->colors[RD_ThemeColor_BaseBorder]; if(rd_setting_b32_from_name(str8_lit("opaque_backgrounds"))) { for EachEnumVal(RD_PaletteCode, code) @@ -4594,6 +4606,12 @@ rd_window_frame(void) { ws->cfg_palettes[code].background.w = 1; } + if(ws->cfg_palettes[code].background_alt.x != 0 || + ws->cfg_palettes[code].background_alt.y != 0 || + ws->cfg_palettes[code].background_alt.z != 0) + { + ws->cfg_palettes[code].background_alt.w = 1; + } } } } @@ -7669,7 +7687,7 @@ rd_window_frame(void) panel_rect_pct.y0*content_rect_dim.y, panel_rect_pct.x1*content_rect_dim.x, panel_rect_pct.y1*content_rect_dim.y); - panel_rect = pad_2f32(panel_rect, -1.f); + panel_rect = pad_2f32(panel_rect, floor_f32(-ui_top_font_size()*0.15f)); F32 tab_bar_rheight = ui_top_font_size()*3.f; F32 tab_bar_vheight = ui_top_font_size()*2.6f; F32 tab_bar_rv_diff = tab_bar_rheight - tab_bar_vheight; @@ -7693,10 +7711,18 @@ rd_window_frame(void) content_rect.y0 += filter_bar_height*selected_tab_is_filtering_t; filter_rect.y1 = content_rect.y0; } + tab_bar_rect = intersect_2f32(tab_bar_rect, panel_rect); + content_rect = intersect_2f32(content_rect, panel_rect); + + ////////////////////////// + //- rjf: decide to skip this panel (e.g. if it is too small + // + B32 build_panel = (content_rect.x1 > content_rect.x0 && content_rect.y1 > content_rect.y0); ////////////////////////// //- rjf: build combined split+movetab drag/drop sites // + if(build_panel) { RD_Cfg *view = rd_cfg_from_id(rd_state->drag_drop_regs->view); if(rd_drag_is_active() && rd_state->drag_drop_regs_slot == RD_RegSlot_View && view != &rd_nil_cfg && contains_2f32(panel_rect, ui_mouse()) && ui_key_match(ui_drop_hot_key(), ui_key_zero())) @@ -7872,7 +7898,7 @@ rd_window_frame(void) //- rjf: build catch-all panel drop-site // UI_Key catchall_drop_site_key = ui_key_from_stringf(ui_key_zero(), "catchall_drop_site_%p", panel->cfg); - UI_Rect(panel_rect) + if(build_panel) UI_Rect(panel_rect) { UI_Box *catchall_drop_site = ui_build_box_from_key(UI_BoxFlag_DropSite, catchall_drop_site_key); ui_signal_from_box(catchall_drop_site); @@ -7941,9 +7967,11 @@ rd_window_frame(void) ////////////////////////// //- rjf: panel not selected? -> darken // - if(panel != panel_tree.focused) + if(build_panel) if(panel != panel_tree.focused) { - UI_Palette(ui_build_palette(0, .background = rd_rgba_from_theme_color(RD_ThemeColor_InactivePanelOverlay))) + Vec4F32 darken_color = rd_rgba_from_theme_color(RD_ThemeColor_InactivePanelOverlay); + darken_color.w *= 0.2f; + UI_Palette(ui_build_palette(0, .background = darken_color)) UI_Rect(content_rect) { ui_build_box_from_key(UI_BoxFlag_DrawBackground, ui_key_zero()); @@ -7954,7 +7982,7 @@ rd_window_frame(void) //- rjf: build panel container box // UI_Box *panel_box = &ui_nil_box; - UI_Rect(content_rect) UI_ChildLayoutAxis(Axis2_Y) UI_CornerRadius(0) UI_Focus(UI_FocusKind_On) + if(build_panel) UI_Rect(content_rect) UI_ChildLayoutAxis(Axis2_Y) UI_CornerRadius(0) UI_Focus(UI_FocusKind_On) { UI_Key panel_key = ui_key_from_stringf(ui_key_zero(), "panel_box_%p", panel->cfg); panel_box = ui_build_box_from_key(UI_BoxFlag_MouseClickable| @@ -7969,7 +7997,7 @@ rd_window_frame(void) //- rjf: loading animation for stable view // UI_Box *loading_overlay_container = &ui_nil_box; - UI_Parent(panel_box) UI_WidthFill UI_HeightFill + if(build_panel) UI_Parent(panel_box) UI_WidthFill UI_HeightFill { loading_overlay_container = ui_build_box_from_key(UI_BoxFlag_FloatingX|UI_BoxFlag_FloatingY, ui_key_zero()); } @@ -7977,7 +8005,8 @@ rd_window_frame(void) ////////////////////////// //- rjf: build selected tab view // - UI_Parent(panel_box) + if(build_panel) + UI_Parent(panel_box) UI_Focus(panel_is_focused ? UI_FocusKind_Null : UI_FocusKind_Off) UI_WidthFill { @@ -8039,6 +8068,7 @@ rd_window_frame(void) //////////////////////// //- rjf: loading? -> fill loading overlay container // + if(build_panel) { F32 selected_tab_loading_t = ui_anim(ui_key_from_stringf(ui_key_zero(), "###is_view_loading_%p", selected_tab), selected_tab_view_state->loading_t_target); if(selected_tab_loading_t > 0.01f) UI_Parent(loading_overlay_container) @@ -8084,20 +8114,23 @@ rd_window_frame(void) ////////////////////////// //- rjf: consume panel fallthrough interaction events // - UI_Signal panel_sig = ui_signal_from_box(panel_box); - if(ui_pressed(panel_sig)) + if(build_panel) { - rd_cmd(RD_CmdKind_FocusPanel, .panel = panel->cfg->id); - } - if(ui_right_clicked(panel_sig)) - { - rd_cmd(RD_CmdKind_PushQuery, - .view = panel->selected_tab->id, - .file_path = rd_file_path_from_eval_string(rd_frame_arena(), rd_expr_from_cfg(panel->selected_tab)), - .ui_key = panel_box->key, - .off_px = sub_2f32(ui_mouse(), panel_box->rect.p0), - .reg_slot = RD_RegSlot_View, - .lister_flags = RD_ListerFlag_LineEdit|RD_ListerFlag_Commands|RD_ListerFlag_Settings); + UI_Signal panel_sig = ui_signal_from_box(panel_box); + if(ui_pressed(panel_sig)) + { + rd_cmd(RD_CmdKind_FocusPanel, .panel = panel->cfg->id); + } + if(ui_right_clicked(panel_sig)) + { + rd_cmd(RD_CmdKind_PushQuery, + .view = panel->selected_tab->id, + .file_path = rd_file_path_from_eval_string(rd_frame_arena(), rd_expr_from_cfg(panel->selected_tab)), + .ui_key = panel_box->key, + .off_px = sub_2f32(ui_mouse(), panel_box->rect.p0), + .reg_slot = RD_RegSlot_View, + .lister_flags = RD_ListerFlag_LineEdit|RD_ListerFlag_Commands|RD_ListerFlag_Settings); + } } ////////////////////////// @@ -8115,6 +8148,7 @@ rd_window_frame(void) TabTask *last_tab_task = 0; U64 tab_task_count = 0; F32 tab_close_width_px = ui_top_font_size()*2.5f; + if(build_panel) { for(RD_CfgNode *n = panel->tabs.first; n != 0; n = n->next) { @@ -8136,7 +8170,7 @@ rd_window_frame(void) //- rjf: build tab bar container // UI_Box *tab_bar_box = &ui_nil_box; - UI_CornerRadius(0) UI_Rect(tab_bar_rect) + if(build_panel) UI_CornerRadius(0) UI_Rect(tab_bar_rect) { tab_bar_box = ui_build_box_from_stringf(UI_BoxFlag_Clip| UI_BoxFlag_AllowOverflowY| @@ -8159,6 +8193,7 @@ rd_window_frame(void) // B32 tab_drop_is_active = rd_drag_is_active() && ui_key_match(ui_drop_hot_key(), catchall_drop_site_key); RD_Cfg *tab_drop_prev = &rd_nil_cfg; + if(build_panel) { F32 best_prev_distance_px = 1000000.f; TabTask start_boundary_tab_task = {first_tab_task, &rd_nil_cfg}; @@ -8199,7 +8234,7 @@ rd_window_frame(void) ////////////////////////// //- rjf: build tab bar contents // - UI_Focus(UI_FocusKind_Off) UI_Parent(tab_bar_box) UI_Padding(ui_em(0.5f, 1.f)) UI_PrefHeight(ui_pct(1, 0)) + if(build_panel) UI_Focus(UI_FocusKind_Off) UI_Parent(tab_bar_box) UI_Padding(ui_em(0.5f, 1.f)) UI_PrefHeight(ui_pct(1, 0)) { F32 corner_radius = ui_top_font_size()*0.6f; TabTask start_boundary_tab_task = {first_tab_task, &rd_nil_cfg}; @@ -8691,7 +8726,7 @@ rd_window_frame(void) // rjf: main rectangle { - R_Rect2DInst *inst = dr_rect(pad_2f32(box->rect, 1.f), box->palette->colors[UI_ColorCode_Background], 0, 0, 1.f); + R_Rect2DInst *inst = dr_rect(pad_2f32(box->rect, 1.f), box->flags & UI_BoxFlag_DrawBackgroundAlt ? box->palette->colors[UI_ColorCode_BackgroundAlt] : box->palette->colors[UI_ColorCode_Background], 0, 0, 1.f); MemoryCopyArray(inst->corner_radii, box->corner_radii); } @@ -8702,7 +8737,7 @@ rd_window_frame(void) { R_Rect2DInst *inst = dr_rect(pad_2f32(box->rect, 1.f), v4f32(0, 0, 0, 0), 0, 0, 1.f); Vec4F32 color = rd_rgba_from_theme_color(RD_ThemeColor_Hover); - color.w *= t*0.2f; + color.w *= t*0.1f; inst->colors[Corner_00] = color; inst->colors[Corner_10] = color; MemoryCopyArray(inst->corner_radii, box->corner_radii); @@ -8714,7 +8749,7 @@ rd_window_frame(void) Vec2F32 center = ui_mouse(); F32 radius = box->font_size*12.f; Vec4F32 color = rd_rgba_from_theme_color(RD_ThemeColor_Hover); - color.w *= 0.1f*t; + color.w *= 0.05f*t; dr_rect(pad_2f32(r2f32(center, center), radius), color, radius, 0, radius/3.f); } @@ -8759,7 +8794,7 @@ rd_window_frame(void) { R_Rect2DInst *inst = dr_rect(r2f32p(box->rect.x0, box->rect.y1 - shadow_size.y, box->rect.x1, box->rect.y1), v4f32(0, 0, 0, 0), 0, 0, 1.f); inst->colors[Corner_00] = inst->colors[Corner_10] = v4f32(0, 0, 0, 0); - inst->colors[Corner_01] = inst->colors[Corner_11] = v4f32(0.4f, 0.4f, 0.4f, 0.4f*box->active_t); + inst->colors[Corner_01] = inst->colors[Corner_11] = v4f32(1.0f, 1.0f, 1.0f, 0.08f*box->active_t); MemoryCopyArray(inst->corner_radii, box->corner_radii); } @@ -8901,7 +8936,7 @@ rd_window_frame(void) // rjf: draw overlay if(b->flags & UI_BoxFlag_DrawOverlay) { - R_Rect2DInst *inst = dr_rect(b->rect, b->palette->colors[UI_ColorCode_Overlay], 0, 0, 1.f); + R_Rect2DInst *inst = dr_rect(b->rect, b->palette->colors[UI_ColorCode_Background], 0, 0, 1.f); MemoryCopyArray(inst->corner_radii, b->corner_radii); } @@ -8958,7 +8993,7 @@ rd_window_frame(void) if(b->flags & UI_BoxFlag_Clickable && !(b->flags & UI_BoxFlag_DisableFocusOverlay) && b->focus_hot_t > 0.01f) { Vec4F32 color = rd_rgba_from_theme_color(RD_ThemeColor_Focus); - color.w *= 0.2f*b->focus_hot_t; + color.w *= 0.09f*b->focus_hot_t; R_Rect2DInst *inst = dr_rect(b->rect, color, 0, 0, 0.f); MemoryCopyArray(inst->corner_radii, b->corner_radii); } @@ -8982,7 +9017,7 @@ rd_window_frame(void) if(b->disabled_t >= 0.005f) { Vec4F32 color = rd_rgba_from_theme_color(RD_ThemeColor_DisabledOverlay); - color.w *= b->disabled_t; + color.w *= b->disabled_t*0.5f; R_Rect2DInst *inst = dr_rect(b->rect, color, 0, 0, 1); MemoryCopyArray(inst->corner_radii, b->corner_radii); } @@ -11909,15 +11944,14 @@ rd_frame(void) // ProfScope("build theme from config") { - rd_state->theme_target = push_array(rd_frame_arena(), RD_Theme, 1); - RD_Theme *theme = rd_state->theme_target; + RD_Theme *theme_srgba = push_array(scratch.arena, RD_Theme, 1); //- rjf: gather globally-applying config options RD_CfgList preset_roots = rd_cfg_top_level_list_from_string(scratch.arena, str8_lit("color_preset")); RD_CfgList colors_roots = rd_cfg_top_level_list_from_string(scratch.arena, str8_lit("colors")); //- rjf: assume default-dark - MemoryCopy(theme->colors, rd_theme_preset_colors_table[RD_ThemePreset_DefaultDark], sizeof(rd_theme_preset_colors__default_dark)); + MemoryCopy(theme_srgba->colors, rd_theme_preset_colors_table[RD_ThemePreset_DefaultDark], sizeof(rd_theme_preset_colors__default_dark)); //- rjf: apply explicitly-specified presets for(RD_CfgNode *n = preset_roots.first; n != 0; n = n->next) @@ -11937,7 +11971,7 @@ rd_frame(void) } if(found_preset_kind) { - MemoryCopy(theme->colors, rd_theme_preset_colors_table[preset_kind], sizeof(rd_theme_preset_colors__default_dark)); + MemoryCopy(theme_srgba->colors, rd_theme_preset_colors_table[preset_kind], sizeof(rd_theme_preset_colors__default_dark)); } } @@ -11963,11 +11997,19 @@ rd_frame(void) if(try_u64_from_str8_c_rules(color->first->string, &color_val)) { Vec4F32 color_rgba = rgba_from_u32((U32)color_val); - theme->colors[color_code] = color_rgba; + theme_srgba->colors[color_code] = color_rgba; } } } } + + //- rjf: srgba -> linear, compute final theme + rd_state->theme_target = push_array(rd_frame_arena(), RD_Theme, 1); + RD_Theme *theme = rd_state->theme_target; + for EachEnumVal(RD_ThemeColor, c) + { + theme->colors[c] = linear_from_srgba(theme_srgba->colors[c]); + } } ////////////////////////////// diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c index 7598f487..4fd2f042 100644 --- a/src/raddbg/raddbg_views.c +++ b/src/raddbg/raddbg_views.c @@ -2759,8 +2759,7 @@ RD_VIEW_UI_FUNCTION_DEF(watch) } else if(global_row_idx & 1) { - palette = ui_build_palette(ui_top_palette(), .background = rd_rgba_from_theme_color(RD_ThemeColor_BaseBackgroundAlt)); - row_flags |= UI_BoxFlag_DrawBackground; + row_flags |= UI_BoxFlag_DrawBackground|UI_BoxFlag_DrawBackgroundAlt; } if(!row_matches_last_row_topology) { @@ -2870,8 +2869,8 @@ RD_VIEW_UI_FUNCTION_DEF(watch) rgba.w *= 0.2f; } rgba.w *= ui_anim(ui_key_from_stringf(ui_key_zero(), "###cfg_hover_t_%p", cfg), 1.f, .rate = entity_hover_t_rate); - palette = ui_build_palette(ui_top_palette(), .overlay = rgba); - cell_flags |= UI_BoxFlag_DrawOverlay; + palette = ui_build_palette(ui_top_palette(), .background_pop = rgba); + cell_flags |= UI_BoxFlag_DrawBackground; } else if(ctrl_handle_match(cell_info.entity->handle, rd_get_hover_regs()->ctrl_entity) && rd_state->hover_regs_slot == RD_RegSlot_CtrlEntity) @@ -2887,8 +2886,8 @@ RD_VIEW_UI_FUNCTION_DEF(watch) rgba.w *= 0.2f; } rgba.w *= ui_anim(ui_key_from_stringf(ui_key_zero(), "###entity_hover_t_%p", entity), 1.f, .rate = entity_hover_t_rate); - palette = ui_build_palette(ui_top_palette(), .overlay = rgba); - cell_flags |= UI_BoxFlag_DrawOverlay; + palette = ui_build_palette(ui_top_palette(), .background_pop = rgba); + cell_flags |= UI_BoxFlag_DrawBackground; } } ProfEnd(); diff --git a/src/raddbg/raddbg_widgets.c b/src/raddbg/raddbg_widgets.c index 8aea3796..2fd73467 100644 --- a/src/raddbg/raddbg_widgets.c +++ b/src/raddbg/raddbg_widgets.c @@ -467,7 +467,7 @@ internal UI_BOX_CUSTOM_DRAW(rd_thread_box_draw_extensions) if(u->hover_t > 0.001f) { Vec4F32 weak_thread_color = u->thread_color; - weak_thread_color.w *= 0.5f*u->hover_t; + weak_thread_color.w *= 0.15f*u->hover_t; R_Rect2DInst *inst = dr_rect(r2f32p(box->rect.x0, box->parent->rect.y0, box->rect.x0 + ui_top_font_size()*22.f*u->hover_t, @@ -481,7 +481,7 @@ internal UI_BOX_CUSTOM_DRAW(rd_thread_box_draw_extensions) if(u->is_selected && u->do_glow) { Vec4F32 weak_thread_color = u->thread_color; - weak_thread_color.w *= 0.3f; + weak_thread_color.w *= 0.1f; R_Rect2DInst *inst = dr_rect(r2f32p(box->rect.x0, box->parent->rect.y0, box->rect.x0 + ui_top_font_size()*22.f*u->alive_t, diff --git a/src/render/d3d11/generated/render_d3d11.meta.h b/src/render/d3d11/generated/render_d3d11.meta.h index 370fe2ea..5f5e1f12 100644 --- a/src/render/d3d11/generated/render_d3d11.meta.h +++ b/src/render/d3d11/generated/render_d3d11.meta.h @@ -138,10 +138,10 @@ str8_lit_comp( " };\n" " float4 src_color[] =\n" " {\n" -" linear_from_srgba(cpu2vertex.color01),\n" -" linear_from_srgba(cpu2vertex.color00),\n" -" linear_from_srgba(cpu2vertex.color11),\n" -" linear_from_srgba(cpu2vertex.color10),\n" +" cpu2vertex.color01,\n" +" cpu2vertex.color00,\n" +" cpu2vertex.color11,\n" +" cpu2vertex.color10,\n" " };\n" " float2 dst_verts_pct = float2((cpu2vertex.vertex_id >> 1) ? 1.f : 0.f,\n" " (cpu2vertex.vertex_id & 1) ? 0.f : 1.f);\n" diff --git a/src/render/d3d11/render_d3d11.mdesk b/src/render/d3d11/render_d3d11.mdesk index 4e8796f6..1c78b56b 100644 --- a/src/render/d3d11/render_d3d11.mdesk +++ b/src/render/d3d11/render_d3d11.mdesk @@ -136,10 +136,10 @@ vs_main(CPU2Vertex cpu2vertex) }; float4 src_color[] = { - linear_from_srgba(cpu2vertex.color01), - linear_from_srgba(cpu2vertex.color00), - linear_from_srgba(cpu2vertex.color11), - linear_from_srgba(cpu2vertex.color10), + cpu2vertex.color01, + cpu2vertex.color00, + cpu2vertex.color11, + cpu2vertex.color10, }; float2 dst_verts_pct = float2((cpu2vertex.vertex_id >> 1) ? 1.f : 0.f, (cpu2vertex.vertex_id & 1) ? 0.f : 1.f); diff --git a/src/ui/ui_core.h b/src/ui/ui_core.h index 69ab988f..baac0660 100644 --- a/src/ui/ui_core.h +++ b/src/ui/ui_core.h @@ -223,10 +223,15 @@ typedef enum UI_ColorCode { UI_ColorCode_Null, UI_ColorCode_Background, + UI_ColorCode_BackgroundAlt, + UI_ColorCode_BackgroundGood, + UI_ColorCode_BackgroundBad, + UI_ColorCode_BackgroundPop, + UI_ColorCode_Border, UI_ColorCode_Text, UI_ColorCode_TextWeak, - UI_ColorCode_Border, - UI_ColorCode_Overlay, + UI_ColorCode_Hover, + UI_ColorCode_Focus, UI_ColorCode_Cursor, UI_ColorCode_Selection, UI_ColorCode_COUNT @@ -243,10 +248,15 @@ struct UI_Palette { Vec4F32 null; Vec4F32 background; + Vec4F32 background_alt; + Vec4F32 background_good; + Vec4F32 background_bad; + Vec4F32 background_pop; + Vec4F32 border; Vec4F32 text; Vec4F32 text_weak; - Vec4F32 border; - Vec4F32 overlay; + Vec4F32 hover; + Vec4F32 focus; Vec4F32 cursor; Vec4F32 selection; }; @@ -356,28 +366,29 @@ typedef U64 UI_BoxFlags; # define UI_BoxFlag_DrawDropShadow (UI_BoxFlags)(1ull<<27) # define UI_BoxFlag_DrawBackgroundBlur (UI_BoxFlags)(1ull<<28) # define UI_BoxFlag_DrawBackground (UI_BoxFlags)(1ull<<29) -# define UI_BoxFlag_DrawBorder (UI_BoxFlags)(1ull<<30) -# define UI_BoxFlag_DrawSideTop (UI_BoxFlags)(1ull<<31) -# define UI_BoxFlag_DrawSideBottom (UI_BoxFlags)(1ull<<32) -# define UI_BoxFlag_DrawSideLeft (UI_BoxFlags)(1ull<<33) -# define UI_BoxFlag_DrawSideRight (UI_BoxFlags)(1ull<<34) -# define UI_BoxFlag_DrawText (UI_BoxFlags)(1ull<<35) -# define UI_BoxFlag_DrawTextFastpathCodepoint (UI_BoxFlags)(1ull<<36) -# define UI_BoxFlag_DrawTextWeak (UI_BoxFlags)(1ull<<37) -# define UI_BoxFlag_DrawHotEffects (UI_BoxFlags)(1ull<<38) -# define UI_BoxFlag_DrawActiveEffects (UI_BoxFlags)(1ull<<39) -# define UI_BoxFlag_DrawOverlay (UI_BoxFlags)(1ull<<40) -# define UI_BoxFlag_DrawBucket (UI_BoxFlags)(1ull<<41) -# define UI_BoxFlag_Clip (UI_BoxFlags)(1ull<<42) -# define UI_BoxFlag_AnimatePosX (UI_BoxFlags)(1ull<<43) -# define UI_BoxFlag_AnimatePosY (UI_BoxFlags)(1ull<<44) -# define UI_BoxFlag_DisableTextTrunc (UI_BoxFlags)(1ull<<45) -# define UI_BoxFlag_DisableIDString (UI_BoxFlags)(1ull<<46) -# define UI_BoxFlag_DisableFocusBorder (UI_BoxFlags)(1ull<<47) -# define UI_BoxFlag_DisableFocusOverlay (UI_BoxFlags)(1ull<<48) -# define UI_BoxFlag_HasDisplayString (UI_BoxFlags)(1ull<<49) -# define UI_BoxFlag_HasFuzzyMatchRanges (UI_BoxFlags)(1ull<<50) -# define UI_BoxFlag_RoundChildrenByParent (UI_BoxFlags)(1ull<<51) +# define UI_BoxFlag_DrawBackgroundAlt (UI_BoxFlags)(1ull<<30) +# define UI_BoxFlag_DrawBorder (UI_BoxFlags)(1ull<<31) +# define UI_BoxFlag_DrawSideTop (UI_BoxFlags)(1ull<<32) +# define UI_BoxFlag_DrawSideBottom (UI_BoxFlags)(1ull<<33) +# define UI_BoxFlag_DrawSideLeft (UI_BoxFlags)(1ull<<34) +# define UI_BoxFlag_DrawSideRight (UI_BoxFlags)(1ull<<35) +# define UI_BoxFlag_DrawText (UI_BoxFlags)(1ull<<36) +# define UI_BoxFlag_DrawTextFastpathCodepoint (UI_BoxFlags)(1ull<<37) +# define UI_BoxFlag_DrawTextWeak (UI_BoxFlags)(1ull<<38) +# define UI_BoxFlag_DrawHotEffects (UI_BoxFlags)(1ull<<39) +# define UI_BoxFlag_DrawActiveEffects (UI_BoxFlags)(1ull<<40) +# define UI_BoxFlag_DrawOverlay (UI_BoxFlags)(1ull<<41) +# define UI_BoxFlag_DrawBucket (UI_BoxFlags)(1ull<<42) +# define UI_BoxFlag_Clip (UI_BoxFlags)(1ull<<43) +# define UI_BoxFlag_AnimatePosX (UI_BoxFlags)(1ull<<44) +# define UI_BoxFlag_AnimatePosY (UI_BoxFlags)(1ull<<45) +# define UI_BoxFlag_DisableTextTrunc (UI_BoxFlags)(1ull<<46) +# define UI_BoxFlag_DisableIDString (UI_BoxFlags)(1ull<<47) +# define UI_BoxFlag_DisableFocusBorder (UI_BoxFlags)(1ull<<48) +# define UI_BoxFlag_DisableFocusOverlay (UI_BoxFlags)(1ull<<49) +# define UI_BoxFlag_HasDisplayString (UI_BoxFlags)(1ull<<50) +# define UI_BoxFlag_HasFuzzyMatchRanges (UI_BoxFlags)(1ull<<51) +# define UI_BoxFlag_RoundChildrenByParent (UI_BoxFlags)(1ull<<52) //- rjf: bundles # define UI_BoxFlag_Clickable (UI_BoxFlag_MouseClickable|UI_BoxFlag_KeyboardClickable)