diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
3 files changed, 12 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 6a3b232d5..421f2daa7 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -140,6 +140,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels #region Constructors + public MainViewVM() + { + + } + /// <summary> /// Initializes a new instance of the <see cref="MainViewVM"/> class. /// </summary> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml index 57f4d0eb9..79949405e 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml @@ -68,7 +68,7 @@ <Grid> <Grid.ColumnDefinitions> <ColumnDefinition Width="477*"/> - <ColumnDefinition Width="310"/> + <ColumnDefinition Width="310" x:FieldModifier="public" x:Name="panelColumnDefinition" /> </Grid.ColumnDefinitions> <Grid> @@ -85,7 +85,7 @@ <Grid ClipToBounds="False"> <StackPanel> - <StackPanel Orientation="Horizontal"> + <StackPanel Orientation="Horizontal" x:Name="stackHeader" x:FieldModifier="public"> <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">MACHINE DESIGNER</TextBlock> <StackPanel Orientation="Horizontal" Margin="20 10 0 0" VerticalAlignment="Center"> <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Bottom" Width="24" Height="24" Foreground="Silver"></materialDesign:PackIcon> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs index 1aa1a1961..67d42a350 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs @@ -30,9 +30,14 @@ namespace Tango.MachineStudio.MachineDesigner.Views private bool _highlightShown; private DoubleAnimation _highlightAnimation; + public ColumnDefinition PanelColumnDefinition { get; set; } + public MainView() { InitializeComponent(); + + PanelColumnDefinition = panelColumnDefinition; + DraggingSurface = dragSufrace; this.Loaded += (x, y) => { |