Unity

Merge lp://qastaging/~azzar1/unity/fix-1008603 into lp://qastaging/unity

  1. fix-1008603
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: no longer in the source branch.
Merged at revision: 2391
Proposed branch: lp://qastaging/~azzar1/unity/fix-1008603
Merge into: lp://qastaging/unity
Diff against target: 62 lines (+17/-5)
2 files modified
hud/HudView.cpp (+14/-2)
unity-shared/DashStyle.cpp (+3/-3)
To merge this branch: bzr merge lp://qastaging/~azzar1/unity/fix-1008603
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Łukasz Zemczak Approve
John Lea design Pending
Review via email: mp+108604@code.qastaging.launchpad.net

Commit message

Draw the result grid in proximity of the search entry.

Description of the change

== Problem ==
The result grid is not drawn in proximity of the search entry.

== Fix ==
Use nux::GetPainter().Draw2DLine to draw the grid behind the search entry.

== Test ==
Not applicable

== Screenshot ==
http://ubuntuone.com/5YADnxYrLKWYgQ32XUgrOZ

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Seems fine to me.

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

After the bottom padding fix you've included, it's fine for me.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/775/console reported an error when processing this lp:~andyrock/unity/fix-1008603 branch.
Not merging it.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

/tmp/buildd/unity-5.12+bzr2390ubuntu0+702/tests/test_service_lens.c: In function 'on_preview_uri':
/tmp/buildd/unity-5.12+bzr2390ubuntu0+702/tests/test_service_lens.c:190:3: error: implicit declaration of function 'unity_track_preview_new' [-Werror=implicit-function-declaration]
/tmp/buildd/unity-5.12+bzr2390ubuntu0+702/tests/test_service_lens.c:190:10: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
cc1: all warnings being treated as errors

Doesn't seem like that was introduced by this branch, but CI got screwy, probably the last commit that went in.

Revision history for this message
Sebastien Bacher (seb128) wrote :

right, that was pointed to Michal on IRC and he's working on a fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.