diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-07 17:27:00 +0300 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-10-07 17:27:00 +0300 |
| commit | f32bc5e5345f5386d4a82bc7270db79a0c7947ac (patch) | |
| tree | 642ce82fad40cc07adc53432cf83158f727b1f7b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | f6b0a945f86ee91cebd2d6726c06db93cdad0934 (diff) | |
| parent | eae70d7ebcb1007b407bac2ba27da5a5fef337db (diff) | |
| download | Tango-f32bc5e5345f5386d4a82bc7270db79a0c7947ac.tar.gz Tango-f32bc5e5345f5386d4a82bc7270db79a0c7947ac.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
3 files changed, 9 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml index eecbcf8ad..a76749b05 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml @@ -15,8 +15,8 @@ <Grid.Background> <ImageBrush ImageSource="/Images/White-Abstract.png" Stretch="Fill"></ImageBrush> </Grid.Background> - <!--<Viewbox Stretch="None" x:Name="viewbox">--> - <Grid x:Name="grid" Width="1920" Height="1100"> + <!--<Viewbox Stretch="Fill" x:Name="viewbox">--> + <Grid x:Name="grid" Width="1920" Height="1145"> <Grid> <sharedControls:NavigationControl TransitionAlwaysFades="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public"> <views:LoadingView sharedControls:NavigationControl.NavigationName="LoadingView"></views:LoadingView> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index d0eec65e2..915deb484 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -105,19 +105,24 @@ namespace Tango.MachineStudio.UI switch (ratio) { case 16d / 9d: - grid.Height = 1000; + grid.Height = 1145; + grid.Width = 2000; break; case 16d / 10d: grid.Height = 1145; + grid.Width = 1920; break; case 4d / 3d: grid.Height = 1280; + grid.Width = 1920; break; case 1366d / 768d: grid.Height = 1100; + grid.Width = 1920; break; default: grid.Height = 1145; + grid.Width = 1920; break; } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 1fb4da669..91792e0f3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.28.0")] +[assembly: AssemblyVersion("4.0.29.0")] [assembly: ComVisible(false)]
\ No newline at end of file |