UI: add view aligned gizmo color

Was hard coded to white making white backgrounds impractical.

D7162 by @billreynish with edits.

5 files changed, 25 insertions, 5 deletions

diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 7e510edd95b..c7300f298c0 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -315,6 +315,7 @@ typedef enum ThemeColorID {
   TH_GIZMO_HI,
   TH_GIZMO_PRIMARY,
   TH_GIZMO_SECONDARY,
+  TH_GIZMO_VIEW_ALIGN,
   TH_GIZMO_A,
   TH_GIZMO_B,
 
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 6e18352bad3..4207a4b522a 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -918,6 +918,9 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
         case TH_GIZMO_SECONDARY:
           cp = btheme->tui.gizmo_secondary;
           break;
+        case TH_GIZMO_VIEW_ALIGN:
+          cp = btheme->tui.gizmo_view_align;
+          break;
         case TH_GIZMO_A:
           cp = btheme->tui.gizmo_a;
           break;
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
index 83539900f36..c202cc297f4 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.c
@@ -864,7 +864,7 @@ static void gizmo_ruler_draw(const bContext *C, wmGizmo *gz)
     uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
 
     immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
-    immUniformColor4fv(color_act);
+    immUniformThemeColor3(TH_GIZMO_VIEW_ALIGN);
 
     imm_draw_circle_wire_2d(pos, co_ss_snap[0], co_ss_snap[1], size * U.pixelsize, 32);
 
diff --git a/source/blender/editors/transform/transform_gizmo_2d.c b/source/blender/editors/transform/transform_gizmo_2d.c
index 74f5924b717..82d51141a8b 100644
--- a/source/blender/editors/transform/transform_gizmo_2d.c
+++ b/source/blender/editors/transform/transform_gizmo_2d.c
@@ -315,6 +315,11 @@ static void gizmo2d_xform_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup
       WM_gizmo_set_scale(gz, 1.0f);
     }
     else {
+      float color[4], color_hi[4];
+      UI_GetThemeColor4fv(TH_GIZMO_VIEW_ALIGN, color);
+      copy_v4_v4(color_hi, color);
+      color[3] *= 0.6f;
+
       PropertyRNA *prop = RNA_struct_find_property(gz->ptr, "icon");
       RNA_property_enum_set(gz->ptr, prop, ICON_NONE);
 
@@ -322,7 +327,8 @@ static void gizmo2d_xform_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup
       /* Make the center low alpha. */
       WM_gizmo_set_line_width(gz, 2.0f);
       RNA_float_set(gz->ptr, "backdrop_fill_alpha", 0.0);
-      WM_gizmo_set_color(gz, (const float[4]){1, 1, 1, 0.6});
+      WM_gizmo_set_color(gz, color);
+      WM_gizmo_set_color_highlight(gz, color_hi);
 
       WM_gizmo_set_scale(gz, 0.2f);
     }
@@ -629,6 +635,11 @@ static void gizmo2d_resize_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
       WM_gizmo_set_scale(gz, 1.0f);
     }
     else {
+      float color[4], color_hi[4];
+      UI_GetThemeColor4fv(TH_GIZMO_VIEW_ALIGN, color);
+      copy_v4_v4(color_hi, color);
+      color[3] *= 0.6f;
+
       PropertyRNA *prop = RNA_struct_find_property(gz->ptr, "icon");
       RNA_property_enum_set(gz->ptr, prop, ICON_NONE);
 
@@ -636,7 +647,8 @@ static void gizmo2d_resize_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
       /* Make the center low alpha. */
       WM_gizmo_set_line_width(gz, 2.0f);
       RNA_float_set(gz->ptr, "backdrop_fill_alpha", 0.0);
-      WM_gizmo_set_color(gz, (const float[4]){1, 1, 1, 0.6});
+      WM_gizmo_set_color(gz, color);
+      WM_gizmo_set_color_highlight(gz, color_hi);
 
       WM_gizmo_set_scale(gz, 1.2f);
     }
@@ -754,6 +766,9 @@ static void gizmo2d_rotate_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
     WM_gizmo_set_scale(gz, 1.2f);
 
     {
+      float color[4];
+      UI_GetThemeColor4fv(TH_GIZMO_VIEW_ALIGN, color);
+
       PropertyRNA *prop = RNA_struct_find_property(gz->ptr, "icon");
       RNA_property_enum_set(gz->ptr, prop, ICON_NONE);
 
@@ -761,7 +776,8 @@ static void gizmo2d_rotate_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgrou
       /* Make the center low alpha. */
       WM_gizmo_set_line_width(gz, 2.0f);
       RNA_float_set(gz->ptr, "backdrop_fill_alpha", 0.0);
-      WM_gizmo_set_color(gz, (const float[4]){1, 1, 1, 0.6});
+      WM_gizmo_set_color(gz, color);
+      WM_gizmo_set_color_highlight(gz, color);
     }
 
     /* Assign operator. */
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 0548cc4e503..57f302e2d50 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -397,7 +397,7 @@ static void gizmo_get_axis_color(const int axis_idx,
     case MAN_AXIS_ROT_C:
     case MAN_AXIS_SCALE_C:
     case MAN_AXIS_ROT_T:
-      copy_v4_fl(r_col, 1.0f);
+      UI_GetThemeColor4fv(TH_GIZMO_VIEW_ALIGN, r_col);
       break;
   }