← Back to branch summary

~brandontschaefer/unity/ignore-override-redirect-in-window-on-top

« back to all changes in this revision

Viewing changes to dash/ResultRendererTile.h

  • Committer: Tarmac
  • Author(s): Michal Hruby
  • Date: 2012-09-14 12:59:12 UTC
  • mfrom: (2680.1.7 unity)
  • Revision ID: tarmac-20120914125912-736qpwujolvcz5y3
Change the IconLoader methods to allow specifying both maximum width and height. Updated rendering of the icon ribbons.. Fixes: . Approved by Omer Akram, John Lea, Nick Dedekind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/ResultRendererTile.h
90
90
  nux::ObjectPtr<nux::BaseTexture> normal_cache_;
91
91
private:
92
92
  //icon loading callbacks
93
 
  void IconLoaded(std::string const& texid, unsigned size,
 
93
  void IconLoaded(std::string const& texid, int max_width, int max_height,
94
94
                  glib::Object<GdkPixbuf> const& pixbuf,
95
95
                  std::string icon_name, Result& row);
96
96
  nux::BaseTexture* CreateTextureCallback(std::string const& texid,