Various changes, including a reset function

Lolginer · Aug 23, 2015 · 0437e83 · 0437e83
1 parent e0cdfc8
commit 0437e83
Show file tree

Hide file tree

Showing 7 changed files with 331 additions and 290 deletions.
diff --git a/Albedo/App.config b/Albedo/App.config
@@ -73,6 +73,9 @@
             <setting name="startupTime" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="ambientColorOnly" serializeAs="String">
+                <value>0</value>
+            </setting>
         </Albedo.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Albedo/Core/Effects.cs b/Albedo/Core/Effects.cs
@@ -87,6 +87,10 @@ private static void AmbientPut()
 		{
 			dynamic ambient = Platform.AmbientSampling();
 			bufferData.bri = ambient.bri;
+			if (Platform.ReadSetting("ambientColorOnly") > 0) {
+				bufferData.bri = Platform.ReadSetting("ambientColorOnly");
+			}
+
 			bufferData.hue = ambient.hue;
 			bufferData.sat = ambient.sat;
 			return;

diff --git a/Albedo/DummyWindow.xaml.cs b/Albedo/DummyWindow.xaml.cs
@@ -89,6 +89,12 @@ private void ExitItem_Click(object sender, RoutedEventArgs e)
 			Environment.Exit(0);
 		}
 
+		public void Exit()
+		{
+			this.TaskIcon.Visibility = System.Windows.Visibility.Collapsed; //Prevents task icon from remaining in tray
+			Environment.Exit(0);
+		}
+
 		private void AmbientItem_Click(object sender, RoutedEventArgs e)
 		{
 			if (Ready()) {

diff --git a/Albedo/EditorWindow.xaml b/Albedo/EditorWindow.xaml