diff --git a/DisplayMagicianShared/AMD/AMDProfileItem.cs b/DisplayMagicianShared/AMD/AMDProfileItem.cs index bf99d3c..439b6d4 100644 --- a/DisplayMagicianShared/AMD/AMDProfileItem.cs +++ b/DisplayMagicianShared/AMD/AMDProfileItem.cs @@ -111,7 +111,7 @@ namespace DisplayMagicianShared.AMD } } - [JsonRequired] + /*[JsonRequired] public override List Screens { get @@ -135,8 +135,8 @@ namespace DisplayMagicianShared.AMD { get { - /*if (!ProfileRepository.ProfilesLoaded) - return null;*/ + *//*if (!ProfileRepository.ProfilesLoaded) + return null;*//* if (_profileBitmap != null) return _profileBitmap; @@ -154,9 +154,8 @@ namespace DisplayMagicianShared.AMD } - //[JsonConverter(typeof(CustomBitmapConverter))] - - /*public override Bitmap ProfileTightestBitmap + [JsonConverter(typeof(CustomBitmapConverter))] + public override Bitmap ProfileTightestBitmap { get { diff --git a/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs b/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs index 4bd82ad..7dce16e 100644 --- a/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs +++ b/DisplayMagicianShared/NVIDIA/NVIDIAProfileItem.cs @@ -132,7 +132,7 @@ namespace DisplayMagicianShared.NVIDIA } } - [JsonRequired] + /*[JsonRequired] public override List Screens { get @@ -170,6 +170,26 @@ namespace DisplayMagicianShared.NVIDIA } + [JsonConverter(typeof(CustomBitmapConverter))] + public override Bitmap ProfileTightestBitmap + { + get + { + if (_profileShortcutBitmap != null) + return _profileShortcutBitmap; + else + { + _profileShortcutBitmap = this.ProfileIcon.ToTightestBitmap(); + return _profileShortcutBitmap; + } + } + set + { + _profileShortcutBitmap = value; + } + + }*/ + #endregion public override bool IsValid() diff --git a/DisplayMagicianShared/ProfileItem.cs b/DisplayMagicianShared/ProfileItem.cs index f568721..caae129 100644 --- a/DisplayMagicianShared/ProfileItem.cs +++ b/DisplayMagicianShared/ProfileItem.cs @@ -58,7 +58,7 @@ namespace DisplayMagicianShared private ProfileIcon _profileIcon; private Bitmap _profileBitmap, _profileShortcutBitmap; private List _profileDisplayIdentifiers = new List(); - private List _screens; + private List _screens = new List(); internal static string AppDataPath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DisplayMagician"); private static readonly string uuidV4Regex = @"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$"; @@ -196,9 +196,6 @@ namespace DisplayMagicianShared public virtual string Name { get; set; } - //public Topology.Path[] Paths { get; set; } = new Topology.Path[0]; - - //public virtual ProfileData { get; set; } [JsonIgnore] public virtual ProfileIcon ProfileIcon @@ -220,7 +217,7 @@ namespace DisplayMagicianShared } - [JsonRequired] + [JsonIgnore] public virtual List Screens { get diff --git a/DisplayMagicianShared/Windows/WinProfileItem.cs b/DisplayMagicianShared/Windows/WinProfileItem.cs index 8a40ed3..255b6fe 100644 --- a/DisplayMagicianShared/Windows/WinProfileItem.cs +++ b/DisplayMagicianShared/Windows/WinProfileItem.cs @@ -96,7 +96,7 @@ namespace DisplayMagicianShared.Windows } } - [JsonRequired] + /*[JsonRequired] public override List Screens { get @@ -120,8 +120,8 @@ namespace DisplayMagicianShared.Windows { get { - /*if (!ProfileRepository.ProfilesLoaded) - return null;*/ + *//*if (!ProfileRepository.ProfilesLoaded) + return null;*//* if (_profileBitmap != null) return _profileBitmap; @@ -137,7 +137,7 @@ namespace DisplayMagicianShared.Windows } } - +*/ /*[JsonConverter(typeof(CustomBitmapConverter))] public override Bitmap ProfileTightestBitmap