godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the minimum size of ViewportContainer

Browse Source
This commit is contained in:
Tomasz Chabora 2020-11-21 22:32:26 +01:00 committed by kobewi
parent 84d82030c3
commit e72adab511
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scene/gui/subviewport_container.cpp
View File

@ -54,6 +54,7 @@ Size2 SubViewportContainer::get_minimum_size() const {
void SubViewportContainer::set_stretch(bool p_enable) { void SubViewportContainer::set_stretch(bool p_enable) {
stretch = p_enable; stretch = p_enable;
update_minimum_size();
queue_sort(); queue_sort();
update(); update();
} }

6
scene/main/viewport.cpp
View File

@ -48,6 +48,7 @@
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/popup.h" #include "scene/gui/popup.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/subviewport_container.h"
#include "scene/main/canvas_layer.h" #include "scene/main/canvas_layer.h"
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
@ -3865,6 +3866,11 @@ Viewport::~Viewport() {
void SubViewport::set_size(const Size2i &p_size) { void SubViewport::set_size(const Size2i &p_size) {
_set_size(p_size, _get_size_2d_override(), Rect2i(), _stretch_transform(), true); _set_size(p_size, _get_size_2d_override(), Rect2i(), _stretch_transform(), true);
SubViewportContainer *c = Object::cast_to<SubViewportContainer>(get_parent());
if (c) {
c->update_minimum_size();
}
} }
Size2i SubViewport::get_size() const { Size2i SubViewport::get_size() const {