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

Fix Window's wrap_controls not actually doing anything

Browse source
This commit is contained in:
Michael Alexsander 2021-07-08 20:06:16 -03:00
parent d4e5fe6c44
commit fe5605334a
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/main/window.cpp
View file

@ -115,7 +115,7 @@ Size2i Window::get_max_size() const {
void Window::set_min_size(const Size2i &p_min_size) { void Window::set_min_size(const Size2i &p_min_size) {
min_size = p_min_size; min_size = p_min_size;
if (window_id != DisplayServer::INVALID_WINDOW_ID) { if (!wrap_controls && window_id != DisplayServer::INVALID_WINDOW_ID) {
DisplayServer::get_singleton()->window_set_min_size(min_size, window_id); DisplayServer::get_singleton()->window_set_min_size(min_size, window_id);
} }
_update_window_size(); _update_window_size();
@ -541,6 +541,7 @@ void Window::_update_window_size() {
embedder->_sub_window_update(this); embedder->_sub_window_update(this);
} else if (window_id != DisplayServer::INVALID_WINDOW_ID) { } else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
DisplayServer::get_singleton()->window_set_size(size, window_id); DisplayServer::get_singleton()->window_set_size(size, window_id);
DisplayServer::get_singleton()->window_set_min_size(size_limit, window_id);
} }
//update the viewport //update the viewport