← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to tests/autopilot/unity/emulators/hud.py

  • 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:
tests/autopilot/unity/emulators/hud.py
103
103
        return self.controller.hud_monitor
104
104
 
105
105
    @property
 
106
    def ideal_monitor(self):
 
107
        """The target monitor for the Hud to appear on."""
 
108
        return self.controller.ideal_monitor
 
109
 
 
110
    @property
106
111
    def geometry(self):
107
112
        return (self.controller.x, self.controller.y, self.controller.width, self.controller.height)
108
113