[Bf-blender-cvs] [ba7f03c1bb9] temp-ui-tweaks: UI: Align panel titles

[Pablo Vazquez]

Commit: ba7f03c1bb96323332255a18e1a86ddf7908480c
Author: Pablo Vazquez
Date:   Fri Sep 3 20:06:43 2021 +0200
Branches: temp-ui-tweaks
https://developer.blender.org/rBba7f03c1bb96323332255a18e1a86ddf7908480c

UI: Align panel titles

WIP: Experiment with shifting the panel titles slightly to the right
matching panels with checkboxes/icons in the header.

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

M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/interface/interface_panel.c
M	source/blender/editors/interface/interface_widgets.c
M	source/blender/editors/screen/area.c

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

diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 6ac455c6a50..dcdfefb716c 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -248,6 +248,7 @@ enum {
 #define UI_PANEL_CATEGORY_MARGIN_WIDTH (U.widget_unit * 1.0f)
 
 #define UI_PANEL_BOX_STYLE_MARGIN (U.widget_unit * 0.2f)
+#define UI_PANEL_LABEL_OFFSET (U.widget_unit * 2.0f)
 
 /* but->drawflag - these flags should only affect how the button is drawn. */
 /* NOTE: currently, these flags *are not passed* to the widget's state() or draw() functions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 14fed6c02b8..0e6dc675cf5 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1198,7 +1198,7 @@ static void panel_draw_aligned_widgets(const uiStyle *style,
   /* Draw text label. */
   if (panel->drawname[0] != '\0') {
     const rcti title_rect = {
-        .xmin = widget_rect.xmin + (panel->labelofs / aspect) + scaled_unit * 1.2f,
+        .xmin = widget_rect.xmin + (panel->labelofs / aspect),
         .xmax = widget_rect.xmax,
         .ymin = widget_rect.ymin - 2.0f / aspect,
         .ymax = widget_rect.ymax,
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 5f58c387c27..c905bdd542c 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3810,6 +3810,9 @@ static void widget_numslider(
       factor_discard = factor;
     }
 
+    rect->xmin += 0.2f * U.widget_unit;
+    rect->xmax -= 0.2f * U.widget_unit;
+
     round_box_edges(&wtb1, roundboxalign_slider, &rect1, ofs);
     wtb1.draw_outline = false;
     widgetbase_set_uniform_discard_factor(&wtb1, factor_discard);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index aba43ddc1a3..6215e7b976e 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -2709,12 +2709,10 @@ static void ed_panel_draw(const bContext *C,
 
     UI_block_apply_search_filter(block, search_filter);
     UI_block_layout_resolve(block, &xco, &yco);
-    panel->labelofs = xco - labelx;
     panel->layout = NULL;
   }
-  else {
-    panel->labelofs = 0;
-  }
+
+  panel->labelofs = UI_PANEL_LABEL_OFFSET;
   UI_panel_header_buttons_end(panel);
 
   if (open || search_filter_active) {