godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Wayland: Fix window fitting in single-window mode

Browse Source 
We disabled window fitting in multi-window mode as it was broken due to
the limited data but it should still be enabled for embedded windows.
This commit is contained in:
Riteo
2025-05-20 23:54:56 +02:00
parent be3ecaeb3c
commit 408de3c970
2 changed files with 2 additions and 2 deletions
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()); 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. // We're fine as is, the Display Server will take care of that for us.
return current; 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 to calculate the actual window size based on contents minimum size and minimum size.
_update_window_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()) { if (p_screen_rect != Rect2i()) {
set_position(p_screen_rect.position); set_position(p_screen_rect.position);