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

Partially fixed device movement when zoomed in

Browse Source
This commit is contained in:
SpoinkyNL 2019-10-19 14:07:24 +02:00
parent 1a3b33d154
commit 720af4ed73
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
View File

@ -199,8 +199,9 @@ namespace Artemis.UI.ViewModels.Screens
} }
var position = e.GetPosition((IInputElement) sender); var position = e.GetPosition((IInputElement) sender);
var relative = e.GetPosition(((Grid)sender).Children[0]);
if (_mouseDragStatus == MouseDragStatus.Dragging) if (_mouseDragStatus == MouseDragStatus.Dragging)
MoveSelected(position); MoveSelected(relative);
else if (_mouseDragStatus == MouseDragStatus.Selecting) else if (_mouseDragStatus == MouseDragStatus.Selecting)
UpdateSelection(position); UpdateSelection(position);
} }

18
src/Artemis.UI/Views/Screens/SurfaceEditorView.xaml
View File

@ -179,15 +179,6 @@
</TextBlock> </TextBlock>
<TextBox Margin="0 8 0 0" HorizontalAlignment="Stretch" Text="{Binding NewConfigurationName}" /> <TextBox Margin="0 8 0 0" HorizontalAlignment="Stretch" Text="{Binding NewConfigurationName}" />
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 8 0"
Command="materialDesign:DialogHost.CloseDialogCommand">
<Button.CommandParameter>
<system:Boolean xmlns:system="clr-namespace:System;assembly=mscorlib">
True
</system:Boolean>
</Button.CommandParameter>
ACCEPT
</Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0" <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0"
Command="materialDesign:DialogHost.CloseDialogCommand"> Command="materialDesign:DialogHost.CloseDialogCommand">
<Button.CommandParameter> <Button.CommandParameter>
@ -197,6 +188,15 @@
</Button.CommandParameter> </Button.CommandParameter>
CANCEL CANCEL
</Button> </Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 8 0"
Command="materialDesign:DialogHost.CloseDialogCommand">
<Button.CommandParameter>
<system:Boolean xmlns:system="clr-namespace:System;assembly=mscorlib">
True
</system:Boolean>
</Button.CommandParameter>
ACCEPT
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</materialDesign:DialogHost.DialogContent> </materialDesign:DialogHost.DialogContent>