Merge lp:~3v1n0/unity/empty-tooltip-fix into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1969
Proposed branch: lp:~3v1n0/unity/empty-tooltip-fix
Merge into: lp:unity
Diff against target: 32 lines (+2/-8)
1 file modified
plugins/unityshell/src/Tooltip.cpp (+2/-8)
To merge this branch: bzr merge lp:~3v1n0/unity/empty-tooltip-fix
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+92896@code.launchpad.net

Description of the change

Correctly draw the tooltip tex to fix bug #930043

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

The code looks fine, just testing.

Revision history for this message
Tim Penhey (thumper) wrote :

Works well.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/Tooltip.cpp'
2--- plugins/unityshell/src/Tooltip.cpp 2012-02-08 19:54:47 +0000
3+++ plugins/unityshell/src/Tooltip.cpp 2012-02-14 01:23:18 +0000
4@@ -111,13 +111,7 @@
5 void Tooltip::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
6 {
7 CairoBaseWindow::Draw(gfxContext, forceDraw);
8-
9- nux::Geometry const& base = GetGeometry();
10- gfxContext.PushClippingRectangle(base);
11-
12 _tooltip_text->ProcessDraw(gfxContext, forceDraw);
13-
14- gfxContext.PopClippingRectangle();
15 }
16
17 void Tooltip::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
18@@ -144,12 +138,12 @@
19 _bottom_space->SetMinMaxSize(1, (ANCHOR_HEIGHT - text_height) / 2 + 1 + PADDING + CORNER_RADIUS);
20 }
21
22- nux::BaseWindow::PreLayoutManagement();
23+ CairoBaseWindow::PreLayoutManagement();
24 }
25
26 long Tooltip::PostLayoutManagement(long LayoutResult)
27 {
28- long result = nux::BaseWindow::PostLayoutManagement(LayoutResult);
29+ long result = CairoBaseWindow::PostLayoutManagement(LayoutResult);
30 UpdateTexture();
31
32 return result;