Merge lp:~mc-return/compiz/compiz.merge-fix1196345-ccsm-key-caption-vertical-alignment-fixed into lp:compiz/0.9.10

[MC Return]

CCSM:
Fixed vertical alignment of the text on the stylized keys.
(Shift, Super, Ctrl, Alt)

(LP: #1196345)

It is a minor bug, but it was unpleasant on the eyes each time... ;)

Screenshot of the fixed version here: https://bugs.launchpad.net/compiz/+bug/1196345/+attachment/3719758/+files/keys_text_correct_alignment.png

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3751
http://jenkins.qa.ubuntu.com/job/compiz-ci/232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/45

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM. If this does break some sort of design docs that I cant locate this will be easy to fix.

review: Approve

=== modified file 'compizconfig/ccsm/ccm/Widgets.py'
--- compizconfig/ccsm/ccm/Widgets.py	2012-09-04 08:43:45 +0000
+++ compizconfig/ccsm/ccm/Widgets.py	2013-06-30 23:12:26 +0000
@@ -446,11 +446,11 @@
             cr.fill_preserve ()
             if mod in self._current:
                 cr.set_source_rgb (0.3, 0.3, 0.3)
-                self.write (cr, x + 23, y + 12, text)
+                self.write (cr, x + 23, y + 15, text)
                 cr.set_source_rgb (0.5, 1, 0)
             else:
                 cr.set_source_rgb (0, 0, 0)
-            self.write (cr, x + 22, y + 11, text)
+            self.write (cr, x + 22, y + 14, text)
 
     def write (self, cr, x, y, text):
         cr.move_to (x, y)