adjust tags in accordance with theme design pass

This commit is contained in:
Ryan Fleury
2025-05-02 13:17:17 -07:00
parent adf2eabba7
commit dddc79e852
6 changed files with 8 additions and 9 deletions
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -382,7 +382,7 @@ RD_VocabTable:
theme_color,
```
@collection_commands(open_theme, add_theme_color, fork_loaded_theme, save_theme)
@row_commands(remove_cfg)
@row_commands(duplicate_cfg, remove_cfg)
x:
{
@display_name('Tags') tags: string,
@@ -1379,7 +1379,7 @@ RD_ThemePresetTable:
theme_color: {tags:"hover", value: 0xffffffff }
theme_color: {tags:"focus", value: 0xfda200ff }
theme_color: {tags:"cursor", value: 0x8aff00ff }
theme_color: {tags:"selection", value: 0x99ccffff }
theme_color: {tags:"selection", value: 0x99ccff0f }
theme_color: {tags:"inactive background", value: 0x0000002f }
theme_color: {tags:"drop_shadow", value: 0x0000007f }
theme_color: {tags:"good_pop background", value: 0x2c5b36ff }
+2 -2
View File
@@ -8589,7 +8589,7 @@ rd_window_frame(void)
U64 tab_task_count = 0;
F32 tab_close_width_px = ui_top_font_size()*2.5f;
F32 max_tab_width_px = ui_top_font_size()*20.f;
if(build_panel)
if(build_panel) UI_TagF("tab")
{
B32 reset = (ws->window_layout_reset || ws->frames_alive < 5 || is_changing_panel_boundaries);
for(RD_CfgNode *n = panel->tabs.first; n != 0; n = n->next)
@@ -8748,7 +8748,7 @@ rd_window_frame(void)
UI_PrefWidth(ui_px(tab_close_width_px, 1.f)) UI_TextAlignment(UI_TextAlign_Center)
RD_Font(RD_FontSlot_Icons)
UI_FontSize(ui_top_font_size()*0.75f)
UI_TagF(".") UI_TagF("weak") UI_TagF("implicit")
UI_TagF(".") UI_TagF("tab") UI_TagF("weak") UI_TagF("implicit")
UI_CornerRadius00(0)
UI_CornerRadius01(0)
{
-1
View File
@@ -3147,7 +3147,6 @@ RD_VIEW_UI_FUNCTION_DEF(memory)
{
cell_flags |= UI_BoxFlag_DrawBackground;
cell_bg_rgba = selection_color;
cell_bg_rgba.w *= 0.2f;
}
if(selection.min%num_columns == col_idx)
{
+1 -1
View File
@@ -2404,6 +2404,7 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
TxtRngColorPairNode *n = push_array(scratch.arena, TxtRngColorPairNode, 1);
n->rng = result.mouse_expr_rng;
n->color = ui_color_from_name(str8_lit("background"));
n->color.w *= 0.2f;
SLLQueuePush(first_txt_rng_color_pair, last_txt_rng_color_pair, n);
}
}
@@ -2591,7 +2592,6 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe
ceil_f32(line_box->rect.y1) + 1.f,
};
Vec4F32 color = n->color;
color.w = ClampTop(color.w, 0.1f);
if(!is_focused)
{
color.w *= 0.5f;
+1 -1
View File
@@ -136,7 +136,7 @@ internal UI_BOX_CUSTOM_DRAW(ui_line_edit_draw)
Vec4F32 cursor_color = ui_color_from_tags_key_name(box->tags_key, str8_lit("cursor"));
cursor_color.w *= box->parent->parent->focus_active_t;
Vec4F32 select_color = ui_color_from_tags_key_name(box->tags_key, str8_lit("selection"));
select_color.w *= 0.1f*(box->parent->parent->focus_active_t*0.2f + 0.8f);
select_color.w *= (box->parent->parent->focus_active_t*0.2f + 0.8f);
Vec2F32 text_position = ui_box_text_position(box);
String8 edited_string = draw_data->edited_string;
TxtPt cursor = draw_data->cursor;