Skip to content

Commit c0935eb

Browse files
RepiteoRepiteo
committed
Merge pull request #105846 from KoBeWi/you_call_it_title_but_it's_just_a_text
Rename FoldableContainer's `text` to `title`
2 parents cfa2a90 + 6856926 commit c0935eb

File tree

3 files changed

+55
-55
lines changed

3 files changed

+55
-55
lines changed

‎doc/classes/FoldableContainer.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<members>
4545
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
4646
<member name="foldable_group" type="FoldableGroup" setter="set_foldable_group" getter="get_foldable_group">
47-
The [FoldableGroup] associated with the container.
47+
The [FoldableGroup] associated with the container. When multiple [FoldableContainer] nodes share the same group, only one of them is allowed to be unfolded.
4848
</member>
4949
<member name="folded" type="bool" setter="set_folded" getter="is_folded" default="false">
5050
If [code]true[/code], the container will becomes folded and will hide all its children.
@@ -53,21 +53,21 @@
5353
Language code used for text shaping algorithms. If left empty, current locale is used instead.
5454
</member>
5555
<member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" overrides="Control" enum="Control.MouseFilter" default="0" />
56-
<member name="text" type="String" setter="set_text" getter="get_text" default="&quot;&quot;">
57-
The Container's title text.
58-
</member>
59-
<member name="text_direction" type="int" setter="set_text_direction" getter="get_text_direction" enum="Control.TextDirection" default="0">
60-
Base text writing direction.
61-
</member>
62-
<member name="text_overrun_behavior" type="int" setter="set_text_overrun_behavior" getter="get_text_overrun_behavior" enum="TextServer.OverrunBehavior" default="0">
63-
Defines the behavior of the [FoldableContainer] when the text is longer than the available space.
56+
<member name="title" type="String" setter="set_title" getter="get_title" default="&quot;&quot;">
57+
The container's title text.
6458
</member>
6559
<member name="title_alignment" type="int" setter="set_title_alignment" getter="get_title_alignment" enum="HorizontalAlignment" default="0">
6660
Title's horizontal text alignment as defined in the [enum HorizontalAlignment] enum.
6761
</member>
6862
<member name="title_position" type="int" setter="set_title_position" getter="get_title_position" enum="FoldableContainer.TitlePosition" default="0">
6963
Title's position as defined in the [enum TitlePosition] enum.
7064
</member>
65+
<member name="title_text_direction" type="int" setter="set_title_text_direction" getter="get_title_text_direction" enum="Control.TextDirection" default="0">
66+
Title text writing direction.
67+
</member>
68+
<member name="title_text_overrun_behavior" type="int" setter="set_title_text_overrun_behavior" getter="get_title_text_overrun_behavior" enum="TextServer.OverrunBehavior" default="0">
69+
Defines the behavior of the title when the text is longer than the available space.
70+
</member>
7171
</members>
7272
<signals>
7373
<signal name="folding_changed">

‎scene/gui/foldable_container.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -110,32 +110,32 @@ Ref<FoldableGroup> FoldableContainer::get_foldable_group() const {
110110
return foldable_group;
111111
}
112112

113-
void FoldableContainer::set_text(const String &p_text) {
114-
if (text == p_text) {
113+
void FoldableContainer::set_title(const String &p_text) {
114+
if (title == p_text) {
115115
return;
116116
}
117-
text = p_text;
117+
title = p_text;
118118
_shape();
119119
update_minimum_size();
120120
queue_redraw();
121121
}
122122

123-
String FoldableContainer::get_text() const {
124-
return text;
123+
String FoldableContainer::get_title() const {
124+
return title;
125125
}
126126

127-
void FoldableContainer::set_text_alignment(HorizontalAlignment p_alignment) {
127+
void FoldableContainer::set_title_alignment(HorizontalAlignment p_alignment) {
128128
ERR_FAIL_INDEX((int)p_alignment, 3);
129-
text_alignment = p_alignment;
129+
title_alignment = p_alignment;
130130

131131
if (_get_actual_alignment() != text_buf->get_horizontal_alignment()) {
132132
_shape();
133133
queue_redraw();
134134
}
135135
}
136136

137-
HorizontalAlignment FoldableContainer::get_text_alignment() const {
138-
return text_alignment;
137+
HorizontalAlignment FoldableContainer::get_title_alignment() const {
138+
return title_alignment;
139139
}
140140

141141
void FoldableContainer::set_language(const String &p_language) {
@@ -152,21 +152,21 @@ String FoldableContainer::get_language() const {
152152
return language;
153153
}
154154

155-
void FoldableContainer::set_text_direction(TextDirection p_text_direction) {
155+
void FoldableContainer::set_title_text_direction(TextDirection p_text_direction) {
156156
ERR_FAIL_INDEX(int(p_text_direction), 4);
157-
if (text_direction == p_text_direction) {
157+
if (title_text_direction == p_text_direction) {
158158
return;
159159
}
160-
text_direction = p_text_direction;
160+
title_text_direction = p_text_direction;
161161
_shape();
162162
queue_redraw();
163163
}
164164

165-
Control::TextDirection FoldableContainer::get_text_direction() const {
166-
return text_direction;
165+
Control::TextDirection FoldableContainer::get_title_text_direction() const {
166+
return title_text_direction;
167167
}
168168

169-
void FoldableContainer::set_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior) {
169+
void FoldableContainer::set_title_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior) {
170170
if (overrun_behavior == p_overrun_behavior) {
171171
return;
172172
}
@@ -176,7 +176,7 @@ void FoldableContainer::set_text_overrun_behavior(TextServer::OverrunBehavior p_
176176
queue_redraw();
177177
}
178178

179-
TextServer::OverrunBehavior FoldableContainer::get_text_overrun_behavior() const {
179+
TextServer::OverrunBehavior FoldableContainer::get_title_text_overrun_behavior() const {
180180
return overrun_behavior;
181181
}
182182

@@ -440,7 +440,7 @@ void FoldableContainer::_update_title_min_size() const {
440440
title_minimum_size = title_ms;
441441
title_minimum_size.width += icon->get_width();
442442

443-
if (!text.is_empty()) {
443+
if (!title.is_empty()) {
444444
title_minimum_size.width += h_separation;
445445
Size2 text_size = text_buf->get_size();
446446
title_minimum_size.height += MAX(text_size.height, icon->get_height());
@@ -481,25 +481,25 @@ void FoldableContainer::_shape() {
481481
text_buf->clear();
482482
text_buf->set_width(-1);
483483

484-
if (text_direction == TEXT_DIRECTION_INHERITED) {
484+
if (title_text_direction == TEXT_DIRECTION_INHERITED) {
485485
text_buf->set_direction(is_layout_rtl() ? TextServer::DIRECTION_RTL : TextServer::DIRECTION_LTR);
486486
} else {
487-
text_buf->set_direction((TextServer::Direction)text_direction);
487+
text_buf->set_direction((TextServer::Direction)title_text_direction);
488488
}
489489
text_buf->set_horizontal_alignment(_get_actual_alignment());
490490
text_buf->set_text_overrun_behavior(overrun_behavior);
491-
text_buf->add_string(atr(text), font, font_size, language);
491+
text_buf->add_string(atr(title), font, font_size, language);
492492
}
493493

494494
HorizontalAlignment FoldableContainer::_get_actual_alignment() const {
495495
if (is_layout_rtl()) {
496-
if (text_alignment == HORIZONTAL_ALIGNMENT_RIGHT) {
496+
if (title_alignment == HORIZONTAL_ALIGNMENT_RIGHT) {
497497
return HORIZONTAL_ALIGNMENT_LEFT;
498-
} else if (text_alignment == HORIZONTAL_ALIGNMENT_LEFT) {
498+
} else if (title_alignment == HORIZONTAL_ALIGNMENT_LEFT) {
499499
return HORIZONTAL_ALIGNMENT_RIGHT;
500500
}
501501
}
502-
return text_alignment;
502+
return title_alignment;
503503
}
504504

505505
void FoldableContainer::_update_group() {
@@ -530,16 +530,16 @@ void FoldableContainer::_bind_methods() {
530530
ClassDB::bind_method(D_METHOD("is_folded"), &FoldableContainer::is_folded);
531531
ClassDB::bind_method(D_METHOD("set_foldable_group", "button_group"), &FoldableContainer::set_foldable_group);
532532
ClassDB::bind_method(D_METHOD("get_foldable_group"), &FoldableContainer::get_foldable_group);
533-
ClassDB::bind_method(D_METHOD("set_text", "text"), &FoldableContainer::set_text);
534-
ClassDB::bind_method(D_METHOD("get_text"), &FoldableContainer::get_text);
535-
ClassDB::bind_method(D_METHOD("set_title_alignment", "alignment"), &FoldableContainer::set_text_alignment);
536-
ClassDB::bind_method(D_METHOD("get_title_alignment"), &FoldableContainer::get_text_alignment);
533+
ClassDB::bind_method(D_METHOD("set_title", "text"), &FoldableContainer::set_title);
534+
ClassDB::bind_method(D_METHOD("get_title"), &FoldableContainer::get_title);
535+
ClassDB::bind_method(D_METHOD("set_title_alignment", "alignment"), &FoldableContainer::set_title_alignment);
536+
ClassDB::bind_method(D_METHOD("get_title_alignment"), &FoldableContainer::get_title_alignment);
537537
ClassDB::bind_method(D_METHOD("set_language", "language"), &FoldableContainer::set_language);
538538
ClassDB::bind_method(D_METHOD("get_language"), &FoldableContainer::get_language);
539-
ClassDB::bind_method(D_METHOD("set_text_direction", "text_direction"), &FoldableContainer::set_text_direction);
540-
ClassDB::bind_method(D_METHOD("get_text_direction"), &FoldableContainer::get_text_direction);
541-
ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "overrun_behavior"), &FoldableContainer::set_text_overrun_behavior);
542-
ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &FoldableContainer::get_text_overrun_behavior);
539+
ClassDB::bind_method(D_METHOD("set_title_text_direction", "text_direction"), &FoldableContainer::set_title_text_direction);
540+
ClassDB::bind_method(D_METHOD("get_title_text_direction"), &FoldableContainer::get_title_text_direction);
541+
ClassDB::bind_method(D_METHOD("set_title_text_overrun_behavior", "overrun_behavior"), &FoldableContainer::set_title_text_overrun_behavior);
542+
ClassDB::bind_method(D_METHOD("get_title_text_overrun_behavior"), &FoldableContainer::get_title_text_overrun_behavior);
543543
ClassDB::bind_method(D_METHOD("set_title_position", "title_position"), &FoldableContainer::set_title_position);
544544
ClassDB::bind_method(D_METHOD("get_title_position"), &FoldableContainer::get_title_position);
545545
ClassDB::bind_method(D_METHOD("add_title_bar_control", "control"), &FoldableContainer::add_title_bar_control);
@@ -548,14 +548,14 @@ void FoldableContainer::_bind_methods() {
548548
ADD_SIGNAL(MethodInfo("folding_changed", PropertyInfo(Variant::BOOL, "is_folded")));
549549

550550
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "folded"), "set_folded", "is_folded");
551-
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text"), "set_text", "get_text");
551+
ADD_PROPERTY(PropertyInfo(Variant::STRING, "title"), "set_title", "get_title");
552552
ADD_PROPERTY(PropertyInfo(Variant::INT, "title_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_title_alignment", "get_title_alignment");
553553
ADD_PROPERTY(PropertyInfo(Variant::INT, "title_position", PROPERTY_HINT_ENUM, "Top,Bottom"), "set_title_position", "get_title_position");
554-
ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
554+
ADD_PROPERTY(PropertyInfo(Variant::INT, "title_text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_title_text_overrun_behavior", "get_title_text_overrun_behavior");
555555
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "foldable_group", PROPERTY_HINT_RESOURCE_TYPE, "FoldableGroup"), "set_foldable_group", "get_foldable_group");
556556

557557
ADD_GROUP("BiDi", "");
558-
ADD_PROPERTY(PropertyInfo(Variant::INT, "text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_text_direction", "get_text_direction");
558+
ADD_PROPERTY(PropertyInfo(Variant::INT, "title_text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_title_text_direction", "get_title_text_direction");
559559
ADD_PROPERTY(PropertyInfo(Variant::STRING, "language", PROPERTY_HINT_LOCALE_ID), "set_language", "get_language");
560560

561561
BIND_ENUM_CONSTANT(POSITION_TOP);
@@ -587,7 +587,7 @@ void FoldableContainer::_bind_methods() {
587587

588588
FoldableContainer::FoldableContainer(const String &p_text) {
589589
text_buf.instantiate();
590-
set_text(p_text);
590+
set_title(p_text);
591591
set_focus_mode(FOCUS_ALL);
592592
set_mouse_filter(MOUSE_FILTER_STOP);
593593
}

‎scene/gui/foldable_container.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ class FoldableContainer : public Container {
4747

4848
private:
4949
bool folded = false;
50-
String text;
50+
String title;
5151
Ref<FoldableGroup> foldable_group;
5252
String language;
53-
TextDirection text_direction = TEXT_DIRECTION_AUTO;
54-
HorizontalAlignment text_alignment = HORIZONTAL_ALIGNMENT_LEFT;
53+
TextDirection title_text_direction = TEXT_DIRECTION_AUTO;
54+
HorizontalAlignment title_alignment = HORIZONTAL_ALIGNMENT_LEFT;
5555
TextServer::OverrunBehavior overrun_behavior = TextServer::OVERRUN_NO_TRIMMING;
5656
TitlePosition title_position = POSITION_TOP;
5757

@@ -114,17 +114,17 @@ class FoldableContainer : public Container {
114114
void set_foldable_group(const Ref<FoldableGroup> &p_group);
115115
Ref<FoldableGroup> get_foldable_group() const;
116116

117-
void set_text(const String &p_text);
118-
String get_text() const;
117+
void set_title(const String &p_text);
118+
String get_title() const;
119119

120-
void set_text_alignment(HorizontalAlignment p_alignment);
121-
HorizontalAlignment get_text_alignment() const;
120+
void set_title_alignment(HorizontalAlignment p_alignment);
121+
HorizontalAlignment get_title_alignment() const;
122122

123-
void set_text_direction(TextDirection p_text_direction);
124-
TextDirection get_text_direction() const;
123+
void set_title_text_direction(TextDirection p_text_direction);
124+
TextDirection get_title_text_direction() const;
125125

126-
void set_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior);
127-
TextServer::OverrunBehavior get_text_overrun_behavior() const;
126+
void set_title_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior);
127+
TextServer::OverrunBehavior get_title_text_overrun_behavior() const;
128128

129129
void set_language(const String &p_language);
130130
String get_language() const;

0 commit comments

Comments
 (0)