[Bf-blender-cvs] [5eac872627e] modifier-panels-ui: Use layout row with heading
Hans Goudey
noreply at git.blender.org
Wed Apr 15 00:25:28 CEST 2020
Commit: 5eac872627e86541af31ddaa32a236a450602099
Author: Hans Goudey
Date: Tue Apr 14 17:25:21 2020 -0500
Branches: modifier-panels-ui
https://developer.blender.org/rB5eac872627e86541af31ddaa32a236a450602099
Use layout row with heading
Also use the new uiItemR flag to clear decorators
===================================================================
M source/blender/modifiers/intern/MOD_cast.c
M source/blender/modifiers/intern/MOD_explode.c
M source/blender/modifiers/intern/MOD_laplaciansmooth.c
M source/blender/modifiers/intern/MOD_mirror.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/modifiers/intern/MOD_screw.c
M source/blender/modifiers/intern/MOD_shrinkwrap.c
M source/blender/modifiers/intern/MOD_simpledeform.c
M source/blender/modifiers/intern/MOD_skin.c
M source/blender/modifiers/intern/MOD_smooth.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c
index 110cb5a04ed..40fc4af9b50 100644
--- a/source/blender/modifiers/intern/MOD_cast.c
+++ b/source/blender/modifiers/intern/MOD_cast.c
@@ -531,8 +531,9 @@ static void deformVertsEM(ModifierData *md,
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *decorator_layout;
+ uiLayout *sub, *row;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
PointerRNA ob_ptr;
@@ -546,12 +547,10 @@ static void panel_draw(const bContext *C, Panel *panel)
uiLayoutSetPropSep(layout, true);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Axis"), ICON_NONE);
- uiItemR(row, &ptr, "use_x", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_y", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_z", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis"));
+ uiItemR(row, &ptr, "use_x", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_y", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_z", toggles_flag, NULL, ICON_NONE);
uiItemR(layout, &ptr, "factor", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "radius", 0, NULL, ICON_NONE);
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index a81e9c59e50..29acf27bfec 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -1187,8 +1187,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *decorator_layout;
+ uiLayout *sub, *row;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
PointerRNA ob_ptr;
@@ -1202,15 +1203,10 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemPointerR(layout, &ptr, "particle_uv", &obj_data_ptr, "uv_layers", NULL, ICON_NONE);
- /* This shouldn't be needed, but the above seems to reset prop separation. */
- uiLayoutSetPropSep(layout, true);
-
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Show"), ICON_NONE);
- uiItemR(row, &ptr, "show_alive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "show_dead", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "show_unborn", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Show"));
+ uiItemR(row, &ptr, "show_alive", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "show_dead", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "show_unborn", toggles_flag, NULL, ICON_NONE);
uiLayoutSetPropSep(layout, true);
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
index 82814ed193b..762306d861f 100644
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@@ -580,8 +580,9 @@ static void deformVertsEM(ModifierData *md,
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *decorator_layout;
+ uiLayout *sub, *row;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
PointerRNA ob_ptr;
@@ -594,12 +595,10 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemR(layout, &ptr, "iterations", 0, NULL, ICON_NONE);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Axis"), ICON_NONE);
- uiItemR(row, &ptr, "use_x", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_y", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_z", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Axis"));
+ uiItemR(row, &ptr, "use_x", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_y", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_z", toggles_flag, NULL, ICON_NONE);
uiItemR(layout, &ptr, "lambda_factor", 0, NULL, ICON_NONE);
uiItemR(layout, &ptr, "lambda_border", 0, NULL, ICON_NONE);
diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c
index edd50974aed..c1e8f3d036d 100644
--- a/source/blender/modifiers/intern/MOD_mirror.c
+++ b/source/blender/modifiers/intern/MOD_mirror.c
@@ -129,8 +129,8 @@ static void panel_draw(const bContext *C, Panel *panel)
uiLayout *row, *col;
uiLayout *layout = panel->layout;
int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
- PropertyRNA *prop;
+ PropertyRNA *prop;
PointerRNA ptr;
PointerRNA ob_ptr;
modifier_panel_get_property_pointers(C, panel, &ob_ptr, &ptr);
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 57215e4af8b..9aeb505650d 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -560,8 +560,9 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *row, *decorator_layout;
+ uiLayout *row;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
PointerRNA ob_ptr;
@@ -588,19 +589,15 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemS(layout);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Create Instances"), ICON_NONE);
- uiItemR(row, &ptr, "use_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_children", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_size", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Create Instances"));
+ uiItemR(row, &ptr, "use_normal", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_children", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "use_size", toggles_flag, NULL, ICON_NONE);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Show"), ICON_NONE);
- uiItemR(row, &ptr, "show_alive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "show_dead", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "show_unborn", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Show"));
+ uiItemR(row, &ptr, "show_alive", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "show_dead", toggles_flag, NULL, ICON_NONE);
+ uiItemR(row, &ptr, "show_unborn", toggles_flag, NULL, ICON_NONE);
uiItemR(layout, &ptr, "particle_amount", 0, IFACE_("Amount"), ICON_NONE);
uiItemR(layout, &ptr, "particle_offset", 0, IFACE_("Offset"), ICON_NONE);
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 1dda1b2d19e..4bbcb78d45e 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -1170,8 +1170,9 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *col, *decorator_layout;
+ uiLayout *sub, *row, *col;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
modifier_panel_get_property_pointers(C, panel, NULL, &ptr);
@@ -1204,11 +1205,9 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemR(col, &ptr, "steps", 0, IFACE_("Steps Viewport"), ICON_NONE);
uiItemR(col, &ptr, "render_steps", 0, IFACE_("Render"), ICON_NONE);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Stretch"), ICON_NONE);
- uiItemR(row, &ptr, "use_stretch_u", UI_ITEM_R_TOGGLE, IFACE_("U"), ICON_NONE);
- uiItemR(row, &ptr, "use_stretch_v", UI_ITEM_R_TOGGLE, IFACE_("V"), ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IFACE_("Stretch UVs"));
+ uiItemR(row, &ptr, "use_stretch_u", toggles_flag, IFACE_("U"), ICON_NONE);
+ uiItemR(row, &ptr, "use_stretch_v", toggles_flag, IFACE_("V"), ICON_NONE);
modifier_panel_end(layout, &ptr);
}
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index 2967a59bf7f..3c7a931a4a5 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -211,8 +211,9 @@ static bool dependsOnNormals(ModifierData *md)
static void panel_draw(const bContext *C, Panel *panel)
{
- uiLayout *sub, *row, *decorator_layout, *col;
+ uiLayout *sub, *row, *col;
uiLayout *layout = panel->layout;
+ int toggles_flag = UI_ITEM_R_TOGGLE | UI_ITEM_R_FORCE_BLANK_DECORATE;
PointerRNA ptr;
PointerRNA ob_ptr;
@@ -237,12 +238,10 @@ static void panel_draw(const bContext *C, Panel *panel)
uiItemR(layout, &ptr, "project_limit", 0, IFACE_("Limit"), ICON_NONE);
uiItemR(layout, &ptr, "subsurf_levels", 0, NULL, ICON_NONE);
- row = uiLayoutRow(layout, true);
- decorator_layout = uiItemL_respect_property_split(row, IFACE_("Axis"), ICON_NONE);
- uiItemR(row, &ptr, "use_project_x", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_project_y", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemR(row, &ptr, "use_project_z", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
- uiItemL(decorator_layout, "", ICON_BLANK1);
+ row = uiLayoutRowWithHeading(layout, true, IF
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list