From 170b7a02e7ea900e5d674ddb953f1731a8deee30 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Tue, 30 Dec 2025 22:06:36 +0100
Subject: [PATCH] Disable "resize to pixel-perfect" when maximized

This improves consistency and will simplify further refactors.

PR #6216 <https://github.com/Genymobile/scrcpy/pull/6216>
---
 app/src/screen.c   | 7 +------
 app/src/util/sdl.c | 9 ---------
 app/src/util/sdl.h | 3 ---
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/src/screen.c b/app/src/screen.c
index 7b51c1c4..12287f76 100644
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -759,15 +759,10 @@ void
 sc_screen_resize_to_pixel_perfect(struct sc_screen *screen) {
     assert(screen->video);
 
-    if (screen->fullscreen || screen->minimized) {
+    if (screen->fullscreen || screen->maximized || screen->minimized) {
         return;
     }
 
-    if (screen->maximized) {
-        sc_sdl_restore_window(screen->window);
-        screen->maximized = false;
-    }
-
     struct sc_size content_size = screen->content_size;
     sc_sdl_set_window_size(screen->window, content_size);
     LOGD("Resized to pixel-perfect: %ux%u", content_size.width,
diff --git a/app/src/util/sdl.c b/app/src/util/sdl.c
index fa1fdebc..07921817 100644
--- a/app/src/util/sdl.c
+++ b/app/src/util/sdl.c
@@ -130,15 +130,6 @@ sc_sdl_hide_window(SDL_Window *window) {
     }
 }
 
-void
-sc_sdl_restore_window(SDL_Window *window) {
-    bool ok = SDL_RestoreWindow(window);
-    if (!ok) {
-        LOGE("Could not restore window: %s", SDL_GetError());
-        assert(!"unexpected");
-    }
-}
-
 bool
 sc_sdl_render_clear(SDL_Renderer *renderer) {
     bool ok = SDL_RenderClear(renderer);
diff --git a/app/src/util/sdl.h b/app/src/util/sdl.h
index a60f36fc..78b8319e 100644
--- a/app/src/util/sdl.h
+++ b/app/src/util/sdl.h
@@ -34,9 +34,6 @@ sc_sdl_show_window(SDL_Window *window);
 void
 sc_sdl_hide_window(SDL_Window *window);
 
-void
-sc_sdl_restore_window(SDL_Window *window);
-
 bool
 sc_sdl_render_clear(SDL_Renderer *renderer);