Unity

Merge lp:~azzar1/unity/lp-1170508 into lp:unity

  1. lp-1170508
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3595
Proposed branch: lp:~azzar1/unity/lp-1170508
Merge into: lp:unity
Diff against target: 33 lines (+10/-1)
1 file modified
unity-shared/UnityWindowView.cpp (+10/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1170508
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Christopher Townsend (community) Approve
Review via email: mp+194190@code.launchpad.net

Commit message

Alt-Tab, shutdown dialog and shortcut overlay should not be transparent in Low GFX Mode.

Description of the change

== Problem ==
Alt-Tab, shutdown dialog and shortcut overlay should not be transparent in Low GFX Mode.

== Test ==
Visual change. N/A.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3588
http://jenkins.qa.ubuntu.com/job/unity-ci/495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/26/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/26/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/495/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Works well, +1.

I'll globally approve once the whole xpathselect/autopilot 1.4 mess is straightened out.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/386/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/3143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-autolanding/16
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-autolanding/16/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-autolanding/16

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

armhf build fails:

/tmp/buildd/unity-7.1.2+14.04.20131106.1bzr3590pkg0trusty0/unity-shared/UnityWindowView.cpp:238:10: error: variable 'temp_background_color' set but not used [-Werror=unused-but-set-variable]
     auto temp_background_color = background_color();

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Right... I was thinking to the very same issue in these days too :D

I only see a minor indentation issue... Could you fix it?

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/UnityWindowView.cpp'
2--- unity-shared/UnityWindowView.cpp 2013-10-29 22:33:02 +0000
3+++ unity-shared/UnityWindowView.cpp 2013-11-12 16:21:50 +0000
4@@ -22,6 +22,7 @@
5
6 #include "UnityWindowView.h"
7 #include <Nux/VLayout.h>
8+#include "unity-shared/UnitySettings.h"
9 #include "unity-shared/WindowManager.h"
10
11 namespace unity {
12@@ -236,12 +237,20 @@
13
14 #ifndef NUX_OPENGLES_20
15 if (GfxContext.UsingGLSLCodePath())
16+ {
17+ auto temp_background_color = background_color();
18+
19+ if (Settings::Instance().GetLowGfxMode())
20+ temp_background_color.alpha = 1.0f;
21+
22 gPainter.PushDrawCompositionLayer(GfxContext, base,
23 bg_texture_,
24 texxform_blur_bg,
25 nux::color::White,
26- background_color, nux::LAYER_BLEND_MODE_OVERLAY,
27+ temp_background_color,
28+ Settings::Instance().GetLowGfxMode() ? nux::LAYER_BLEND_MODE_NORMAL : nux::LAYER_BLEND_MODE_OVERLAY,
29 true, rop);
30+ }
31 else
32 gPainter.PushDrawTextureLayer(GfxContext, base,
33 bg_texture_,