[Bf-blender-cvs] [e08dac5f060] master: UI: use vertical navigation buttons

[Campbell Barton]

Commit: e08dac5f060b031a9c32f2319a303fc3daf39198
Author: Campbell Barton
Date:   Wed Sep 4 23:03:46 2019 +1000
Branches: master
https://developer.blender.org/rBe08dac5f060b031a9c32f2319a303fc3daf39198

UI: use vertical navigation buttons

This addresses crowding in the top right area of the view
with the existing header and tool header.

D5670 by @CandleComet

===================================================================

M	source/blender/editors/interface/view2d_gizmo_navigate.c
M	source/blender/editors/space_view3d/view3d_gizmo_navigate.c

===================================================================

diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.c b/source/blender/editors/interface/view2d_gizmo_navigate.c
index 9b15f2309a1..d0281ad1eef 100644
--- a/source/blender/editors/interface/view2d_gizmo_navigate.c
+++ b/source/blender/editors/interface/view2d_gizmo_navigate.c
@@ -227,13 +227,13 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
   int icon_mini_slot = 0;
 
   gz = navgroup->gz_array[GZ_INDEX_ZOOM];
-  gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-  gz->matrix_basis[3][1] = co[1];
+  gz->matrix_basis[3][0] = co[0];
+  gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
   WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 
   gz = navgroup->gz_array[GZ_INDEX_MOVE];
-  gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-  gz->matrix_basis[3][1] = co[1];
+  gz->matrix_basis[3][0] = co[0];
+  gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
   WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
index 3c911e266a9..b60ddea5322 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
@@ -285,8 +285,8 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
   }
 
   const float co[2] = {
-      rect_visible->xmax - icon_offset_from_axis,
-      rect_visible->ymax - icon_offset_mini * 0.75f,
+      rect_visible->xmax - icon_offset_mini * 0.75f,
+      rect_visible->ymax - icon_offset_from_axis,
   };
 
   wmGizmo *gz;
@@ -307,25 +307,25 @@ static void WIDGETGROUP_navigate_draw_prepare(const bContext *C, wmGizmoGroup *g
   if (show_navigate) {
     int icon_mini_slot = 0;
     gz = navgroup->gz_array[GZ_INDEX_ZOOM];
-    gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-    gz->matrix_basis[3][1] = co[1];
+    gz->matrix_basis[3][0] = co[0];
+    gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
     WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 
     gz = navgroup->gz_array[GZ_INDEX_MOVE];
-    gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-    gz->matrix_basis[3][1] = co[1];
+    gz->matrix_basis[3][0] = co[0];
+    gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
     WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 
     if ((rv3d->viewlock & RV3D_LOCKED) == 0) {
       gz = navgroup->gz_array[GZ_INDEX_CAMERA];
-      gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-      gz->matrix_basis[3][1] = co[1];
+      gz->matrix_basis[3][0] = co[0];
+      gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
       WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
 
       if (navgroup->state.rv3d.is_camera == false) {
         gz = navgroup->gz_array[rv3d->is_persp ? GZ_INDEX_PERSP : GZ_INDEX_ORTHO];
-        gz->matrix_basis[3][0] = co[0] - (icon_offset_mini * icon_mini_slot++);
-        gz->matrix_basis[3][1] = co[1];
+        gz->matrix_basis[3][0] = co[0];
+        gz->matrix_basis[3][1] = co[1] - (icon_offset_mini * icon_mini_slot++);
         WM_gizmo_set_flag(gz, WM_GIZMO_HIDDEN, false);
       }
     }