Merge lp:~townsend/unity/fix-lp1240595 into lp:unity

Proposed by Christopher Townsend on 2013-10-28
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2013-10-29
Approved revision: 3586
Merged at revision: 3585
Proposed branch: lp:~townsend/unity/fix-lp1240595
Merge into: lp:unity
Diff against target: 59 lines (+18/-0)
4 files modified
launcher/Launcher.cpp (+6/-0)
launcher/Launcher.h (+3/-0)
panel/PanelView.cpp (+6/-0)
panel/PanelView.h (+3/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-lp1240595
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-29
Marco Trevisan (Treviño) 2013-10-28 Approve on 2013-10-29
Review via email: mp+192931@code.launchpad.net

Commit message

Instead of using NeedSoftRedraw(), use QueueDraw() for the Launcher and Panel to force a redraw to fix issue where leaving a full screen unredirected window would not redraw the Launcher and Panel.

Description of the change

= Issue =
When exiting an unredirected window, the Launcher and Panel would not redraw most of the time.

= Fix =
For the Launcher and Panel views, override the call to NeedSoftRedraw() to call QueueDraw() instead which forces the Launcher and Panel to redraw.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~townsend/unity/fix-lp1240595 updated on 2013-10-29
3586. By Christopher Townsend on 2013-10-29

Add comment to remind us to remove this code when the Unity performance branches are merged.

Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/Launcher.cpp'
2--- launcher/Launcher.cpp 2013-10-22 18:23:29 +0000
3+++ launcher/Launcher.cpp 2013-10-29 16:06:48 +0000
4@@ -2402,6 +2402,12 @@
5 unity::graphics::PopOffscreenRenderTarget();
6 }
7
8+// FIXME: This will need to be removed when the Unity performance branch is merged.
9+void Launcher::NeedSoftRedraw()
10+{
11+ QueueDraw();
12+}
13+
14 #ifdef NUX_GESTURES_SUPPORT
15 nux::GestureDeliveryRequest Launcher::GestureEvent(const nux::GestureEvent &event)
16 {
17
18=== modified file 'launcher/Launcher.h'
19--- launcher/Launcher.h 2013-10-21 18:09:47 +0000
20+++ launcher/Launcher.h 2013-10-29 16:06:48 +0000
21@@ -151,6 +151,9 @@
22
23 void RenderIconToTexture(nux::GraphicsEngine&, nux::ObjectPtr<nux::IOpenGLBaseTexture> const&, AbstractLauncherIcon::Ptr const&);
24
25+ // FIXME: This will need to be removed when the Unity performance branch is merged.
26+ void NeedSoftRedraw() override;
27+
28 #ifdef NUX_GESTURES_SUPPORT
29 virtual nux::GestureDeliveryRequest GestureEvent(const nux::GestureEvent &event);
30 #endif
31
32=== modified file 'panel/PanelView.cpp'
33--- panel/PanelView.cpp 2013-09-24 20:18:42 +0000
34+++ panel/PanelView.cpp 2013-10-29 16:06:48 +0000
35@@ -787,4 +787,10 @@
36 return ui::EdgeBarrierSubscriber::Result::NEEDS_RELEASE;
37 }
38
39+// FIXME: This will need to be removed when the Unity performance branch is merged.
40+void PanelView::NeedSoftRedraw()
41+{
42+ QueueDraw();
43+}
44+
45 } // namespace unity
46
47=== modified file 'panel/PanelView.h'
48--- panel/PanelView.h 2013-09-24 20:18:42 +0000
49+++ panel/PanelView.h 2013-10-29 16:06:48 +0000
50@@ -78,6 +78,9 @@
51
52 ui::EdgeBarrierSubscriber::Result HandleBarrierEvent(ui::PointerBarrierWrapper* owner, ui::BarrierEvent::Ptr event) override;
53
54+ // FIXME: This will need to be removed when the Unity performance branch is merged.
55+ void NeedSoftRedraw() override;
56+
57 protected:
58 void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
59 void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);