From 194780b25c2f51433c9da76c3d69a5cae3eeefb3 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Sun, 27 Nov 2022 01:54:50 +0000 Subject: [PATCH 1/5] Core - Added fading in and out of profiles --- src/Artemis.Core/Models/Profile/Profile.cs | 45 ++++++++++++++++++- .../ProfileConfiguration.cs | 12 +++++ .../Services/Storage/ProfileService.cs | 19 +++++++- .../Profile/ProfileConfigurationEntity.cs | 2 + .../ProfileConfigurationEditView.axaml | 3 ++ .../ProfileConfigurationEditViewModel.cs | 9 ++++ 6 files changed, 87 insertions(+), 3 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index 5534e686d..7bbde4bd3 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -8,6 +8,15 @@ using SkiaSharp; namespace Artemis.Core; + +internal enum FadingStatus +{ + Enabled, + FadingIn, + FadingOut, + Disabled +} + /// /// Represents a profile containing folders and layers /// @@ -18,12 +27,15 @@ public sealed class Profile : ProfileElement private readonly ObservableCollection _scripts; private bool _isFreshImport; private ProfileElement? _lastSelectedProfileElement; + private double _opacity; internal Profile(ProfileConfiguration configuration, ProfileEntity profileEntity) : base(null!) { _scripts = new ObservableCollection(); _scriptConfigurations = new ObservableCollection(); - + _opacity = 0d; + + FadingStatus = FadingStatus.FadingIn; Configuration = configuration; Profile = this; ProfileEntity = profileEntity; @@ -81,6 +93,8 @@ public sealed class Profile : ProfileElement internal List Exceptions { get; } + internal FadingStatus FadingStatus { get; private set; } + /// public override void Update(double deltaTime) { @@ -97,6 +111,16 @@ public sealed class Profile : ProfileElement foreach (ProfileScript profileScript in Scripts) profileScript.OnProfileUpdated(deltaTime); + + const double OPACITY_PER_SECOND = 1; + if (FadingStatus == FadingStatus.FadingIn) + _opacity = Math.Clamp(_opacity + OPACITY_PER_SECOND * deltaTime, 0d, 1d); + if (FadingStatus == FadingStatus.FadingOut) + _opacity = Math.Clamp(_opacity - OPACITY_PER_SECOND * deltaTime, 0d, 1d); + if (_opacity == 0d) + FadingStatus = FadingStatus.Disabled; + if (_opacity == 1d) + FadingStatus = FadingStatus.Enabled; } } @@ -111,9 +135,17 @@ public sealed class Profile : ProfileElement foreach (ProfileScript profileScript in Scripts) profileScript.OnProfileRendering(canvas, canvas.LocalClipBounds); + using var opacityPaint = new SKPaint(); + if (Configuration.FadeInAndOut && FadingStatus != FadingStatus.Enabled) + opacityPaint.Color = new SKColor(0, 0, 0, (byte)(255d * Easings.CubicEaseInOut(_opacity))); + + canvas.SaveLayer(opacityPaint); + foreach (ProfileElement profileElement in Children) profileElement.Render(canvas, basePosition, editorFocus); + canvas.Restore(); + foreach (ProfileScript profileScript in Scripts) profileScript.OnProfileRendered(canvas, canvas.LocalClipBounds); @@ -165,6 +197,17 @@ public sealed class Profile : ProfileElement layer.PopulateLeds(devices); } + /// + /// Starts the fade out process. + /// + public void FadeOut() + { + if (Disposed) + throw new ObjectDisposedException("Profile"); + + FadingStatus = FadingStatus.FadingOut; + } + #region Overrides of BreakableModel /// diff --git a/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs b/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs index 3390a2863..b349acfd1 100644 --- a/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs +++ b/src/Artemis.Core/Models/ProfileConfiguration/ProfileConfiguration.cs @@ -21,6 +21,7 @@ public class ProfileConfiguration : BreakableModel, IStorageModel, IDisposable private bool _isBeingEdited; private bool _isMissingModule; private bool _isSuspended; + private bool _fadeInAndOut; private Module? _module; private string _name; @@ -160,6 +161,15 @@ public class ProfileConfiguration : BreakableModel, IStorageModel, IDisposable internal set => SetAndNotify(ref _profile, value); } + /// + /// Gets or sets a boolean indicating whether this profile should fade in and out when enabling or disabling + /// + public bool FadeInAndOut + { + get => _fadeInAndOut; + set => SetAndNotify(ref _fadeInAndOut, value); + } + /// /// Gets or sets the module this profile uses /// @@ -272,6 +282,7 @@ public class ProfileConfiguration : BreakableModel, IStorageModel, IDisposable IsSuspended = Entity.IsSuspended; ActivationBehaviour = (ActivationBehaviour) Entity.ActivationBehaviour; HotkeyMode = (ProfileConfigurationHotkeyMode) Entity.HotkeyMode; + FadeInAndOut = Entity.FadeInAndOut; Order = Entity.Order; Icon.Load(); @@ -294,6 +305,7 @@ public class ProfileConfiguration : BreakableModel, IStorageModel, IDisposable Entity.ActivationBehaviour = (int) ActivationBehaviour; Entity.HotkeyMode = (int) HotkeyMode; Entity.ProfileCategoryId = Category.Entity.Id; + Entity.FadeInAndOut = FadeInAndOut; Entity.Order = Order; Icon.Save(); diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index d5adc7d87..6a0c2ad52 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -214,7 +214,12 @@ internal class ProfileService : IProfileService if (shouldBeActive && profileConfiguration.Profile == null && profileConfiguration.BrokenState != "Failed to activate profile") profileConfiguration.TryOrBreak(() => ActivateProfile(profileConfiguration), "Failed to activate profile"); else if (!shouldBeActive && profileConfiguration.Profile != null) - DeactivateProfile(profileConfiguration); + { + if (!profileConfiguration.FadeInAndOut || profileConfiguration.Profile.FadingStatus == FadingStatus.Disabled) + DeactivateProfile(profileConfiguration); + else if (profileConfiguration.Profile.FadingStatus == FadingStatus.Enabled) + RequestDeactivation(profileConfiguration); + } profileConfiguration.Profile?.Update(deltaTime); } @@ -254,7 +259,7 @@ internal class ProfileService : IProfileService { ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j]; // Ensure all criteria are met before rendering - if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && profileConfiguration.ActivationConditionMet) + if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || profileConfiguration.Profile?.FadingStatus == FadingStatus.FadingOut)) profileConfiguration.Profile?.Render(canvas, SKPointI.Empty, null); } catch (Exception e) @@ -361,6 +366,16 @@ internal class ProfileService : IProfileService OnProfileDeactivated(new ProfileConfigurationEventArgs(profileConfiguration)); } + public void RequestDeactivation(ProfileConfiguration profileConfiguration) + { + if (profileConfiguration.IsBeingEdited) + throw new ArtemisCoreException("Cannot disable a profile that is being edited, that's rude"); + if (profileConfiguration.Profile == null) + return; + + profileConfiguration.Profile.FadeOut(); + } + public void DeleteProfile(ProfileConfiguration profileConfiguration) { DeactivateProfile(profileConfiguration); diff --git a/src/Artemis.Storage/Entities/Profile/ProfileConfigurationEntity.cs b/src/Artemis.Storage/Entities/Profile/ProfileConfigurationEntity.cs index 377d78ce7..e91ddcc96 100644 --- a/src/Artemis.Storage/Entities/Profile/ProfileConfigurationEntity.cs +++ b/src/Artemis.Storage/Entities/Profile/ProfileConfigurationEntity.cs @@ -25,4 +25,6 @@ public class ProfileConfigurationEntity public Guid ProfileCategoryId { get; set; } public Guid ProfileId { get; set; } + + public bool FadeInAndOut { get; set; } } \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml index fed01edac..a127cdc14 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditView.axaml @@ -127,6 +127,9 @@ + + Fade when enabling and disabling + diff --git a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs index ed55d14c3..fe773c4f5 100644 --- a/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs +++ b/src/Artemis.UI/Screens/Sidebar/Dialogs/ProfileConfigurationEditViewModel.cs @@ -30,6 +30,7 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase? _materialIcons; @@ -57,6 +58,7 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase RaiseAndSetIfChanged(ref _disableHotkey, value); } + public bool FadeInAndOut + { + get => _fadeInAndOut; + set => RaiseAndSetIfChanged(ref _fadeInAndOut, value); + } + public ObservableCollection Modules { get; } public ProfileModuleViewModel? SelectedModule @@ -155,6 +163,7 @@ public class ProfileConfigurationEditViewModel : DialogViewModelBase Date: Sun, 27 Nov 2022 17:07:55 +0000 Subject: [PATCH 2/5] Core - Removed FadingStatus enum --- src/Artemis.Core/Models/Profile/Profile.cs | 37 +++++++------------ .../Services/Storage/ProfileService.cs | 8 ++-- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index 7bbde4bd3..213ca0553 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -8,15 +8,6 @@ using SkiaSharp; namespace Artemis.Core; - -internal enum FadingStatus -{ - Enabled, - FadingIn, - FadingOut, - Disabled -} - /// /// Represents a profile containing folders and layers /// @@ -27,15 +18,14 @@ public sealed class Profile : ProfileElement private readonly ObservableCollection _scripts; private bool _isFreshImport; private ProfileElement? _lastSelectedProfileElement; - private double _opacity; internal Profile(ProfileConfiguration configuration, ProfileEntity profileEntity) : base(null!) { _scripts = new ObservableCollection(); _scriptConfigurations = new ObservableCollection(); - _opacity = 0d; - FadingStatus = FadingStatus.FadingIn; + Opacity = 0d; + ShouldBeEnabled = true; Configuration = configuration; Profile = this; ProfileEntity = profileEntity; @@ -93,7 +83,9 @@ public sealed class Profile : ProfileElement internal List Exceptions { get; } - internal FadingStatus FadingStatus { get; private set; } + internal bool ShouldBeEnabled { get; private set; } + + internal double Opacity { get; private set; } /// public override void Update(double deltaTime) @@ -113,14 +105,11 @@ public sealed class Profile : ProfileElement profileScript.OnProfileUpdated(deltaTime); const double OPACITY_PER_SECOND = 1; - if (FadingStatus == FadingStatus.FadingIn) - _opacity = Math.Clamp(_opacity + OPACITY_PER_SECOND * deltaTime, 0d, 1d); - if (FadingStatus == FadingStatus.FadingOut) - _opacity = Math.Clamp(_opacity - OPACITY_PER_SECOND * deltaTime, 0d, 1d); - if (_opacity == 0d) - FadingStatus = FadingStatus.Disabled; - if (_opacity == 1d) - FadingStatus = FadingStatus.Enabled; + + if (ShouldBeEnabled && Opacity < 1) + Opacity = Math.Clamp(Opacity + OPACITY_PER_SECOND * deltaTime, 0d, 1d); + if (!ShouldBeEnabled && Opacity > 0) + Opacity = Math.Clamp(Opacity - OPACITY_PER_SECOND * deltaTime, 0d, 1d); } } @@ -136,8 +125,8 @@ public sealed class Profile : ProfileElement profileScript.OnProfileRendering(canvas, canvas.LocalClipBounds); using var opacityPaint = new SKPaint(); - if (Configuration.FadeInAndOut && FadingStatus != FadingStatus.Enabled) - opacityPaint.Color = new SKColor(0, 0, 0, (byte)(255d * Easings.CubicEaseInOut(_opacity))); + if (Configuration.FadeInAndOut && Opacity != 1) + opacityPaint.Color = new SKColor(0, 0, 0, (byte)(255d * Easings.CubicEaseInOut(Opacity))); canvas.SaveLayer(opacityPaint); @@ -205,7 +194,7 @@ public sealed class Profile : ProfileElement if (Disposed) throw new ObjectDisposedException("Profile"); - FadingStatus = FadingStatus.FadingOut; + ShouldBeEnabled = false; } #region Overrides of BreakableModel diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 6a0c2ad52..ae403e05c 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -215,9 +215,11 @@ internal class ProfileService : IProfileService profileConfiguration.TryOrBreak(() => ActivateProfile(profileConfiguration), "Failed to activate profile"); else if (!shouldBeActive && profileConfiguration.Profile != null) { - if (!profileConfiguration.FadeInAndOut || profileConfiguration.Profile.FadingStatus == FadingStatus.Disabled) + if (!profileConfiguration.FadeInAndOut) DeactivateProfile(profileConfiguration); - else if (profileConfiguration.Profile.FadingStatus == FadingStatus.Enabled) + else if (!profileConfiguration.Profile.ShouldBeEnabled && profileConfiguration.Profile.Opacity <= 0) + DeactivateProfile(profileConfiguration); + else if (profileConfiguration.Profile.ShouldBeEnabled && profileConfiguration.Profile.Opacity >= 1) RequestDeactivation(profileConfiguration); } @@ -259,7 +261,7 @@ internal class ProfileService : IProfileService { ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j]; // Ensure all criteria are met before rendering - if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || profileConfiguration.Profile?.FadingStatus == FadingStatus.FadingOut)) + if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || (profileConfiguration.Profile?.ShouldBeEnabled == false && profileConfiguration.Profile?.Opacity >= 0))) profileConfiguration.Profile?.Render(canvas, SKPointI.Empty, null); } catch (Exception e) From b39dd14526dc6d4bda354bb99e93a18a182561e1 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Sun, 27 Nov 2022 19:59:09 +0000 Subject: [PATCH 3/5] Core - Fixed when condition stops being true mid-fade --- src/Artemis.Core/Models/Profile/Profile.cs | 19 ++++--------------- .../Services/Storage/ProfileService.cs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index 213ca0553..4d68dda3e 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -25,7 +25,7 @@ public sealed class Profile : ProfileElement _scriptConfigurations = new ObservableCollection(); Opacity = 0d; - ShouldBeEnabled = true; + ShouldDisplay = true; Configuration = configuration; Profile = this; ProfileEntity = profileEntity; @@ -83,7 +83,7 @@ public sealed class Profile : ProfileElement internal List Exceptions { get; } - internal bool ShouldBeEnabled { get; private set; } + internal bool ShouldDisplay { get; set; } internal double Opacity { get; private set; } @@ -106,9 +106,9 @@ public sealed class Profile : ProfileElement const double OPACITY_PER_SECOND = 1; - if (ShouldBeEnabled && Opacity < 1) + if (ShouldDisplay && Opacity < 1) Opacity = Math.Clamp(Opacity + OPACITY_PER_SECOND * deltaTime, 0d, 1d); - if (!ShouldBeEnabled && Opacity > 0) + if (!ShouldDisplay && Opacity > 0) Opacity = Math.Clamp(Opacity - OPACITY_PER_SECOND * deltaTime, 0d, 1d); } } @@ -186,17 +186,6 @@ public sealed class Profile : ProfileElement layer.PopulateLeds(devices); } - /// - /// Starts the fade out process. - /// - public void FadeOut() - { - if (Disposed) - throw new ObjectDisposedException("Profile"); - - ShouldBeEnabled = false; - } - #region Overrides of BreakableModel /// diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index ae403e05c..801419d52 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; @@ -213,13 +213,15 @@ internal class ProfileService : IProfileService // Make sure the profile is active or inactive according to the parameters above if (shouldBeActive && profileConfiguration.Profile == null && profileConfiguration.BrokenState != "Failed to activate profile") profileConfiguration.TryOrBreak(() => ActivateProfile(profileConfiguration), "Failed to activate profile"); + if (shouldBeActive && profileConfiguration.Profile != null && !profileConfiguration.Profile.ShouldDisplay) + profileConfiguration.Profile.ShouldDisplay = true; else if (!shouldBeActive && profileConfiguration.Profile != null) { if (!profileConfiguration.FadeInAndOut) DeactivateProfile(profileConfiguration); - else if (!profileConfiguration.Profile.ShouldBeEnabled && profileConfiguration.Profile.Opacity <= 0) + else if (!profileConfiguration.Profile.ShouldDisplay && profileConfiguration.Profile.Opacity <= 0) DeactivateProfile(profileConfiguration); - else if (profileConfiguration.Profile.ShouldBeEnabled && profileConfiguration.Profile.Opacity >= 1) + else if (profileConfiguration.Profile.Opacity > 0) RequestDeactivation(profileConfiguration); } @@ -261,7 +263,7 @@ internal class ProfileService : IProfileService { ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j]; // Ensure all criteria are met before rendering - if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || (profileConfiguration.Profile?.ShouldBeEnabled == false && profileConfiguration.Profile?.Opacity >= 0))) + if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || (profileConfiguration.Profile?.ShouldDisplay == false && profileConfiguration.Profile?.Opacity >= 0))) profileConfiguration.Profile?.Render(canvas, SKPointI.Empty, null); } catch (Exception e) @@ -323,7 +325,10 @@ internal class ProfileService : IProfileService public Profile ActivateProfile(ProfileConfiguration profileConfiguration) { if (profileConfiguration.Profile != null) + { + profileConfiguration.Profile.ShouldDisplay = true; return profileConfiguration.Profile; + } ProfileEntity profileEntity; try @@ -375,7 +380,7 @@ internal class ProfileService : IProfileService if (profileConfiguration.Profile == null) return; - profileConfiguration.Profile.FadeOut(); + profileConfiguration.Profile.ShouldDisplay = false; } public void DeleteProfile(ProfileConfiguration profileConfiguration) From 5877e4dd208e310d40fae1f22645e41f83c83046 Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Sun, 27 Nov 2022 20:04:04 +0000 Subject: [PATCH 4/5] Cleaned up ProfileService render condition --- src/Artemis.Core/Models/Profile/Profile.cs | 2 +- src/Artemis.Core/Services/Storage/ProfileService.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index 4d68dda3e..e5899b6aa 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -125,7 +125,7 @@ public sealed class Profile : ProfileElement profileScript.OnProfileRendering(canvas, canvas.LocalClipBounds); using var opacityPaint = new SKPaint(); - if (Configuration.FadeInAndOut && Opacity != 1) + if (Configuration.FadeInAndOut && Opacity < 1) opacityPaint.Color = new SKColor(0, 0, 0, (byte)(255d * Easings.CubicEaseInOut(Opacity))); canvas.SaveLayer(opacityPaint); diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs index 801419d52..4b86f3d55 100644 --- a/src/Artemis.Core/Services/Storage/ProfileService.cs +++ b/src/Artemis.Core/Services/Storage/ProfileService.cs @@ -263,7 +263,8 @@ internal class ProfileService : IProfileService { ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j]; // Ensure all criteria are met before rendering - if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || (profileConfiguration.Profile?.ShouldDisplay == false && profileConfiguration.Profile?.Opacity >= 0))) + bool fadingOut = profileConfiguration.Profile?.ShouldDisplay == false && profileConfiguration.Profile?.Opacity > 0; + if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && (profileConfiguration.ActivationConditionMet || fadingOut)) profileConfiguration.Profile?.Render(canvas, SKPointI.Empty, null); } catch (Exception e) From c8a31696884ec139256a717e6efd302d2d3117be Mon Sep 17 00:00:00 2001 From: Diogo Trindade Date: Wed, 11 Jan 2023 09:43:47 +0000 Subject: [PATCH 5/5] Core - Apply opacity layer only when fading --- src/Artemis.Core/Models/Profile/Profile.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Artemis.Core/Models/Profile/Profile.cs b/src/Artemis.Core/Models/Profile/Profile.cs index e5899b6aa..c511f9ec9 100644 --- a/src/Artemis.Core/Models/Profile/Profile.cs +++ b/src/Artemis.Core/Models/Profile/Profile.cs @@ -123,17 +123,25 @@ public sealed class Profile : ProfileElement foreach (ProfileScript profileScript in Scripts) profileScript.OnProfileRendering(canvas, canvas.LocalClipBounds); - - using var opacityPaint = new SKPaint(); - if (Configuration.FadeInAndOut && Opacity < 1) + + SKPaint? opacityPaint = null; + bool applyOpacityLayer = Configuration.FadeInAndOut && Opacity < 1; + + if (applyOpacityLayer) + { + opacityPaint = new SKPaint(); opacityPaint.Color = new SKColor(0, 0, 0, (byte)(255d * Easings.CubicEaseInOut(Opacity))); - - canvas.SaveLayer(opacityPaint); + canvas.SaveLayer(opacityPaint); + } foreach (ProfileElement profileElement in Children) profileElement.Render(canvas, basePosition, editorFocus); - canvas.Restore(); + if (applyOpacityLayer) + { + canvas.Restore(); + opacityPaint?.Dispose(); + } foreach (ProfileScript profileScript in Scripts) profileScript.OnProfileRendered(canvas, canvas.LocalClipBounds);