[Bf-blender-cvs] [1bb6d5cd75b] soc-2020-outliner: Mode Column: Move collection checkbox to mode column

[Nathan Craddock]

Commit: 1bb6d5cd75b30b363f8725994c879c7f5e225187
Author: Nathan Craddock
Date:   Wed Jul 1 17:02:46 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB1bb6d5cd75b30b363f8725994c879c7f5e225187

Mode Column: Move collection checkbox to mode column

To make the hierarchy more clear, draw the collection exclude icons in
the left column. While this is nice, it makes the mode toggle column
very messy in non-object modes. Will look into that later.

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

M	source/blender/editors/space_outliner/outliner_draw.c

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

diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index dc32689fde6..83cb2b4a6d9 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -3240,8 +3240,7 @@ static void outliner_draw_tree_element(bContext *C,
     if ((tselem->type == TSE_LAYER_COLLECTION) &&
         (soops->show_restrict_flags & SO_RESTRICT_ENABLE)) {
       tselem_draw_layer_collection_enable_icon(
-          tvc->scene, block, xmax, (float)startx + offsx + UI_UNIT_X, (float)*starty, te, 0.8f);
-      offsx += UI_UNIT_X;
+          tvc->scene, block, xmax, 0.0f, (float)*starty, te, 0.8f);
     }
 
     /* active circle */
@@ -3696,10 +3695,7 @@ static void outliner_draw_tree(bContext *C,
   int starty, startx;
 
   /* Move the tree a unit left in view layer mode */
-  short mode_column_offset = use_mode_column ? UI_UNIT_X : 0;
-  if (soops->outlinevis == SO_VIEW_LAYER) {
-    mode_column_offset -= UI_UNIT_X;
-  }
+  short mode_column_offset = (use_mode_column && (soops->outlinevis == SO_SCENES)) ? UI_UNIT_X : 0;
 
   GPU_blend_set_func_separate(
       GPU_SRC_ALPHA, GPU_ONE_MINUS_SRC_ALPHA, GPU_ONE, GPU_ONE_MINUS_SRC_ALPHA);  // only once