1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00

Merge pull request #106315 from Riteo/popping-up-everywhere

Wayland: Fix error spam when closing popup
This commit is contained in:
Rémi Verschelde
2025-05-13 01:05:49 +02:00

View File

@@ -1236,12 +1236,12 @@ void DisplayServerWayland::window_set_flag(WindowFlags p_flag, bool p_enabled, D
case WINDOW_FLAG_POPUP: { case WINDOW_FLAG_POPUP: {
ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't be popup."); ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't be popup.");
ERR_FAIL_COND_MSG(wd.visible, "Popup flag can't changed while window is opened."); ERR_FAIL_COND_MSG(wd.visible && (wd.flags & WINDOW_FLAG_POPUP_BIT) != p_enabled, "Popup flag can't changed while window is opened.");
} break; } break;
case WINDOW_FLAG_POPUP_WM_HINT: { case WINDOW_FLAG_POPUP_WM_HINT: {
ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't have popup hint."); ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't have popup hint.");
ERR_FAIL_COND_MSG(wd.visible, "Popup hint can't changed while window is opened."); ERR_FAIL_COND_MSG(wd.visible && (wd.flags & WINDOW_FLAG_POPUP_WM_HINT_BIT) != p_enabled, "Popup hint can't changed while window is opened.");
} break; } break;
default: { default: {