Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions FancyWM/Models/AppState.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.IO;
using System;
using System.IO;
using System.Text.Json;
using System.Text.Json.Serialization;

Expand All @@ -10,11 +11,23 @@ public class AppState

public AppState()
{
Settings = new ObservableJsonEntity<Settings>(Path.GetFullPath("settings.json"),
string SettingsDirectory;
string SettingsFile;

#pragma warning disable CS8600
SettingsDirectory = Environment.GetEnvironmentVariable("FANCYWM_CONF_DIR");
#pragma warning restore CS8600

if (SettingsDirectory == null)
SettingsFile = Path.GetFullPath("settings.json");
else
SettingsFile = Path.GetFullPath("settings.json", SettingsDirectory);

Settings = new ObservableJsonEntity<Settings>(SettingsFile,
() => new Settings
{
AutoCollapsePanels = true,
},
},
new JsonSerializerOptions
{
AllowTrailingCommas = true,
Expand Down