Remove backgroundImageProperty

HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java

@@ -308,27 +308,6 @@ public class Settings {
      *              BACKGROUND              *
      ****************************************/
 
-    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", ConfigHolder.CONFIG.backgroundImage.get()) {
-        @Override
-        public void invalidated() {
-            super.invalidated();
-
-            ConfigHolder.CONFIG.backgroundImage.set(get());
-        }
-    };
-
-    public String getBackgroundImage() {
-        return backgroundImage.get();
-    }
-
-    public ImmediateStringProperty backgroundImageProperty() {
-        return backgroundImage;
-    }
-
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage.set(backgroundImage);
-    }
-
     private final ImmediateObjectProperty<EnumBackgroundImage> backgroundImageType = new ImmediateObjectProperty<EnumBackgroundImage>(this, "backgroundImageType", EnumBackgroundImage.indexOf(ConfigHolder.CONFIG.backgroundImageType.get())) {
         @Override
         public void invalidated() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java

@@ -55,6 +55,7 @@ import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDnD;
+import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
@@ -222,7 +223,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
             if (Settings.INSTANCE.getBackgroundImageType() == EnumBackgroundImage.DEFAULT)
                 background = searchBackgroundImage(new Image("/assets/img/background.jpg"), "");
             else
-                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), Settings.INSTANCE.getBackgroundImage());
+                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), ConfigHolder.CONFIG.backgroundImage.get());
 
             drawerWrapper.setBackground(new Background(new BackgroundImage(background, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))));
         } catch (IllegalArgumentException ignore) {

HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java

@@ -44,6 +44,7 @@ import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.i18n.Locales;
 
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.net.Proxy;
@@ -186,12 +187,12 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
                 backgroundItem.createChildren(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
         ));
 
-        FXUtils.bindString(backgroundItem.getTxtCustom(), Settings.INSTANCE.backgroundImageProperty());
+        FXUtils.bindString(backgroundItem.getTxtCustom(), ConfigHolder.CONFIG.backgroundImage);
 
         backgroundItem.setCustomUserData(EnumBackgroundImage.CUSTOM);
         backgroundItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Settings.INSTANCE.getBackgroundImageType()).findFirst().ifPresent(it -> it.setSelected(true));
 
-        Settings.INSTANCE.backgroundImageProperty().setChangedListener(it -> initBackgroundItemSubtitle());
+        ConfigHolder.CONFIG.backgroundImage.addListener(onInvalidating(this::initBackgroundItemSubtitle));
         Settings.INSTANCE.backgroundImageTypeProperty().setChangedListener(it -> initBackgroundItemSubtitle());
         initBackgroundItemSubtitle();
 
@@ -218,7 +219,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
                 backgroundItem.setSubtitle(i18n("launcher.background.default"));
                 break;
             case CUSTOM:
-                backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
+                backgroundItem.setSubtitle(ConfigHolder.CONFIG.backgroundImage.get());
                 break;
         }
     }