DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Fixed compile errors in Artemis.UI

Browse Source
This commit is contained in:
Robert committed 2023-03-30 23:13:39 +02:00
1 parent 81e83e59f6
commit d171b947b7
160 files changed
+407 -521
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.SurfaceEditor;
public class ListDeviceView : UserControl
public partial class ListDeviceView : UserControl
{
public ListDeviceView()
{
src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs
+1 -1
View File
@@ -7,7 +7,7 @@ using Avalonia.VisualTree;
namespace Artemis.UI.Screens.SurfaceEditor;
public class SurfaceDeviceView : ReactiveUserControl<SurfaceDeviceViewModel>
public partial class SurfaceDeviceView : ReactiveUserControl<SurfaceDeviceViewModel>
{
private bool _dragging;
src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs
+9 -20
View File
@@ -13,29 +13,18 @@ using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.SurfaceEditor;
public class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewModel>
public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewModel>
{
private readonly ItemsControl _deviceContainer;
private readonly SelectionRectangle _selectionRectangle;
private readonly Border _surfaceBounds;
private readonly ZoomBorder _zoomBorder;
public SurfaceEditorView()
{
InitializeComponent();
_zoomBorder = this.Find<ZoomBorder>("ZoomBorder");
_deviceContainer = this.Find<ItemsControl>("DeviceContainer");
_selectionRectangle = this.Find<SelectionRectangle>("SelectionRectangle");
_surfaceBounds = this.Find<Border>("SurfaceBounds");
_zoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
ZoomBorder.PropertyChanged += ZoomBorderOnPropertyChanged;
UpdateZoomBorderBackground();
}
private void ZoomBorderOnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
{
if (e.Property.Name == nameof(_zoomBorder.Background))
if (e.Property.Name == nameof(ZoomBorder.Background))
UpdateZoomBorderBackground();
}
@@ -47,25 +36,25 @@ public class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewModel>
private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e)
{
UpdateZoomBorderBackground();
_surfaceBounds.BorderThickness = new Thickness(2 / _zoomBorder.ZoomX);
SurfaceBounds.BorderThickness = new Thickness(2 / ZoomBorder.ZoomX);
}
private void SelectionRectangle_OnSelectionUpdated(object? sender, SelectionRectangleEventArgs e)
{
List<ItemContainerInfo> itemContainerInfos = _deviceContainer.ItemContainerGenerator.Containers.Where(c => c.ContainerControl.Bounds.Intersects(e.Rectangle)).ToList();
List<SurfaceDeviceViewModel> viewModels = itemContainerInfos.Where(c => c.Item is SurfaceDeviceViewModel).Select(c => (SurfaceDeviceViewModel) c.Item).ToList();
List<Control> containers = DeviceContainer.GetRealizedContainers().Where(c => c.Bounds.Intersects(e.Rectangle)).ToList();
List<SurfaceDeviceViewModel> viewModels = containers.Where(c => c.DataContext is SurfaceDeviceViewModel).Select(c => (SurfaceDeviceViewModel) c.DataContext!).ToList();
ViewModel?.UpdateSelection(viewModels, e.KeyModifiers.HasFlag(KeyModifiers.Shift), e.KeyModifiers.HasFlag(KeyModifiers.Control));
}
private void ZoomBorder_OnPointerReleased(object? sender, PointerReleasedEventArgs e)
{
if (!_selectionRectangle.IsSelecting && e.InitialPressMouseButton == MouseButton.Left)
if (!SelectionRectangle.IsSelecting && e.InitialPressMouseButton == MouseButton.Left)
ViewModel?.ClearSelection();
}
private void UpdateZoomBorderBackground()
{
if (_zoomBorder.Background is VisualBrush visualBrush)
visualBrush.DestinationRect = new RelativeRect(_zoomBorder.OffsetX * -1, _zoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
if (ZoomBorder.Background is VisualBrush visualBrush)
visualBrush.DestinationRect = new RelativeRect(ZoomBorder.OffsetX * -1, ZoomBorder.OffsetY * -1, 20, 20, RelativeUnit.Absolute);
}
}