diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-02-04 14:17:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-02-04 14:19:28 +0300 |
commit | 3dde6360ff6ae002002472f7b5a155e3d119230f (patch) | |
tree | 802493f801cad87d93f53e20173a02e671a3def4 /source/blender/editors | |
parent | 62dba60e49e79e77ecb11027e723823767c13854 (diff) |
Fix T65306: UI widgets clipped when scaled up
Normal UI widget and 3D navigation gizmo where clipping at high DPI.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 15 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c | 18 |
2 files changed, 24 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 31cbd2a3831..0250900759f 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1736,7 +1736,7 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec /* sphere color */ float diffuse[3] = {1.0f, 1.0f, 1.0f}; float light[3]; - float size; + const float size = 0.5f * min_ff(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)); /* backdrop */ UI_draw_roundbox_corner_set(UI_CNR_ALL); @@ -1752,11 +1752,10 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec /* transform to button */ GPU_matrix_push(); - if (BLI_rcti_size_x(rect) < BLI_rcti_size_y(rect)) { - size = 0.5f * BLI_rcti_size_x(rect); - } - else { - size = 0.5f * BLI_rcti_size_y(rect); + bool use_project_matrix = (size >= -GPU_MATRIX_ORTHO_CLIP_NEAR_DEFAULT); + if (use_project_matrix) { + GPU_matrix_push_projection(); + GPU_matrix_ortho_set_z(-size, size); } GPU_matrix_translate_2f(rect->xmin + 0.5f * BLI_rcti_size_x(rect), @@ -1784,6 +1783,10 @@ void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rec GPU_blend(false); GPU_line_smooth(false); + if (use_project_matrix) { + GPU_matrix_pop_projection(); + } + /* matrix after circle */ GPU_matrix_pop(); diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c index 504b10888e8..d3f19b6debc 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c @@ -197,6 +197,7 @@ static void axis_geom_draw(const wmGizmo *gz, const bool select, const struct AxisDrawInfo *draw_info) { + GPU_line_width(gz->line_width); GPUVertFormat *format = immVertexFormat(); @@ -239,6 +240,7 @@ static void axis_geom_draw(const wmGizmo *gz, static float axis_color[3][4]; const float axis_depth_bias = 0.01f; + const float sphere_scale = 1.15f; #ifdef USE_AXIS_FONT struct { @@ -268,6 +270,13 @@ static void axis_geom_draw(const wmGizmo *gz, /* When the cursor is over any of the gizmos (show circle backdrop). */ const bool is_active = (color[3] != 0.0f); + const float clip_range = gz->scale_final * sphere_scale; + bool use_project_matrix = (clip_range >= -GPU_MATRIX_ORTHO_CLIP_NEAR_DEFAULT); + if (use_project_matrix) { + GPU_matrix_push_projection(); + GPU_matrix_ortho_set_z(-clip_range, clip_range); + } + /* Circle defining active area. */ if (is_active) { immUniformColor4fv(color); @@ -364,11 +373,10 @@ static void axis_geom_draw(const wmGizmo *gz, * they use a faded color which can be similar to the circle backdrop in tone. */ if (is_active && !is_highlight && !is_pos && !select && !(axis_align == axis)) { static const float axis_black_faded[4] = {0, 0, 0, 0.2f}; - const float scale = 1.15f; - GPU_matrix_scale_1f(scale); + GPU_matrix_scale_1f(sphere_scale); GPU_batch_uniform_4fv(sphere, "color", axis_black_faded); GPU_batch_draw(sphere); - GPU_matrix_scale_1f(1.0 / scale); + GPU_matrix_scale_1f(1.0 / sphere_scale); } GPU_batch_uniform_4fv(sphere, "color", is_pos_color ? color_current : color_current_fade); @@ -407,6 +415,10 @@ static void axis_geom_draw(const wmGizmo *gz, GPU_matrix_pop(); immUnbindProgram(); + + if (use_project_matrix) { + GPU_matrix_pop_projection(); + } } static void axis3d_draw_intern(const bContext *C, |