Unity

Merge lp:~hikiko/unity/unity.quicklist-scale-fix into lp:unity

  1. unity.quicklist-scale-fix
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3776
Proposed branch: lp:~hikiko/unity/unity.quicklist-scale-fix
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
launcher/QuicklistMenuItem.cpp (+1/-1)
To merge this branch: bzr merge lp:~hikiko/unity/unity.quicklist-scale-fix
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+214943@code.launchpad.net

Commit message

It fixes the quicklist menu appearance.

Description of the change

It fixes the quicklist menu appearance.

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

PASSED: Continuous integration, rev:3765
http://jenkins.qa.ubuntu.com/job/unity-ci/861/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/395

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

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Nice. LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp 2014-03-20 05:05:21 +0000
+++ launcher/QuicklistMenuItem.cpp 2014-04-09 13:10:53 +0000
@@ -203,7 +203,7 @@
203void QuicklistMenuItem::UpdateTexture()203void QuicklistMenuItem::UpdateTexture()
204{204{
205 auto const& geo = GetGeometry();205 auto const& geo = GetGeometry();
206 nux::CairoGraphics cairo(CAIRO_FORMAT_ARGB32, geo.width * _scale, geo.height * _scale);206 nux::CairoGraphics cairo(CAIRO_FORMAT_ARGB32, geo.width, geo.height);
207 cairo_surface_set_device_scale(cairo.GetSurface(), _scale, _scale);207 cairo_surface_set_device_scale(cairo.GetSurface(), _scale, _scale);
208 UpdateTexture(cairo, geo.width / _scale, geo.height / _scale);208 UpdateTexture(cairo, geo.width / _scale, geo.height / _scale);
209}209}