Skip to content

Commit

Permalink
✨ Push embedded monitor configuration changes to the frontend. (2/2)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hexawyz
hexawyz committed Feb 9, 2025
1 parent e420d55 commit 8664114
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/Exo/Service/Exo.Service.Grpc/GrpcConvert.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public static GrpcEmbeddedMonitorConfigurationUpdate ToGrpc(this EmbeddedMonitor
DeviceId = configurationUpdate.DeviceId,
MonitorId = configurationUpdate.MonitorId,
GraphicsId = configurationUpdate.GraphicsId,
ImageConfiguration = configurationUpdate.GraphicsId != default ?
ImageConfiguration = configurationUpdate.GraphicsId == default ?
new() { ImageId = configurationUpdate.ImageId, ImageRegion = configurationUpdate.ImageRegion.ToGrpc() } :
null,
};
Expand Down
142 changes: 135 additions & 7 deletions src/Exo/Ui/Exo.Settings.Ui/ViewModels/EmbeddedMonitorFeaturesViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ internal sealed class EmbeddedMonitorFeaturesViewModel : BindableObject, IDispos
private readonly ObservableCollection<EmbeddedMonitorViewModel> _embeddedMonitors;
private readonly ReadOnlyObservableCollection<EmbeddedMonitorViewModel> _readOnlyEmbeddedMonitors;
private readonly Dictionary<Guid, EmbeddedMonitorViewModel> _embeddedMonitorById;
private readonly Dictionary<Guid, EmbeddedMonitorConfigurationUpdate> _pendingConfigurationUpdates;
private bool _isExpanded;
private readonly PropertyChangedEventHandler _onRasterizationScaleProviderPropertyChanged;

Expand All @@ -37,6 +38,7 @@ IEmbeddedMonitorService embeddedMonitorService
_embeddedMonitorService = embeddedMonitorService;
_embeddedMonitors = new();
_embeddedMonitorById = new();
_pendingConfigurationUpdates = new();
_readOnlyEmbeddedMonitors = new(_embeddedMonitors);
_onRasterizationScaleProviderPropertyChanged = OnRasterizationScaleProviderPropertyChanged;
rasterizationScaleProvider.PropertyChanged += _onRasterizationScaleProviderPropertyChanged;
Expand Down Expand Up @@ -97,11 +99,23 @@ internal void UpdateInformation(EmbeddedMonitorDeviceInformation information)
_embeddedMonitorById.Add(monitorInformation.MonitorId, vm);
_embeddedMonitors.Add(vm);
}
if (_pendingConfigurationUpdates.Remove(monitorInformation.MonitorId, out var configuration))
{
vm.UpdateConfiguration(configuration);
}
}
}

internal void UpdateConfiguration(EmbeddedMonitorConfigurationUpdate configuration)
{
if (_embeddedMonitorById.TryGetValue(configuration.MonitorId, out var monitor))
{
monitor.UpdateConfiguration(configuration);
}
else
{
_pendingConfigurationUpdates.Add(configuration.MonitorId, configuration);
}
}
}

Expand All @@ -114,7 +128,7 @@ internal sealed class EmbeddedMonitorViewModel : ApplicableResettableBindableObj
private EmbeddedMonitorCapabilities _capabilities;
private readonly ObservableCollection<EmbeddedMonitorGraphicsViewModel> _supportedGraphics;
private readonly ReadOnlyObservableCollection<EmbeddedMonitorGraphicsViewModel> _readOnlySupportedGraphics;
private EmbeddedMonitorGraphicsViewModel? _initialCurrentGraphics;
private Guid _initialCurrentGraphicsId;
private EmbeddedMonitorGraphicsViewModel? _currentGraphics;

public EmbeddedMonitorViewModel(EmbeddedMonitorFeaturesViewModel owner, EmbeddedMonitorInformation information)
Expand All @@ -141,12 +155,13 @@ public EmbeddedMonitorViewModel(EmbeddedMonitorFeaturesViewModel owner, Embedded
_readOnlySupportedGraphics = new(_supportedGraphics);
if (_supportedGraphics.Count > 0)
{
_initialCurrentGraphics = _currentGraphics = imageGraphics ?? _supportedGraphics[0];
_currentGraphics = imageGraphics ?? _supportedGraphics[0];
_initialCurrentGraphicsId = _currentGraphics.Id;
}
}

private bool IsChangedExceptGraphics => !ReferenceEquals(_initialCurrentGraphics, _currentGraphics);
public override bool IsChanged => IsChangedExceptGraphics || CurrentGraphics?.IsChanged == true;
private bool IsChangedNonRecursive => _currentGraphics?.Id != _initialCurrentGraphicsId;
public override bool IsChanged => IsChangedNonRecursive || CurrentGraphics?.IsChanged == true;
protected override bool CanApply => IsChanged && _currentGraphics?.IsValid == true;

public Guid MonitorId => _monitorId;
Expand Down Expand Up @@ -230,7 +245,7 @@ internal void NotifyDpiChange()

internal void NotifyGraphicsChanged(EmbeddedMonitorGraphicsViewModel graphics, bool isChanged)
{
if (ReferenceEquals(graphics, _currentGraphics) && !IsChangedExceptGraphics)
if (ReferenceEquals(graphics, _currentGraphics) && !IsChangedNonRecursive)
{
OnChanged(isChanged);
}
Expand All @@ -248,7 +263,55 @@ protected override async Task ApplyChangesAsync(CancellationToken cancellationTo

protected override void Reset()
{
CurrentGraphics = _initialCurrentGraphics;
foreach (var supportedGraphics in _supportedGraphics)
{
if (supportedGraphics.Id == _initialCurrentGraphicsId)
{
CurrentGraphics = supportedGraphics;
break;
}
}
_currentGraphics?.Reset();
}

internal void UpdateConfiguration(EmbeddedMonitorConfigurationUpdate configuration)
{
bool wasChanged = IsChanged;

EmbeddedMonitorGraphicsViewModel? newGraphics = null;
if (_currentGraphics?.Id == configuration.GraphicsId)
{
newGraphics = _currentGraphics;
}
else
{
foreach (var supportedGraphics in _supportedGraphics)
{
if (supportedGraphics.Id == configuration.GraphicsId)
{
newGraphics = supportedGraphics;
break;
}
}
}

// Just as a small optimization, we update the contents of the graphics first, so that in the event where it is not the one displayed, we will avoid unnecessary UI updates.
if (newGraphics is not null && configuration.GraphicsId == default && configuration.ImageConfiguration is { } imageConfiguration)
{
((EmbeddedMonitorImageGraphicsViewModel)newGraphics).UpdateConfiguration(imageConfiguration);
}

if (_initialCurrentGraphicsId != configuration.GraphicsId)
{
if (_currentGraphics is null ? newGraphics is not null : (_currentGraphics.Id == _initialCurrentGraphicsId && newGraphics is not null))
{
_currentGraphics = newGraphics;
NotifyPropertyChanged(ChangedProperty.CurrentGraphics);
}
_initialCurrentGraphicsId = configuration.GraphicsId;
}

OnChangeStateChange(wasChanged);
}
}

Expand Down Expand Up @@ -288,6 +351,8 @@ protected override void OnChanged(bool isChanged)
}

internal abstract ValueTask ApplyAsync(CancellationToken cancellationToken);

internal virtual void Reset() { }
}

internal sealed class EmbeddedMonitorBuiltInGraphicsViewModel : EmbeddedMonitorGraphicsViewModel
Expand Down Expand Up @@ -315,6 +380,7 @@ internal override async ValueTask ApplyAsync(CancellationToken cancellationToken
internal sealed class EmbeddedMonitorImageGraphicsViewModel : EmbeddedMonitorGraphicsViewModel, IDisposable
{
private UInt128 _initialImageId;
private Rectangle _initialCropRectangle;
private Rectangle _cropRectangle;
private ImageViewModel? _image;
private readonly PropertyChangedEventHandler _onMonitorPropertyChanged;
Expand Down Expand Up @@ -344,7 +410,7 @@ private void OnMonitorPropertyChanged(object? sender, PropertyChangedEventArgs e
}
}

public override bool IsChanged => (_image?.Id).GetValueOrDefault() != _initialImageId;
public override bool IsChanged => (_image?.Id).GetValueOrDefault() != _initialImageId || _initialCropRectangle != _cropRectangle;

public override bool IsValid => _image is not null && IsRegionValid(_cropRectangle);

Expand Down Expand Up @@ -432,4 +498,66 @@ await Monitor.Owner.EmbeddedMonitorService.SetImageAsync
cancellationToken
);
}

internal void UpdateConfiguration(EmbeddedMonitorImageConfiguration configuration)
{
bool wasChanged = IsChanged;
bool imageChanged = false;
bool cropRectangleChanged = false;
if (_initialImageId != configuration.ImageId)
{
if (_image is null || _image.Id == _initialImageId)
{
foreach (var image in AvailableImages)
{
if (image.Id == configuration.ImageId)
{
_image = image;
imageChanged = true;
break;
}
}
}
_initialImageId = configuration.ImageId;
}
if (_initialCropRectangle != configuration.ImageRegion)
{
if (_cropRectangle == _initialCropRectangle)
{
_cropRectangle = configuration.ImageRegion;
cropRectangleChanged = true;
}
_initialCropRectangle = configuration.ImageRegion;
}
if (imageChanged) NotifyPropertyChanged(ChangedProperty.Image);
if (cropRectangleChanged) NotifyPropertyChanged(ChangedProperty.CropRectangle);
OnChangeStateChange(wasChanged);
}

internal override void Reset()
{
if (!IsChanged) return;
bool imageChanged = false;
bool cropRectangleChanged = false;
if (_image?.Id != _initialImageId)
{
foreach (var image in AvailableImages)
{
if (image.Id == _initialImageId)
{
_image = image;
imageChanged = true;
break;
}
}
}
if (_cropRectangle != _initialCropRectangle)
{
_cropRectangle = _initialCropRectangle;
cropRectangleChanged = true;
}
if (imageChanged) NotifyPropertyChanged(ChangedProperty.Image);
if (cropRectangleChanged) NotifyPropertyChanged(ChangedProperty.CropRectangle);
OnChangeStateChange(true);
}
}

0 comments on commit 8664114

Please sign in to comment.