diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-08-29 16:32:02 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-08-29 16:32:02 +0300 |
| commit | b3107df005ae6d2bf7ca108494cab77d0c093399 (patch) | |
| tree | fc7a66cb1801e458b5e7719dbe22f309ec931be3 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 8dd7b8d63adf21c2f872074f140d9908c0925fc4 (diff) | |
| parent | e3d237fb089078315149ab02fa8450522d9cc6d1 (diff) | |
| download | Tango-b3107df005ae6d2bf7ca108494cab77d0c093399.tar.gz Tango-b3107df005ae6d2bf7ca108494cab77d0c093399.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs | 5 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 |
2 files changed, 5 insertions, 2 deletions
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 e9e1ca979..4c5e2b9a6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -97,7 +97,7 @@ namespace Tango.MachineStudio.UI double ratio = scr_width / scr_height; - List<double> ratios = new List<double>() { 16d / 9d, 16d / 10d, 4d / 3d }; + List<double> ratios = new List<double>() { 16d / 9d, 16d / 10d, 4d / 3d, 1366 / 768 }; ratio = ratios.Closest(ratio); switch (ratio) @@ -111,6 +111,9 @@ namespace Tango.MachineStudio.UI case 4d / 3d: grid.Height = 1280; break; + case 1366d / 768d: + grid.Height = 1100; + break; default: grid.Height = 1145; 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 fc465cbe4..958ce2ce2 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.23.0")] +[assembly: AssemblyVersion("4.0.25.0")] [assembly: ComVisible(false)]
\ No newline at end of file |