botaccount
/
limboai
mirror of https://github.com/limbonaut/limboai.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize controls in constructor, bind emit callbacks without wrapper in TreeSearchPanel

This commit is contained in:
Alexander Montag 2024-09-28 16:45:11 +00:00
parent 3b73f24f33
commit cd85e6dd30
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
editor/tree_search.cpp
View File

@ -51,12 +51,11 @@ void TreeSearchPanel::_initialize_controls() {
label_filter->set_text(TTR("Filter")); label_filter->set_text(TTR("Filter"));
BUTTON_SET_ICON(close_button, get_theme_icon(LW_NAME(Close), LW_NAME(EditorIcons)));
close_button->set_theme_type_variation("FlatButton"); close_button->set_theme_type_variation("FlatButton");
// positioning and sizing // positioning and sizing
this->set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_WIDE); set_anchors_and_offsets_preset(LayoutPreset::PRESET_BOTTOM_WIDE);
this->set_v_size_flags(SIZE_SHRINK_CENTER); // Do not expand vertically set_v_size_flags(SIZE_SHRINK_CENTER); // Do not expand vertically
line_edit_search->set_h_size_flags(SIZE_EXPAND_FILL); line_edit_search->set_h_size_flags(SIZE_EXPAND_FILL);
@ -72,34 +71,28 @@ void TreeSearchPanel::_initialize_controls() {
_add_spacer(0.25); _add_spacer(0.25);
} }
void TreeSearchPanel::_initialize_close_callbacks() {
Callable calleable_set_invisible = Callable(this, "set_visible").bind(false); // don't need a custom bind.
close_button->connect("pressed", calleable_set_invisible);
close_button->set_shortcut(LW_GET_SHORTCUT("limbo_ai/hide_tree_search"));
}
void TreeSearchPanel::_add_spacer(float p_width_multiplier) { void TreeSearchPanel::_add_spacer(float p_width_multiplier) {
Control *spacer = memnew(Control); Control *spacer = memnew(Control);
spacer->set_custom_minimum_size(Vector2(8.0 * EDSCALE * p_width_multiplier, 0.0)); spacer->set_custom_minimum_size(Vector2(8.0 * EDSCALE * p_width_multiplier, 0.0));
add_child(spacer); add_child(spacer);
} }
void TreeSearchPanel::_emit_text_submitted(const String &p_text) {
this->emit_signal("text_submitted");
}
void TreeSearchPanel::_emit_update_requested() {
emit_signal("update_requested");
}
void TreeSearchPanel::_notification(int p_what) { void TreeSearchPanel::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_READY: { case NOTIFICATION_READY: {
_initialize_controls(); BUTTON_SET_ICON(close_button, get_theme_icon(LW_NAME(Close), LW_NAME(EditorIcons)));
line_edit_search->connect("text_changed", callable_mp(this, &TreeSearchPanel::_emit_update_requested).unbind(1));
_initialize_close_callbacks(); // close callbacks
line_edit_search->connect("text_submitted", callable_mp(this, &TreeSearchPanel::_emit_text_submitted)); close_button->connect("pressed", Callable(this, "set_visible").bind(false));
check_button_filter_highlight->connect("pressed", callable_mp(this, &TreeSearchPanel::_emit_update_requested)); close_button->set_shortcut(LW_GET_SHORTCUT("limbo_ai/hide_tree_search"));
// search callbacks
Callable c_update_requested = Callable(this, "emit_signal").bind("update_requested");
Callable c_text_submitted = Callable((Object *)this, "emit_signal").bind("text_submitted");
line_edit_search->connect("text_changed", c_update_requested.unbind(1));
check_button_filter_highlight->connect("pressed", c_update_requested);
line_edit_search->connect("text_submitted", c_text_submitted.unbind(1));
break; break;
} }
} }
@ -111,11 +104,8 @@ void TreeSearchPanel::_bind_methods() {
} }
TreeSearchPanel::TreeSearchPanel() { TreeSearchPanel::TreeSearchPanel() {
this->set_visible(false); _initialize_controls();
} set_visible(false);
bool TreeSearchPanel::has_focus() {
return false;
} }
TreeSearch::TreeSearchMode TreeSearchPanel::get_search_mode() { TreeSearch::TreeSearchMode TreeSearchPanel::get_search_mode() {
@ -126,13 +116,14 @@ TreeSearch::TreeSearchMode TreeSearchPanel::get_search_mode() {
} }
String TreeSearchPanel::get_text() { String TreeSearchPanel::get_text() {
if (!line_edit_search) if (!line_edit_search) {
return String(); return String();
}
return line_edit_search->get_text(); return line_edit_search->get_text();
} }
void TreeSearchPanel::show_and_focus() { void TreeSearchPanel::show_and_focus() {
this->set_visible(true); set_visible(true);
line_edit_search->grab_focus(); line_edit_search->grab_focus();
} }

4
editor/tree_search.h
View File

@ -106,12 +106,9 @@ private:
LineEdit *line_edit_search; LineEdit *line_edit_search;
CheckBox *check_button_filter_highlight; CheckBox *check_button_filter_highlight;
void _initialize_controls(); void _initialize_controls();
void _initialize_close_callbacks();
void _add_spacer(float width_multiplier = 1.f); void _add_spacer(float width_multiplier = 1.f);
void _on_draw_highlight(TreeItem *p_item, Rect2 p_rect); void _on_draw_highlight(TreeItem *p_item, Rect2 p_rect);
void _emit_text_submitted(const String &p_text);
void _emit_update_requested();
void _notification(int p_what); void _notification(int p_what);
protected: protected:
@ -122,7 +119,6 @@ public:
String get_text(); String get_text();
void show_and_focus(); void show_and_focus();
TreeSearchPanel(); TreeSearchPanel();
bool has_focus();
}; };
#endif // TREE_SEARCH_H #endif // TREE_SEARCH_H