Merge lp:~ubuntu-mate-dev/compiz/mate-tweaks into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

MATE Compiz configuration is now consistent with composited Marco and Metacity.

This merge proposal makes the Compiz MATE configuration consistent with composited Marco and Metacity. It also fixes an artefact while alt-tab switching.

[Marco Trevisan (Treviño) (3v1n0)]

+1 on my side.

Some MATE guys review would be nice too.

review: Approve

[lp:~ubuntu-mate-dev/compiz/mate-tweaks]

4003. By Martin Wimpress on 2016-03-17

Shadows are consistent with Marco, Metacity and Compton.

[Martin Wimpress (flexiondotorg)]

And the missing new line at the end of the file was added.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4003
http://jenkins.qa.ubuntu.com/job/compiz-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/116/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/mate.ini'
--- debian/mate.ini	2016-01-19 06:44:15 +0000
+++ debian/mate.ini	2016-03-17 17:08:05 +0000
@@ -1,7 +1,7 @@
 [addhelper]
 s0_ononinit = true
-s0_brightness = 96
-s0_saturation = 72
+s0_brightness = 95
+s0_saturation = 100
 
 [animation]
 s0_open_matches = ((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver);((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\.exe$));(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd);
@@ -12,7 +12,7 @@
 s0_command20 = /usr/bin/mate-system-monitor -p
 
 [core]
-s0_active_plugins = core;composite;crashhandler;opengl;compiztoolbox;copytex;decor;grid;imgpng;matecompat;mousepoll;move;neg;place;regex;resize;session;showmouse;snap;thumbnail;vpswitch;wall;animation;commands;expo;ezoom;fade;scale;switcher;workarounds;
+s0_active_plugins = core;composite;crashhandler;opengl;workspacenames;compiztoolbox;copytex;decor;grid;imgpng;matecompat;mousepoll;move;neg;place;regex;resize;session;showmouse;snap;thumbnail;vpswitch;wall;animation;commands;expo;ezoom;fade;scale;switcher;workarounds;
 s0_autoraise = false
 s0_autoraise_delay = 500
 s0_focus_prevention_level = 0
@@ -48,15 +48,15 @@
 
 [decor]
 s0_active_shadow_radius = 13.000000
-s0_active_shadow_opacity = 0.900000
-s0_active_shadow_color = #1b1b1bc0
-s0_active_shadow_x_offset = 0
-s0_active_shadow_y_offset = 0
+s0_active_shadow_opacity = 0.225000
+s0_active_shadow_color = #00000080
+s0_active_shadow_x_offset = 6
+s0_active_shadow_y_offset = 6
 s0_inactive_shadow_radius = 13.000000
-s0_inactive_shadow_opacity = 0.900000
-s0_inactive_shadow_color = #1a1a1aff
-s0_inactive_shadow_x_offset = 0
-s0_inactive_shadow_y_offset = 0
+s0_inactive_shadow_opacity = 0.225000
+s0_inactive_shadow_color = #000000ff
+s0_inactive_shadow_x_offset = 6
+s0_inactive_shadow_y_offset = 6
 s0_mipmap = true
 
 [expo]
@@ -148,10 +148,15 @@
 s0_num_particles = 384
 s0_color = #87a752ff
 
+[staticswitcher]
+s0_background_color = #333333d9
+
 [switcher]
-s0_zoom = 0.000000
-s0_icon = false
-s0_icon_only = true
+s0_brightness = 95
+s0_opacity = 100
+s0_focus_on_switch = true
+s0_zoom = 0.050000
+s0_background_color = #333333d9
 
 [td]
 s0_manual_only = false
@@ -177,3 +182,6 @@
 
 [workarounds]
 s0_keep_minimized_windows = true
+
+[workspacenames]
+s0_names = Workspace 1;Workspace 2;Workspace 3;Workspace 4;