keep log window

This commit is contained in:
ShirosakiMio 2024-03-18 09:30:50 +08:00
parent 32ebf2580b
commit e44c70a636
2 changed files with 25 additions and 1 deletions

View File

@ -37,6 +37,8 @@ import com.tungsten.fclauncher.keycodes.FCLKeycodes;
import com.tungsten.fclauncher.utils.FCLPath; import com.tungsten.fclauncher.utils.FCLPath;
import com.tungsten.fclauncher.bridge.FCLBridge; import com.tungsten.fclauncher.bridge.FCLBridge;
import com.tungsten.fclauncher.bridge.FCLBridgeCallback; import com.tungsten.fclauncher.bridge.FCLBridgeCallback;
import com.tungsten.fclcore.fakefx.beans.InvalidationListener;
import com.tungsten.fclcore.fakefx.beans.Observable;
import com.tungsten.fclcore.fakefx.beans.binding.Bindings; import com.tungsten.fclcore.fakefx.beans.binding.Bindings;
import com.tungsten.fclcore.fakefx.beans.property.BooleanProperty; import com.tungsten.fclcore.fakefx.beans.property.BooleanProperty;
import com.tungsten.fclcore.fakefx.beans.property.IntegerProperty; import com.tungsten.fclcore.fakefx.beans.property.IntegerProperty;
@ -343,7 +345,12 @@ public class GameMenu implements MenuCallback, View.OnClickListener {
FXUtils.bindBoolean(disableGestureSwitch, menuSetting.disableGestureProperty()); FXUtils.bindBoolean(disableGestureSwitch, menuSetting.disableGestureProperty());
FXUtils.bindBoolean(disableBEGestureSwitch, menuSetting.disableBEGestureProperty()); FXUtils.bindBoolean(disableBEGestureSwitch, menuSetting.disableBEGestureProperty());
FXUtils.bindBoolean(gyroSwitch, menuSetting.enableGyroscopeProperty()); FXUtils.bindBoolean(gyroSwitch, menuSetting.enableGyroscopeProperty());
FXUtils.bindBoolean(showLogSwitch, logWindow.visibilityProperty()); FXUtils.bindBoolean(showLogSwitch, menuSetting.showLogProperty());
logWindow.visibilityProperty().setValue(menuSetting.isshowLog());
menuSetting.showLogProperty().addListener(observable -> {
logWindow.visibilityProperty().setValue(menuSetting.isshowLog());
});
ArrayList<GestureMode> gestureModeDataList = new ArrayList<>(); ArrayList<GestureMode> gestureModeDataList = new ArrayList<>();
gestureModeDataList.add(GestureMode.BUILD); gestureModeDataList.add(GestureMode.BUILD);

View File

@ -83,6 +83,20 @@ public class MenuSetting {
this.disableSoftKeyAdjustProperty.set(disableSoftKeyAdjust); this.disableSoftKeyAdjustProperty.set(disableSoftKeyAdjust);
} }
private final BooleanProperty showLogProperty = new SimpleBooleanProperty(this, "showLog", false);
public BooleanProperty showLogProperty() {
return showLogProperty;
}
public boolean isshowLog() {
return showLogProperty.get();
}
public void setShowLog(boolean showLog) {
this.showLogProperty.set(showLog);
}
private final DoubleProperty menuPositionXProperty = new SimpleDoubleProperty(this, "menuPositionX", 0.5d); private final DoubleProperty menuPositionXProperty = new SimpleDoubleProperty(this, "menuPositionX", 0.5d);
public DoubleProperty menuPositionXProperty() { public DoubleProperty menuPositionXProperty() {
@ -242,6 +256,7 @@ public class MenuSetting {
autoFitDistProperty.addListener(listener); autoFitDistProperty.addListener(listener);
lockMenuViewProperty.addListener(listener); lockMenuViewProperty.addListener(listener);
disableSoftKeyAdjustProperty.addListener(listener); disableSoftKeyAdjustProperty.addListener(listener);
showLogProperty.addListener(listener);
menuPositionXProperty.addListener(listener); menuPositionXProperty.addListener(listener);
menuPositionYProperty.addListener(listener); menuPositionYProperty.addListener(listener);
disableGestureProperty.addListener(listener); disableGestureProperty.addListener(listener);
@ -265,6 +280,7 @@ public class MenuSetting {
obj.addProperty("autoFitDist", src.getAutoFitDist()); obj.addProperty("autoFitDist", src.getAutoFitDist());
obj.addProperty("lockMenuView", src.isLockMenuView()); obj.addProperty("lockMenuView", src.isLockMenuView());
obj.addProperty("disableSoftKeyAdjust", src.isDisableSoftKeyAdjust()); obj.addProperty("disableSoftKeyAdjust", src.isDisableSoftKeyAdjust());
obj.addProperty("showLog", src.isshowLog());
obj.addProperty("menuPositionX", src.getMenuPositionX()); obj.addProperty("menuPositionX", src.getMenuPositionX());
obj.addProperty("menuPositionY", src.getMenuPositionY()); obj.addProperty("menuPositionY", src.getMenuPositionY());
obj.addProperty("disableGesture", src.isDisableGesture()); obj.addProperty("disableGesture", src.isDisableGesture());
@ -291,6 +307,7 @@ public class MenuSetting {
ms.setAutoFitDist(Optional.ofNullable(obj.get("autoFitDist")).map(JsonElement::getAsInt).orElse(0)); ms.setAutoFitDist(Optional.ofNullable(obj.get("autoFitDist")).map(JsonElement::getAsInt).orElse(0));
ms.setLockMenuView(Optional.ofNullable(obj.get("lockMenuView")).map(JsonElement::getAsBoolean).orElse(false)); ms.setLockMenuView(Optional.ofNullable(obj.get("lockMenuView")).map(JsonElement::getAsBoolean).orElse(false));
ms.setDisableSoftKeyAdjust(Optional.ofNullable(obj.get("disableSoftKeyAdjust")).map(JsonElement::getAsBoolean).orElse(false)); ms.setDisableSoftKeyAdjust(Optional.ofNullable(obj.get("disableSoftKeyAdjust")).map(JsonElement::getAsBoolean).orElse(false));
ms.setShowLog(Optional.ofNullable(obj.get("showLog")).map(JsonElement::getAsBoolean).orElse(false));
ms.setMenuPositionX(Optional.ofNullable(obj.get("menuPositionX")).map(JsonElement::getAsDouble).orElse(0.5d)); ms.setMenuPositionX(Optional.ofNullable(obj.get("menuPositionX")).map(JsonElement::getAsDouble).orElse(0.5d));
ms.setMenuPositionY(Optional.ofNullable(obj.get("menuPositionY")).map(JsonElement::getAsDouble).orElse(0.5d)); ms.setMenuPositionY(Optional.ofNullable(obj.get("menuPositionY")).map(JsonElement::getAsDouble).orElse(0.5d));
ms.setDisableGesture(Optional.ofNullable(obj.get("disableGesture")).map(JsonElement::getAsBoolean).orElse(false)); ms.setDisableGesture(Optional.ofNullable(obj.get("disableGesture")).map(JsonElement::getAsBoolean).orElse(false));