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

Fix #124549: can't customize overlay text color

Browse Source 
Improvements to how text colors and shadows are determined for the
3D View overlays. Starting with the theme's text highlight color, it
is lightened or darkened if necessary to give contrast with the
background. Then a black or white shadow is used depending on text
color.

Pull Request: https://projects.blender.org/blender/blender/pulls/127389
This commit is contained in:
Aras Pranckevicius
2024-09-12 04:24:53 +02:00
committed by Harley Acheson
parent 1bf1ad8e52
commit c41bb20008
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/editors/space_view3d/view3d_utils.cc
View File

@@ -84,18 +84,30 @@ void ED_view3d_text_colors_get(const Scene *scene,
r_text_color[3] = 1.0f;
r_shadow_color[3] = 0.8f;
/* White text, black shadow. Unless view background
* is very light; in that case black text, white shadow. */
/* Default text color from TH_TEXT_HI. If it is too close
* to the background color, darken or lighten it. */
UI_GetThemeColor3fv(TH_TEXT_HI, r_text_color);
float text_lightness = rgb_to_grayscale(r_text_color);
float bg_color[3];
ED_view3d_background_color_get(scene, v3d, bg_color);
float lightness = rgb_to_grayscale(bg_color);
if (lightness > 0.6f) {
copy_v3_fl(r_text_color, 0.0f);
copy_v3_v3(r_shadow_color, bg_color);
const float distance = len_v3v3(r_text_color, bg_color);
if (distance < 0.5f) {
if (text_lightness > 0.5f) {
mul_v3_fl(r_text_color, 0.33f);
}
else {
mul_v3_fl(r_text_color, 3.0f);
}
clamp_v3(r_text_color, 0.0f, 1.0f);
}
/* Shadow color is black or white depending on final text lightness. */
text_lightness = rgb_to_grayscale(r_text_color);
if (text_lightness > 0.4f) {
copy_v3_fl(r_shadow_color, 0.0f);
}
else {
copy_v3_fl(r_text_color, 0.9f);
copy_v3_fl(r_shadow_color, 0.0f);
copy_v3_fl(r_shadow_color, 1.0f);
}
}