diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-02 14:47:11 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-02 14:47:11 +0300 |
| commit | d07b62cf2e014da6f7c7226ce7ff017542161708 (patch) | |
| tree | 1183feb5f974e3f771dea3dce3aa43a1aeea0396 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 3b3967d9d1106c1df0d975eb1c2e47170746528c (diff) | |
| parent | b3deaf19f734b0f617258752a916c4c4a5e8a175 (diff) | |
| download | Tango-d07b62cf2e014da6f7c7226ce7ff017542161708.tar.gz Tango-d07b62cf2e014da6f7c7226ce7ff017542161708.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_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 |