← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to hud/HudController.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:
hud/HudController.h
71
71
  void RegisterUBusInterests();
72
72
  void SetIcon(std::string const& icon_name);
73
73
 
74
 
  int GetTargetMonitor();
 
74
  int GetIdealMonitor();
75
75
  bool IsLockedToLauncher(int monitor);
76
76
 
77
77
  nux::Geometry GetIdealWindowGeometry();