← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to dash/previews/Track.h

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/previews/Track.h
61
61
  virtual void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
62
62
  virtual void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
63
63
  virtual void PreLayoutManagement();
 
64
  virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
64
65
 
65
66
  // From debug::Introspectable
66
67
  std::string GetName() const;