Merge pull request #86029 from 0x0ACB/resize_fix
Remove dead code from `DisplayServerWindows::window_set_size`
This commit is contained in:
commit
ffad49f169
1 changed files with 8 additions and 18 deletions
|
@ -1832,24 +1832,6 @@ void DisplayServerWindows::window_set_size(const Size2i p_size, WindowID p_windo
|
||||||
|
|
||||||
int w = p_size.width;
|
int w = p_size.width;
|
||||||
int h = p_size.height;
|
int h = p_size.height;
|
||||||
|
|
||||||
wd.width = w;
|
|
||||||
wd.height = h;
|
|
||||||
|
|
||||||
#if defined(RD_ENABLED)
|
|
||||||
if (rendering_context) {
|
|
||||||
rendering_context->window_set_size(p_window, w, h);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#if defined(GLES3_ENABLED)
|
|
||||||
if (gl_manager_native) {
|
|
||||||
gl_manager_native->window_resize(p_window, w, h);
|
|
||||||
}
|
|
||||||
if (gl_manager_angle) {
|
|
||||||
gl_manager_angle->window_resize(p_window, w, h);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RECT rect;
|
RECT rect;
|
||||||
GetWindowRect(wd.hWnd, &rect);
|
GetWindowRect(wd.hWnd, &rect);
|
||||||
|
|
||||||
|
@ -4648,6 +4630,14 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
|
||||||
// Note: Trigger resize event to update swapchains when window is minimized/restored, even if size is not changed.
|
// Note: Trigger resize event to update swapchains when window is minimized/restored, even if size is not changed.
|
||||||
rendering_context->window_set_size(window_id, window.width, window.height);
|
rendering_context->window_set_size(window_id, window.width, window.height);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#if defined(GLES3_ENABLED)
|
||||||
|
if (gl_manager_native) {
|
||||||
|
gl_manager_native->window_resize(window_id, window.width, window.height);
|
||||||
|
}
|
||||||
|
if (gl_manager_angle) {
|
||||||
|
gl_manager_angle->window_resize(window_id, window.width, window.height);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue