Unity

Merge lp:~gordallott/unity/fix-horizontal-renderer into lp:unity

  1. fix-horizontal-renderer
  2. Merge into trunk
Proposed by Gord Allott
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1561
Proposed branch: lp:~gordallott/unity/fix-horizontal-renderer
Merge into: lp:unity
Prerequisite: lp:~gordallott/unity/new_dash_icon_size
Diff against target: 37 lines (+3/-3) (has conflicts)
3 files modified
plugins/unityshell/src/ResultRendererHorizontalTile.cpp (+1/-1)
plugins/unityshell/src/ResultRendererHorizontalTile.h (+1/-1)
plugins/unityshell/src/ResultRendererTile.h (+1/-1)
Text conflict in plugins/unityshell/src/ResultRendererTile.cpp
To merge this branch: bzr merge lp:~gordallott/unity/fix-horizontal-renderer
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Neil J. Patel Pending
Review via email: mp+75321@code.launchpad.net

This proposal supersedes a proposal from 2011-09-13.

Description of the change

fixes the horizontal renderer, a method was not virtual when it should of been so the comment drawing code never got called.

also fixed a slight cutoff issue

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) :
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/ResultRendererHorizontalTile.cpp'
2--- plugins/unityshell/src/ResultRendererHorizontalTile.cpp 2011-09-14 09:56:28 +0000
3+++ plugins/unityshell/src/ResultRendererHorizontalTile.cpp 2011-09-14 09:56:28 +0000
4@@ -146,7 +146,7 @@
5 GfxContext.QRP_1Tex(icon_left_hand_side + style->GetTileIconSize() + spacing,
6 icon_top_side,
7 width() - style->GetTileIconSize(),
8- style->GetTileIconSize() - (padding * 2),
9+ height() - (padding * 2),
10 container->text->GetDeviceTexture(),
11 texxform,
12 nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
13
14=== modified file 'plugins/unityshell/src/ResultRendererHorizontalTile.h'
15--- plugins/unityshell/src/ResultRendererHorizontalTile.h 2011-09-06 18:30:26 +0000
16+++ plugins/unityshell/src/ResultRendererHorizontalTile.h 2011-09-14 09:56:28 +0000
17@@ -54,7 +54,7 @@
18 int x_offset, int y_offset);
19
20 protected:
21- void LoadText(Result& row);
22+ virtual void LoadText(Result& row);
23
24 private:
25 nux::BaseTexture* DrawHighlight(std::string const& texid,
26
27=== modified file 'plugins/unityshell/src/ResultRendererTile.h'
28--- plugins/unityshell/src/ResultRendererTile.h 2011-09-14 09:56:28 +0000
29+++ plugins/unityshell/src/ResultRendererTile.h 2011-09-14 09:56:28 +0000
30@@ -84,7 +84,7 @@
31 int padding;
32
33 protected:
34- void LoadText(Result& row);
35+ virtual void LoadText(Result& row);
36 void LoadIcon(Result& row);
37 nux::ObjectPtr<nux::BaseTexture> prelight_cache_;
38