mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 11:56:30 +00:00
Merge branch 'development' into feature/workshop
This commit is contained in:
commit
2a3fd30313
19 files changed
+89
-65
No files matched your search
@@ -63,12 +63,7 @@ public partial class VisualEditorView : ReactiveUserControl<VisualEditorViewMode
|
||||
private void UpdateZoomBorderBackground()
|
||||
{
|
||||
if (ZoomBorder.Background is VisualBrush visualBrush)
|
||||
{
|
||||
visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
|
||||
// Workaround
|
||||
// This fixes an issue where the container is not invalidated, which leaves behind a 'smear' since Avalonia 11 rc1, check if still required later
|
||||
ZoomBorder.InvalidateVisual();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -48,11 +48,6 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
|
||||
private void UpdateZoomBorderBackground()
|
||||
{
|
||||
if (ContainerZoomBorder.Background is VisualBrush visualBrush)
|
||||
{
|
||||
visualBrush.DestinationRect = new RelativeRect(ContainerZoomBorder.OffsetX * -1, ContainerZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
|
||||
// Workaround
|
||||
// This fixes an issue where the container is not invalidated, which leaves behind a 'smear' since Avalonia 11 rc1, check if still required later
|
||||
ContainerZoomBorder.InvalidateVisual();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -136,6 +136,10 @@ public class SurfaceEditorViewModel : ActivatableViewModelBase, IMainScreenViewM
|
||||
_saving = true;
|
||||
_rgbService.SaveDevices();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_windowService.ShowExceptionDialog("Failed to update device positions", e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_saving = false;
|
||||
|
||||
Reference in new issue
Block a user