mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71563 from groud/limit_toaster_width

Browse Source 
Limit toasts' width
This commit is contained in:
Rémi Verschelde 2023-01-17 20:13:29 +01:00 committed by GitHub
commit 1d8e739a9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
editor/editor_toaster.cpp
View File

@ -90,11 +90,12 @@ void EditorToaster::_notification(int p_what) {
} }
// Hide element if it is not visible anymore. // Hide element if it is not visible anymore.
if (modulate_fade.a <= 0) { if (modulate_fade.a <= 0 && element.key->is_visible()) {
if (element.key->is_visible()) { element.key->hide();
element.key->hide(); needs_update = true;
needs_update = true; } else if (modulate_fade.a >= 0 && !element.key->is_visible()) {
} element.key->show();
needs_update = true;
} }
} }
@ -419,12 +420,21 @@ void EditorToaster::_popup_str(String p_message, Severity p_severity, String p_t
// Create a new message if needed. // Create a new message if needed.
if (control == nullptr) { if (control == nullptr) {
Label *label = memnew(Label); HBoxContainer *hb = memnew(HBoxContainer);
hb->add_theme_constant_override("separation", 0);
control = popup(label, p_severity, default_message_duration, p_tooltip); Label *label = memnew(Label);
hb->add_child(label);
Label *count_label = memnew(Label);
hb->add_child(count_label);
control = popup(hb, p_severity, default_message_duration, p_tooltip);
toasts[control].message = p_message; toasts[control].message = p_message;
toasts[control].tooltip = p_tooltip; toasts[control].tooltip = p_tooltip;
toasts[control].count = 1; toasts[control].count = 1;
toasts[control].message_label = label;
toasts[control].message_count_label = count_label;
} else { } else {
if (toasts[control].popped) { if (toasts[control].popped) {
toasts[control].count += 1; toasts[control].count += 1;
@ -441,14 +451,31 @@ void EditorToaster::_popup_str(String p_message, Severity p_severity, String p_t
main_button->queue_redraw(); main_button->queue_redraw();
} }
// Retrieve the label back then update the text. // Retrieve the label back, then update the text.
Label *label = Object::cast_to<Label>(control->get_child(0)->get_child(0)); Label *message_label = toasts[control].message_label;
ERR_FAIL_COND(!label); ERR_FAIL_COND(!message_label);
if (toasts[control].count == 1) { message_label->set_text(p_message);
label->set_text(p_message); message_label->set_text_overrun_behavior(TextServer::OVERRUN_NO_TRIMMING);
} else { message_label->set_custom_minimum_size(Size2());
label->set_text(vformat("%s (%d)", p_message, toasts[control].count));
Size2i size = message_label->get_combined_minimum_size();
int limit_width = get_viewport_rect().size.x / 2; // Limit label size to half the viewport size.
if (size.x > limit_width) {
message_label->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
message_label->set_custom_minimum_size(Size2(limit_width, 0));
} }
// Retrieve the count label back, then update the text.
Label *message_count_label = toasts[control].message_count_label;
if (toasts[control].count == 1) {
message_count_label->hide();
} else {
message_count_label->set_text(vformat("(%d)", toasts[control].count));
message_count_label->show();
}
vbox_container->reset_size();
is_processing_error = false; is_processing_error = false;
} }

2
editor/editor_toaster.h
View File

@ -79,6 +79,8 @@ private:
String message; String message;
String tooltip; String tooltip;
int count = 0; int count = 0;
Label *message_label = nullptr;
Label *message_count_label = nullptr;
}; };
HashMap<Control *, Toast> toasts; HashMap<Control *, Toast> toasts;