Unity

Merge lp:~3v1n0/unity/overlay-window-buttons-redraw into lp:unity

  1. overlay-window-buttons-redraw
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3977
Proposed branch: lp:~3v1n0/unity/overlay-window-buttons-redraw
Merge into: lp:unity
Diff against target: 28 lines (+4/-3)
2 files modified
unity-shared/OverlayWindowButtons.cpp (+3/-3)
unity-shared/WindowButtons.cpp (+1/-0)
To merge this branch: bzr merge lp:~3v1n0/unity/overlay-window-buttons-redraw
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+260981@code.launchpad.net

Commit message

OverlayWindowButtons: trigger a queuedraw also when a child requires a redraw

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

PASSED: Continuous integration, rev:3966
http://jenkins.qa.ubuntu.com/job/unity-ci/1249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/25

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

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

Yep, works as advertised now:)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-shared/OverlayWindowButtons.cpp'
2--- unity-shared/OverlayWindowButtons.cpp 2014-07-30 00:49:35 +0000
3+++ unity-shared/OverlayWindowButtons.cpp 2015-06-03 17:11:25 +0000
4@@ -36,9 +36,9 @@
5 : nux::BaseWindow("OverlayWindowButtons")
6 , window_buttons_(new WindowButtons())
7 {
8- window_buttons_->queue_draw.connect([this] (nux::Layout* /*layout*/) {
9- QueueDraw();
10- });
11+ auto queue_draw = sigc::hide(sigc::mem_fun(this, &OverlayWindowButtons::QueueDraw));
12+ window_buttons_->queue_draw.connect(queue_draw);
13+ window_buttons_->child_queue_draw.connect(queue_draw);
14
15 AddChild(window_buttons_.GetPointer());
16 UpdateGeometry();
17
18=== modified file 'unity-shared/WindowButtons.cpp'
19--- unity-shared/WindowButtons.cpp 2014-02-28 17:41:25 +0000
20+++ unity-shared/WindowButtons.cpp 2015-06-03 17:11:25 +0000
21@@ -64,6 +64,7 @@
22 if (new_state != visual_state_)
23 {
24 visual_state_ = new_state;
25+ visual_state_change.emit(this);
26 QueueDraw();
27 }
28 }