asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #71470 from YeldhamDev/window_fixes

Browse source 
Fix some small bugs in the `Window` node
This commit is contained in:
Rémi Verschelde 2023-01-27 19:26:31 +01:00
commit aae96945fa
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 46 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
scene/main/window.cpp
View file

@ -663,18 +663,18 @@ void Window::set_visible(bool p_visible) {
return;
}
visible = p_visible;
if (!is_inside_tree()) {
visible = p_visible;
return;
}
if (updating_child_controls) {
_update_child_controls();
}
ERR_FAIL_COND_MSG(get_parent() == nullptr, "Can't change visibility of main window.");
visible = p_visible;
// Stop any queued resizing, as the window will be resized right now.
updating_child_controls = false;
Viewport *embedder_vp = _get_embedder();
if (!embedder_vp) {
@ -833,7 +833,7 @@ bool Window::is_visible() const {
}
void Window::_update_window_size() {
// Force window to respect size limitations of rendering server
// Force window to respect size limitations of rendering server.
RenderingServer *rendering_server = RenderingServer::get_singleton();
if (rendering_server) {
Size2i max_window_size = rendering_server->get_maximum_viewport_size();
@ -1130,6 +1130,7 @@ void Window::_notification(int p_what) {
case NOTIFICATION_READY: {
if (wrap_controls) {
// Finish any resizing immediately so it doesn't interfere on stuff overriding _ready().
_update_child_controls();
}
} break;
@ -1138,9 +1139,7 @@ void Window::_notification(int p_what) {
_invalidate_theme_cache();
_update_theme_item_cache();
if (embedder) {
embedder->_sub_window_update(this);
} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
if (!embedder && window_id != DisplayServer::INVALID_WINDOW_ID) {
String tr_title = atr(title);
#ifdef DEBUG_ENABLED
if (window_id == DisplayServer::MAIN_WINDOW_ID) {
@ -1152,8 +1151,6 @@ void Window::_notification(int p_what) {
#endif
DisplayServer::get_singleton()->window_set_title(tr_title, window_id);
}
child_controls_changed();
} break;
case NOTIFICATION_EXIT_TREE: {
@ -1254,8 +1251,13 @@ Vector<Vector2> Window::get_mouse_passthrough_polygon() const {
void Window::set_wrap_controls(bool p_enable) {
wrap_controls = p_enable;
if (wrap_controls) {
child_controls_changed();
if (!is_inside_tree()) {
return;
}
if (updating_child_controls) {
_update_child_controls();
} else {
_update_window_size();
}
@ -1282,6 +1284,15 @@ Size2 Window::_get_contents_minimum_size() const {
return max;
}
void Window::child_controls_changed() {
if (!is_inside_tree() || !visible || updating_child_controls) {
return;
}
updating_child_controls = true;
call_deferred(SNAME("_update_child_controls"));
}
void Window::_update_child_controls() {
if (!updating_child_controls) {
return;
@ -1292,15 +1303,6 @@ void Window::_update_child_controls() {
updating_child_controls = false;
}
void Window::child_controls_changed() {
if (!is_inside_tree() || !visible || updating_child_controls) {
return;
}
updating_child_controls = true;
call_deferred(SNAME("_update_child_controls"));
}
bool Window::_can_consume_input_events() const {
return exclusive_child == nullptr;
}
@ -1647,7 +1649,24 @@ void Window::_invalidate_theme_cache() {
void Window::_update_theme_item_cache() {
// Request an update on the next frame to reflect theme changes.
// Updating without a delay can cause a lot of lag.
child_controls_changed();
if (!wrap_controls) {
updating_embedded_window = true;
call_deferred(SNAME("_update_embedded_window"));
} else {
child_controls_changed();
}
}
void Window::_update_embedded_window() {
if (!updating_embedded_window) {
return;
}
if (embedder) {
embedder->_sub_window_update(this);
};
updating_embedded_window = false;
}
void Window::set_theme_type_variation(const StringName &p_theme_type) {
@ -2201,6 +2220,7 @@ void Window::_bind_methods() {
ClassDB::bind_method(D_METHOD("child_controls_changed"), &Window::child_controls_changed);
ClassDB::bind_method(D_METHOD("_update_child_controls"), &Window::_update_child_controls);
ClassDB::bind_method(D_METHOD("_update_embedded_window"), &Window::_update_embedded_window);
ClassDB::bind_method(D_METHOD("set_theme", "theme"), &Window::set_theme);
ClassDB::bind_method(D_METHOD("get_theme"), &Window::get_theme);

2
scene/main/window.h
View file

@ -116,6 +116,7 @@ private:
bool exclusive = false;
bool wrap_controls = false;
bool updating_child_controls = false;
bool updating_embedded_window = false;
bool clamp_to_embedder = false;
LayoutDirection layout_dir = LAYOUT_DIRECTION_INHERITED;
@ -123,6 +124,7 @@ private:
bool auto_translate = true;
void _update_child_controls();
void _update_embedded_window();
Size2i content_scale_size;
ContentScaleMode content_scale_mode = CONTENT_SCALE_MODE_DISABLED;