diff --git a/VECTO3GUI2020/Helper/WindowHelper.cs b/VECTO3GUI2020/Helper/WindowHelper.cs index b155d6f8e3b6ea61c98abd55667c5994e934f134..d864a598699aa4333a711367afd6a5409d81a451 100644 --- a/VECTO3GUI2020/Helper/WindowHelper.cs +++ b/VECTO3GUI2020/Helper/WindowHelper.cs @@ -14,7 +14,6 @@ namespace VECTO3GUI2020.Helper Content = viewModel, Width = 800, Height = 600, - SizeToContent = SizeToContent.WidthAndHeight, WindowStartupLocation = WindowStartupLocation.CenterScreen }; @@ -24,7 +23,6 @@ namespace VECTO3GUI2020.Helper } window.Show(); - window.SizeToContent = SizeToContent.Manual; } diff --git a/VECTO3GUI2020/Resources/Sizes.xaml b/VECTO3GUI2020/Resources/Sizes.xaml index 791996c5ed21c660855ae75844cceb37f6dcf23d..2b00aceb9559ab6d404d9d5c361691f6305424c0 100644 --- a/VECTO3GUI2020/Resources/Sizes.xaml +++ b/VECTO3GUI2020/Resources/Sizes.xaml @@ -1,8 +1,8 @@ <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> - <system:Double x:Key="EditJobUserControlWidth"> + <!--<system:Double x:Key="EditJobUserControlWidth"> 800.0 </system:Double> - <system:Double x:Key="EditJobUserControlHeight">600</system:Double> + <system:Double x:Key="EditJobUserControlHeight">600</system:Double>--> </ResourceDictionary> \ No newline at end of file diff --git a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml index f7e4c71131f32c4600b298458970421960804209..7c5ba2d78d94c685004885c229009ccf2007e5e6 100644 --- a/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml +++ b/VECTO3GUI2020/Views/Multistage/CreateVifView.xaml @@ -8,7 +8,6 @@ xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.Implementation" xmlns:implementation1="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation" mc:Ignorable="d" - Height="200" Width="600" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation1:CreateVifViewModel}"> <Grid> <DockPanel LastChildFill="False"> diff --git a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml index c397df7dffc3f0364900825fb5490a834fc6b2bd..5d2b36a12ff695c078b2556ef598269eec531d19 100644 --- a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml +++ b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml @@ -7,7 +7,6 @@ xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation" xmlns:system="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" - Height="{StaticResource EditJobUserControlHeight}" Width="{StaticResource EditJobUserControlWidth}" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation:ManufacturingStageViewModel_v0_1 }"> <Grid> <DockPanel> diff --git a/VECTO3GUI2020/Views/Multistage/MultiStageView.xaml b/VECTO3GUI2020/Views/Multistage/MultiStageView.xaml index 3f4b22d0d5383d17843c6d919944b169b3fd4a05..46ff212b1a4d0f52cd7afbfe3968bc0a42751cb8 100644 --- a/VECTO3GUI2020/Views/Multistage/MultiStageView.xaml +++ b/VECTO3GUI2020/Views/Multistage/MultiStageView.xaml @@ -7,7 +7,6 @@ xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation" xmlns:customControls="clr-namespace:VECTO3GUI2020.Views.Multistage.CustomControls" mc:Ignorable="d" - Height="{StaticResource EditJobUserControlHeight}" Width="{StaticResource EditJobUserControlWidth}" d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation:MultiStageJobViewModel_v0_1}"> <Grid> <DockPanel> diff --git a/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml b/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml index e74b1e336056891cee054b790f9c3d49dc155109..6a1b5a60b56e2d1d75ddb51485e77be92c81ed8f 100644 --- a/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml +++ b/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml @@ -6,7 +6,6 @@ xmlns:local="clr-namespace:VECTO3GUI2020.Views.Multistage" xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation" xmlns:customControls="clr-namespace:VECTO3GUI2020.Views.Multistage.CustomControls" - Height="{StaticResource EditJobUserControlHeight}" Width="{StaticResource EditJobUserControlWidth}" mc:Ignorable="d" d:DesignHeight="450" x:Name="NewMultistageJobView" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation:NewMultiStageJobViewModel }"> <Grid>