Merge lp:~mc-return/compiz/compiz.merge-fix1070782-stackswitcher-ignores-setting-show-window-title into lp:compiz/0.9.10

[MC Return]

Stack (Window) Switcher
(currently excluded from compilation):

Fixed window title drawn although "Show Window Title" is disabled.

(LP: #1070782)

Note:
Stack Window Switcher is currently excluded from compilation, because of the GLES merge.
Hopefully this will be fixed soon, it is on my (long) TODO list.
This change was already rejected one time, but this fix will have to go in sooner or later in the exactly same form anyway.

So better do it now to have it done...

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/stackswitch/src/stackswitch.cpp'
--- plugins/stackswitch/src/stackswitch.cpp	2011-03-14 16:11:45 +0000
+++ plugins/stackswitch/src/stackswitch.cpp	2013-04-04 09:03:25 +0000
@@ -86,15 +86,15 @@
 void
 StackswitchScreen::renderWindowTitle ()
 {
+    if (!textAvailable)
+	return;
+
+    if (!optionGetWindowTitle ())
+	return;
+
     CompText::Attrib tA;
     bool           showViewport;
 
-    if (!textAvailable)
-	return;
-
-    if (!optionGetWindowTitle ())
-	return;
-
     CompRect oe = screen->getCurrentOutputExtents ();
 
     /* 75% of the output device as maximum width */
@@ -127,6 +127,12 @@
 StackswitchScreen::drawWindowTitle (GLMatrix &transform,
 				    CompWindow *w)
 {
+    if (!textAvailable)
+	return;
+
+    if (!optionGetWindowTitle ())
+	return;
+
     GLboolean     wasBlend;
     GLint         oldBlendSrc, oldBlendDst;
     GLMatrix      wTransform (transform), mvp;