Merge lp:~gala-dev/gala/windowswitcher-fade-opacity into lp:gala

[Tom Beckmann]

windowswitcher: add option to configure fade opacity

This adds a key to configure the fade opacity of windows in the alt tab switcher as requested in bug https://bugs.launchpad.net/gala/+bug/1139953 It defaults to 0, so unless configured there will be no visible change.

[David Gomes (davidgomes)]

review: Approve

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:gala failed due to conflicts:

text conflict in src/Settings.vala

[Rico Tzschichholz (ricotz)]

review: Needs Fixing

[David Gomes (davidgomes)]

Tested, it works.

review: Approve

[lp:~gala-dev/gala/windowswitcher-fade-opacity]

377. By Tom Beckmann on 2014-04-19

add alt-tab-window-opacity key to configure opacity of faded-out windows

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'data/org.pantheon.desktop.gala.gschema.xml.in.in'
--- data/org.pantheon.desktop.gala.gschema.xml.in.in	2014-03-08 20:13:48 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml.in.in	2014-04-19 12:57:39 +0000
@@ -148,6 +148,11 @@
 			<default>false</default>
 			<summary>Make parent windows that spawn a modal attached dialog being dimmed</summary>
 		</key>
+		<key type="d" name="alt-tab-window-opacity">
+			<range min="0.0" max="1.0"/>
+			<default>0.0</default>
+			<summary>The opacity of the windows located in the background in the alt-tab-switcher.</summary>
+		</key>
 	</schema>
 	
 	<schema path="/org/pantheon/desktop/gala/animations/" id="org.pantheon.desktop.gala.animations" gettext-domain="gala">

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-04-08 12:51:06 +0000
+++ src/Settings.vala	2014-04-19 12:57:39 +0000
@@ -73,6 +73,7 @@
 		public string button_layout { get; set; }
 		public bool attach_modal_dialogs { get; set; }
 		public bool dim_parents { get; set; }
+		public double alt_tab_window_opacity { get; set; }
 
 		static AppearanceSettings? instance = null;
 

=== modified file 'src/Widgets/WindowSwitcher.vala'
--- src/Widgets/WindowSwitcher.vala	2014-04-08 12:51:06 +0000
+++ src/Widgets/WindowSwitcher.vala	2014-04-19 12:57:39 +0000
@@ -272,6 +272,7 @@
 		void dim_windows ()
 		{
 			var current_actor = current_window.get_compositor_private () as Actor;
+			var window_opacity = (int)Math.floor (AppearanceSettings.get_default ().alt_tab_window_opacity * 255);
 			var i = 0;
 			foreach (var clone in window_clones) {
 				if (current_actor == clone.source) {
@@ -280,7 +281,7 @@
 
 					dock.get_child_at_index (i).animate (AnimationMode.LINEAR, 100, opacity : 255);
 				} else {
-					clone.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, depth : -200.0f, opacity : 0);
+					clone.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, depth : -200.0f, opacity : window_opacity);
 					dock.get_child_at_index (i).animate (AnimationMode.LINEAR, 100, opacity : 100);
 				}