diff options
author | William Reynish <billrey@me.com> | 2019-06-25 15:06:47 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-06-25 15:06:47 +0300 |
commit | 0c2c57167bb56e5d87ed38a70d0a2431e72bf704 (patch) | |
tree | 038338c7f31b2a6a9b57e2284d9ecd917f1e2d55 | |
parent | c186cfe419baa6f715544353b0861c374150b87b (diff) |
Sequencer: Fix missing icons for text alignment
Now is consistent with Text objects
Also fix wrong unit for text placement and tooltip-
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 9785f8e55de..567d4751b79 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1052,8 +1052,8 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): rowsub.active = strip.use_shadow rowsub.prop(strip, "shadow_color", text="") - col.prop(strip, "align_x") - col.prop(strip, "align_y", text="Y") + col.prop(strip, "align_x", text="Horizontal") + col.prop(strip, "align_y", text="Vertical") row = col.row(align=True) row.prop(strip, "location", text="Location") col.prop(strip, "wrap_width") diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 7e14775ee06..d0332afb2fb 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2693,15 +2693,15 @@ static void rna_def_gaussian_blur(StructRNA *srna) static void rna_def_text(StructRNA *srna) { static const EnumPropertyItem text_align_x_items[] = { - {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", 0, "Left", ""}, - {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", 0, "Center", ""}, - {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", 0, "Right", ""}, + {SEQ_TEXT_ALIGN_X_LEFT, "LEFT", ICON_ALIGN_LEFT, "Left", ""}, + {SEQ_TEXT_ALIGN_X_CENTER, "CENTER", ICON_ALIGN_CENTER, "Center", ""}, + {SEQ_TEXT_ALIGN_X_RIGHT, "RIGHT", ICON_ALIGN_RIGHT, "Right", ""}, {0, NULL, 0, NULL, NULL}, }; static const EnumPropertyItem text_align_y_items[] = { - {SEQ_TEXT_ALIGN_Y_TOP, "TOP", 0, "Top", ""}, - {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", 0, "Center", ""}, - {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", 0, "Bottom", ""}, + {SEQ_TEXT_ALIGN_Y_TOP, "TOP", ICON_ALIGN_TOP, "Top", ""}, + {SEQ_TEXT_ALIGN_Y_CENTER, "CENTER", ICON_ALIGN_MIDDLE, "Center", ""}, + {SEQ_TEXT_ALIGN_Y_BOTTOM, "BOTTOM", ICON_ALIGN_BOTTOM, "Bottom", ""}, {0, NULL, 0, NULL, NULL}, }; @@ -2738,7 +2738,7 @@ static void rna_def_text(StructRNA *srna) RNA_def_property_update( prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update"); - prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_XYZ); + prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_PERCENTAGE); RNA_def_property_float_sdna(prop, NULL, "loc"); RNA_def_property_ui_text(prop, "Location", "Location of the text"); RNA_def_property_range(prop, -FLT_MAX, FLT_MAX); @@ -2775,7 +2775,7 @@ static void rna_def_text(StructRNA *srna) prop = RNA_def_property(srna, "use_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_TEXT_SHADOW); - RNA_def_property_ui_text(prop, "Shadow", "Draw text with shadow"); + RNA_def_property_ui_text(prop, "Shadow", "Display shadow behind text"); RNA_def_property_update( prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_preprocessed_update"); } |