diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-19 03:40:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-19 04:09:53 +0300 |
commit | b62e1146e13cf94e14d7ef8003b8a4cde87d0437 (patch) | |
tree | 077a3ceaea67da205595644729ef577ab1c70af0 /source/blender/editors/transform/transform_gizmo_2d.c | |
parent | 014e569258519cbba56fce9a6a29b208ccdbb1f2 (diff) |
UI: add view aligned gizmo color
Was hard coded to white making white backgrounds impractical.
D7162 by @billreynish with edits.
Diffstat (limited to 'source/blender/editors/transform/transform_gizmo_2d.c')
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_2d.c | 22 |
1 files changed, 19 insertions, 3 deletions
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. */ |