aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-10-22 15:34:26 +0300
committerAvi Levkovich <avi@twine-s.com>2018-10-22 15:34:26 +0300
commita01508b38ae7a388f689a513a954aa9264bc63fd (patch)
tree0b91e08035e91c884ff8a1e9bb643345c961622f /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common
parent6fb44a285846d387d341bf31e2651507a79cc135 (diff)
parente64ec3bb6dd7294f9765bf4ca032e4aea42509e8 (diff)
downloadTango-a01508b38ae7a388f689a513a954aa9264bc63fd.tar.gz
Tango-a01508b38ae7a388f689a513a954aa9264bc63fd.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs7
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml11
2 files changed, 17 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index 22ed1a33d..06d5d44c5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -74,11 +74,16 @@ namespace Tango.MachineStudio.Common
public bool UseExternalBridgeEmulator { get; set; }
/// <summary>
- /// Gets or sets the studio modules bounds.
+ /// Gets or sets the last bounds of modules open windows.
/// </summary>
public List<StudioModuleBounds> StudioModulesBounds { get; set; }
/// <summary>
+ /// Gets or sets the last module that was opened in the main window.
+ /// </summary>
+ public String LastMainModuleName { get; set; }
+
+ /// <summary>
/// Initializes a new instance of the <see cref="MachineStudio"/> class.
/// </summary>
public MachineStudioSettings()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
index 62723755e..2f65fe817 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml
@@ -587,6 +587,17 @@
</EventTrigger>
</Style.Triggers>
</Style>
+
+ <Style x:Key="TechWidgetBorderCenterNoHover" TargetType="Border">
+ <Setter Property="Background">
+ <Setter.Value>
+ <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="#232323" Offset="1" />
+ <GradientStop Color="#FF646464" Offset="0"/>
+ </LinearGradientBrush>
+ </Setter.Value>
+ </Setter>
+ </Style>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>