improve readability of theme colors in theme menu; improve readability of inactive tab names

This commit is contained in:
Ryan Fleury
2024-01-11 16:02:17 -08:00
parent 7013797369
commit 1318aad83b
3 changed files with 8 additions and 7 deletions
-1
View File
@@ -5632,7 +5632,6 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
}
UI_TextColor(df_rgba_from_theme_color(view_is_selected ? DF_ThemeColor_PlainText : DF_ThemeColor_WeakText))
UI_PrefWidth(ui_pct(1, 0))
UI_FontSize(ui_top_font_size()*(view_is_selected ? 1.f : 0.75f))
ui_label(label);
UI_PrefWidth(ui_em(2.35f, 1.f)) UI_TextAlignment(UI_TextAlign_Center)
UI_Font(df_font_from_slot(DF_FontSlot_Icons))
+8 -2
View File
@@ -8818,8 +8818,10 @@ DF_VIEW_UI_FUNCTION_DEF(Theme)
"###color_%I64x", (U64)color);
UI_Parent(color_row)
{
Vec4F32 text_rgba = rgba;
text_rgba.w = ClampBot(text_rgba.w, 0.2f);
Vec4F32 bg_color = ui_top_background_color();
Vec4F32 default_text_color = ui_top_text_color();
F32 default_fallback_factor = clamp_1f32(r1f32(0.3f, 1), dot_4f32(normalize_4f32(rgba), normalize_4f32(bg_color))) - 0.3f;
Vec4F32 text_rgba = mix_4f32(rgba, default_text_color, default_fallback_factor);
UI_WidthFill UI_TextColor(text_rgba) ui_label(df_g_theme_color_display_string_table[color]);
ui_set_next_pref_width(ui_top_pref_height());
UI_HeightFill UI_Column UI_Padding(ui_em(0.3f, 1))
@@ -8847,6 +8849,10 @@ DF_VIEW_UI_FUNCTION_DEF(Theme)
DF_CmdParams p = df_cmd_params_from_panel(ws, panel);
df_push_cmd__root(&p, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_FocusPanel));
}
if(color_row_sig.hovering) UI_Tooltip
{
ui_label(df_g_theme_color_display_string_table[color]);
}
}
}
}
-4
View File
@@ -58,10 +58,6 @@
// find anything in the theme that would fill them with a solid, bright
// color. Instead they are just a thin outline and the same color as the
// scroll bar background.
// [x] It seems like the code is compiled as a console app for some reason, so
// when you run it, it locks up your console. I worked around this by
// making a bat file that does a "start" of it, but, it seems like this
// would not be what people would expect (at least on Windows?)
// [ ] Dragging a window tab (like Locals or Registers or whatnot) and
// canceling with ESC should revert the window tab to where it was.
// Currently, it leaves the window tab reordered if you dragged over its