feat: updated engine
This commit is contained in:
parent
cbe99774ff
commit
f4cf6b3999
6607 changed files with 910135 additions and 430025 deletions
|
|
@ -31,8 +31,12 @@
|
|||
#include "dialogs.h"
|
||||
#include "dialogs.compat.inc"
|
||||
|
||||
#include "core/config/engine.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "scene/gui/line_edit.h"
|
||||
#include "scene/theme/theme_db.h"
|
||||
#include "servers/display/accessibility_server.h"
|
||||
|
||||
// AcceptDialog
|
||||
|
||||
|
|
@ -55,7 +59,7 @@ void AcceptDialog::_notification(int p_what) {
|
|||
RID ae = get_accessibility_element();
|
||||
ERR_FAIL_COND(ae.is_null());
|
||||
|
||||
DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_DIALOG);
|
||||
AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_DIALOG);
|
||||
} break;
|
||||
case NOTIFICATION_POST_ENTER_TREE: {
|
||||
if (is_visible()) {
|
||||
|
|
@ -235,7 +239,7 @@ void AcceptDialog::_update_child_rects() {
|
|||
}
|
||||
|
||||
// Place the buttons from the bottom edge to their minimum required size.
|
||||
Size2 buttons_minsize = buttons_hbox->get_combined_minimum_size();
|
||||
Size2 buttons_minsize = buttons_hbox->get_bound_minimum_size();
|
||||
Size2 buttons_size = Size2(dlg_size.x - h_margins, buttons_minsize.y);
|
||||
Point2 buttons_position = Point2(theme_cache.panel_style->get_margin(SIDE_LEFT), dlg_size.y - theme_cache.panel_style->get_margin(SIDE_BOTTOM) - buttons_size.y);
|
||||
buttons_hbox->set_position(buttons_position);
|
||||
|
|
@ -294,13 +298,13 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
|
|||
continue;
|
||||
}
|
||||
|
||||
Size2 child_minsize = c->get_combined_minimum_size();
|
||||
Size2 child_minsize = c->get_bound_minimum_size();
|
||||
content_minsize = child_minsize.max(content_minsize);
|
||||
}
|
||||
|
||||
// Then we add buttons. Horizontally we're interested in whichever
|
||||
// value is the biggest. Vertically buttons add to the overall size.
|
||||
Size2 buttons_minsize = buttons_hbox->get_combined_minimum_size();
|
||||
Size2 buttons_minsize = buttons_hbox->get_bound_minimum_size();
|
||||
content_minsize.x = MAX(buttons_minsize.x, content_minsize.x);
|
||||
content_minsize.y += buttons_minsize.y;
|
||||
// Plus there is a separation size added on top.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue