[Bf-blender-cvs] [1429fc674d2] modifier-panels-ui: ShaderFX UI updates

[Hans Goudey]

Commit: 1429fc674d2a0580d4d10a62936a24a0996da397
Author: Hans Goudey
Date:   Thu Apr 30 10:48:43 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB1429fc674d2a0580d4d10a62936a24a0996da397

ShaderFX UI updates

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

M	source/blender/shader_fx/intern/FX_shader_blur.c
M	source/blender/shader_fx/intern/FX_shader_flip.c
M	source/blender/shader_fx/intern/FX_shader_pixel.c
M	source/blender/shader_fx/intern/FX_shader_shadow.c

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

diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c
index a98c73b09f2..e3db91d3499 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.c
+++ b/source/blender/shader_fx/intern/FX_shader_blur.c
@@ -64,15 +64,14 @@ static void panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiItemR(layout, &ptr, "use_dof_mode", 0, IFACE_("Use Depth of Field"), ICON_NONE);
+  uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE);
 
+  uiItemR(layout, &ptr, "use_dof_mode", 0, IFACE_("Use Depth of Field"), ICON_NONE);
   col = uiLayoutColumn(layout, false);
-  uiLayoutSetActive(col, RNA_boolean_get(&ptr, "use_dof_mode"));
+  uiLayoutSetActive(col, !RNA_boolean_get(&ptr, "use_dof_mode"));
   uiItemR(col, &ptr, "size", 0, NULL, ICON_NONE);
   uiItemR(col, &ptr, "rotation", 0, NULL, ICON_NONE);
 
-  uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE);
-
   shaderfx_panel_end(layout, &ptr);
 }
 
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c
index 8761bd24cde..2b37e2e7b69 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.c
+++ b/source/blender/shader_fx/intern/FX_shader_flip.c
@@ -56,17 +56,18 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target)
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
-  uiLayout *col;
+  uiLayout *row;
   uiLayout *layout = panel->layout;
+  int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
 
   PointerRNA ptr;
   shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr);
 
   uiLayoutSetPropSep(layout, true);
 
-  col = uiLayoutColumnWithHeading(layout, false, IFACE_("Flip"));
-  uiItemR(col, &ptr, "flip_horizontal", 0, NULL, ICON_NONE);
-  uiItemR(col, &ptr, "flip_vertical", 0, NULL, ICON_NONE);
+  row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis"));
+  uiItemR(row, &ptr, "flip_horizontal", toggles_flag, NULL, ICON_NONE);
+  uiItemR(row, &ptr, "flip_vertical", toggles_flag, NULL, ICON_NONE);
 
   shaderfx_panel_end(layout, &ptr);
 }
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c
index ec5e59521e3..c89780de0a5 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.c
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.c
@@ -25,6 +25,8 @@
 
 #include "BLI_utildefines.h"
 
+#include "BLT_translation.h"
+
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
@@ -52,6 +54,7 @@ static void copyData(const ShaderFxData *md, ShaderFxData *target)
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -59,7 +62,11 @@ static void panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiItemR(layout, &ptr, "size", 0, NULL, ICON_NONE);
+  /* Add the X, Y labels manually because size is a #PROP_PIXEL. */
+  col = uiLayoutColumn(layout, true);
+  PropertyRNA *prop = RNA_struct_find_property(&ptr, "size");
+  uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Size X"), ICON_NONE);
+  uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE);
 
   shaderfx_panel_end(layout, &ptr);
 }
diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.c b/source/blender/shader_fx/intern/FX_shader_shadow.c
index a346fd58cfa..cb487cdbd13 100644
--- a/source/blender/shader_fx/intern/FX_shader_shadow.c
+++ b/source/blender/shader_fx/intern/FX_shader_shadow.c
@@ -101,17 +101,22 @@ static void foreachObjectLink(ShaderFxData *fx,
 
 static void panel_draw(const bContext *C, Panel *panel)
 {
-  uiLayout *row;
+  uiLayout *row, *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
-  PointerRNA ob_ptr;
-  shaderfx_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
+  shaderfx_panel_get_property_pointers(C, panel, NULL, &ptr);
 
   uiLayoutSetPropSep(layout, true);
 
   uiItemR(layout, &ptr, "shadow_color", 0, NULL, ICON_NONE);
-  uiItemR(layout, &ptr, "offset", 0, NULL, ICON_NONE);
+
+  /* Add the X, Y labels manually because size is a #PROP_PIXEL. */
+  col = uiLayoutColumn(layout, true);
+  PropertyRNA *prop = RNA_struct_find_property(&ptr, "offset");
+  uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Offset X"), ICON_NONE);
+  uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE);
+
   uiItemR(layout, &ptr, "scale", 0, NULL, ICON_NONE);
   uiItemR(layout, &ptr, "rotation", 0, NULL, ICON_NONE);
 
@@ -124,6 +129,7 @@ static void panel_draw(const bContext *C, Panel *panel)
 
 static void blur_panel_draw(const bContext *C, Panel *panel)
 {
+  uiLayout *col;
   uiLayout *layout = panel->layout;
 
   PointerRNA ptr;
@@ -131,7 +137,12 @@ static void blur_panel_draw(const bContext *C, Panel *panel)
 
   uiLayoutSetPropSep(layout, true);
 
-  uiItemR(layout, &ptr, "blur", 0, NULL, ICON_NONE);
+  /* Add the X, Y labels manually because size is a #PROP_PIXEL. */
+  col = uiLayoutColumn(layout, true);
+  PropertyRNA *prop = RNA_struct_find_property(&ptr, "blur");
+  uiItemFullR(col, &ptr, prop, 0, 0, 0, IFACE_("Blur X"), ICON_NONE);
+  uiItemFullR(col, &ptr, prop, 1, 0, 0, IFACE_("Y"), ICON_NONE);
+
   uiItemR(layout, &ptr, "samples", 0, NULL, ICON_NONE);
 }