godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #106657 from Riteo/mfw-single-window-mode-broke 

Wayland: Fix window fitting in single-window mode
This commit is contained in:
Thaddeus Crews 2025-05-21 09:06:22 -05:00
parent 25a3c27c41 408de3c970
commit f1e18433d1
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/popup.cpp
View File

@ -167,7 +167,7 @@ Rect2i Popup::_popup_adjust_rect() const {
Rect2i current(get_position(), get_size());
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
if (!is_embedded() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
// We're fine as is, the Display Server will take care of that for us.
return current;
}

2
scene/main/window.cpp
View File

@ -1994,7 +1994,7 @@ void Window::popup(const Rect2i &p_screen_rect) {
// Update window size to calculate the actual window size based on contents minimum size and minimum size.
_update_window_size();
bool should_fit = !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS);
bool should_fit = is_embedded() || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS);
if (p_screen_rect != Rect2i()) {
set_position(p_screen_rect.position);