From 11d6dd4500b28b7430c3783a7202d7582a5a513e Mon Sep 17 00:00:00 2001
From: Felix Koppe <fkoppe@web.de>
Date: Wed, 4 Dec 2024 10:00:41 +0100
Subject: [PATCH] Improve video dialog

---
 .../src/main/java/pp/mdga/client/MdgaApp.java | 10 +++----
 .../client/dialog/VideoSettingsDialog.java    | 28 +++++++++++++------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
index c381a36d..b0120dfb 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
@@ -266,12 +266,12 @@ public void updateResolution(int width, int height, float imageFactor, boolean i
 
             prefs.putFloat("scale", scaleFactor);
             prefs.putBoolean("fullscreen", true);
+        } else {
+            prefs.putInt("width", width);
+            prefs.putInt("height", height);
+            prefs.putFloat("scale", imageFactor);
+            prefs.putBoolean("fullscreen", false);
         }
-
-        prefs.putInt("width", width);
-        prefs.putInt("height", height);
-        prefs.putFloat("scale", imageFactor);
-        prefs.putBoolean("fullscreen", false);
     }
 
     public static void restartApp() {
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoSettingsDialog.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoSettingsDialog.java
index b1ce3b29..5aa98cfe 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoSettingsDialog.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/dialog/VideoSettingsDialog.java
@@ -9,7 +9,11 @@
 import pp.mdga.client.button.MenuButton;
 import pp.mdga.client.view.MdgaView;
 
+import java.util.prefs.Preferences;
+
 public class VideoSettingsDialog extends Dialog {
+    private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
+
     private ButtonRight fullscreenButton;
     private MenuButton backButton;
     private ButtonRight restartButton;
@@ -30,19 +34,20 @@ public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
 
         this.view = view;
 
-        fullscreenButton = new ButtonRight(app, node, () -> app.updateResolution(0, 0, 0, true), "Vollbild", 1);
         backButton = new MenuButton(app, node, view::leaveVideoSettings, "Zurück");
 
         restartButton = new ButtonRight(app, node, MdgaApp::restartApp, "Neustart", 1);
 
-        hdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1280, 720, 1.0f, false), "hd 16:9", 10);
-        fullHdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1920, 1080, 2.25f, false), "full hd 16:9", 10);
-        wqhdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(2560, 1440, 4.0f, false), "wqhd 16:9", 10);
+        fullscreenButton = new ButtonRight(app, node, () -> updateResolution(0, 0, 0, true), "Vollbild", 1);
+
+        hdButton9 = new ButtonLeft(app, node, () -> updateResolution(1280, 720, 1.0f, false), "hd 16:9", 10);
+        fullHdButton9 = new ButtonLeft(app, node, () -> updateResolution(1920, 1080, 2.25f, false), "full hd 16:9", 10);
+        wqhdButton9 = new ButtonLeft(app, node, () -> updateResolution(2560, 1440, 4.0f, false), "wqhd 16:9", 10);
 
 
-        hdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1280, 800, 1.0f, false), "hd 16:10", 10);
-        fullHdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1920, 1200, 2.25f, false), "full hd 16:10", 10);
-        wqhdButton10 = new ButtonRight(app, node, () -> app.updateResolution(2560, 1600, 4.0f, false), "wqhd 16:10", 10);
+        hdButton10 = new ButtonRight(app, node, () -> updateResolution(1280, 800, 1.0f, false), "hd 16:10", 10);
+        fullHdButton10 = new ButtonRight(app, node, () -> updateResolution(1920, 1200, 2.25f, false), "full hd 16:10", 10);
+        wqhdButton10 = new ButtonRight(app, node, () -> updateResolution(2560, 1600, 4.0f, false), "wqhd 16:10", 10);
 
         float offset = 2.8f;
 
@@ -76,7 +81,6 @@ protected void onShow() {
 
         fullscreenButton.show();
         backButton.show();
-        restartButton.show();
     }
 
     @Override
@@ -101,4 +105,12 @@ public void update() {
             return;
         }
     }
+
+    public void updateResolution(int width, int height, float imageFactor, boolean isFullscreen) {
+        if(width != prefs.getInt("width", 1280) || height != prefs.getInt("height", 720) || isFullscreen != prefs.getBoolean("fullscreen", false)) {
+            restartButton.show();
+        }
+
+        app.updateResolution(width, height, imageFactor, isFullscreen);
+    }
 }