DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Surface editor RGB.NET update WIP

Browse Source
This commit is contained in:
Robert 2019-11-21 19:32:43 +01:00
parent 240efb2907
commit 9f0d5fd7e0
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml
View File

@ -110,12 +110,9 @@
</ItemsControl.ItemContainerStyle> </ItemsControl.ItemContainerStyle>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<ContentControl Width="{Binding Device.RgbDevice.Size.Width}" <ContentControl Width="{Binding Device.RgbDevice.DeviceRectangle.Size.Width}"
Height="{Binding Device.RgbDevice.Size.Height}" Height="{Binding Device.RgbDevice.DeviceRectangle.Size.Height}"
s:View.Model="{Binding}"> s:View.Model="{Binding}">
<ContentControl.RenderTransform>
<RotateTransform Angle="{Binding Device.RgbDevice.Rotation.Degrees}" CenterX="{Binding RgbDeviceRectangle.Center.X}" CenterY="{Binding RgbDeviceRectangle.Center.Y}"></RotateTransform>
</ContentControl.RenderTransform>
<ContentControl.ContextMenu> <ContentControl.ContextMenu>
<ContextMenu> <ContextMenu>
<MenuItem Header="Bring to Front" Command="{s:Action BringToFront}" CommandParameter="{Binding}"> <MenuItem Header="Bring to Front" Command="{s:Action BringToFront}" CommandParameter="{Binding}">

3
src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
View File

@ -19,6 +19,9 @@
<converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" /> <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid.LayoutTransform>
<RotateTransform Angle="{Binding Device.RgbDevice.Rotation.Degrees}"></RotateTransform>
</Grid.LayoutTransform>
<!-- Device image with fallback --> <!-- Device image with fallback -->
<Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" /> <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" />

4
src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs
View File

@ -33,7 +33,9 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization
private void DeviceOnDeviceUpdated(object sender, EventArgs e) private void DeviceOnDeviceUpdated(object sender, EventArgs e)
{ {
NotifyOfPropertyChange(() => RgbDeviceRectangle); NotifyOfPropertyChange(() => RgbDeviceRectangle);
NotifyOfPropertyChange(() => Device.RgbDevice); NotifyOfPropertyChange(() => RgbDeviceRectangle.Location.X);
NotifyOfPropertyChange(() => RgbDeviceRectangle.Location.Y);
} }
public Device Device { get; set; } public Device Device { get; set; }