blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Fix #110508: Text Object Select Attributes in Object Mode #110513

Merged
Harley Acheson merged 3 commits from Harley/blender:TextStyles into main 2023-07-27 05:31:14 +02:00
Conversation 0 Commits 3 Files Changed 1 +79 -10
1 changed files with 79 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
source/blender/makesrna/intern/rna_curve.cc
View File

@ -840,13 +840,81 @@ static bool rna_Curve_is_editmode_get(PointerRNA *ptr)
}
}
static bool rna_TextCurve_is_select_bold_get(PointerRNA *ptr)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
return (cu->editfont->select_char_info_flag & CU_CHINFO_BOLD);
}
return false;
Harley marked this conversation as resolved Outdated
Hans Goudey commented 2023-07-27 04:01:57 +02:00
Outdated
Review
Copy Link

else after return is unnecessary, same below

else after return is unnecessary, same below
}
static void rna_TextCurve_is_select_bold_set(PointerRNA *ptr, const bool value)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
cu->editfont->select_char_info_flag |= CU_CHINFO_BOLD;
}
}
static bool rna_TextCurve_is_select_italic_get(PointerRNA *ptr)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
return (cu->editfont->select_char_info_flag & CU_CHINFO_ITALIC);
}
return false;
}
static void rna_TextCurve_is_select_italic_set(PointerRNA *ptr, const bool value)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
cu->editfont->select_char_info_flag |= CU_CHINFO_ITALIC;
}
}
static bool rna_TextCurve_is_select_underline_get(PointerRNA *ptr)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
return (cu->editfont->select_char_info_flag & CU_CHINFO_UNDERLINE);
}
return false;
}
static void rna_TextCurve_is_select_underline_set(PointerRNA *ptr, const bool value)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
cu->editfont->select_char_info_flag |= CU_CHINFO_UNDERLINE;
}
}
static bool rna_TextCurve_is_select_smallcaps_get(PointerRNA *ptr)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
return (cu->editfont->select_char_info_flag & CU_CHINFO_SMALLCAPS);
}
return false;
}
static void rna_TextCurve_is_select_smallcap_set(PointerRNA *ptr, const bool value)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr) {
cu->editfont->select_char_info_flag |= CU_CHINFO_SMALLCAPS;
}
}
static bool rna_TextCurve_has_selection_get(PointerRNA *ptr)
{
Curve *cu = reinterpret_cast<Curve *>(ptr->owner_id);
if (cu->editfont != nullptr)
if (cu->editfont != nullptr) {
return (cu->editfont->selboxes != nullptr);
else
return false;
}
return false;
}
#else
@ -1286,25 +1354,26 @@ static void rna_def_font(BlenderRNA * /*brna*/, StructRNA *srna)
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
prop = RNA_def_property(srna, "is_select_bold", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "editfont->select_char_info_flag", CU_CHINFO_BOLD);
RNA_def_property_boolean_funcs(
prop, "rna_TextCurve_is_select_bold_get", "rna_TextCurve_is_select_bold_set");
RNA_def_property_ui_text(prop, "Selected Bold", "Whether the selected text is bold");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_select_italic", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(
prop, nullptr, "editfont->select_char_info_flag", CU_CHINFO_ITALIC);
RNA_def_property_boolean_funcs(
prop, "rna_TextCurve_is_select_italic_get", "rna_TextCurve_is_select_italic_set");
RNA_def_property_ui_text(prop, "Selected Italic", "Whether the selected text is italics");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_select_underline", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(
prop, nullptr, "editfont->select_char_info_flag", CU_CHINFO_UNDERLINE);
RNA_def_property_boolean_funcs(
prop, "rna_TextCurve_is_select_underline_get", "rna_TextCurve_is_select_underline_set");
RNA_def_property_ui_text(prop, "Selected Underline", "Whether the selected text is underlined");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_select_smallcaps", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(
prop, nullptr, "editfont->select_char_info_flag", CU_CHINFO_SMALLCAPS);
RNA_def_property_boolean_funcs(
prop, "rna_TextCurve_is_select_smallcaps_get", "rna_TextCurve_is_select_smallcaps_set");
RNA_def_property_ui_text(prop, "Selected Small Caps", "Whether the selected text is small caps");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);