Merge lp:~mblayman/entertainer/0.4-bugfix into lp:entertainer

[Matt Layman]

[Matt Layman (mblayman)]

This is a three line branch. One line to restore the TOGGLE_FULLSCREEN key and two lines to show/hide the mouse cursor when coming in and out of fullscreen.

[Samuel Buffet (samuel-buffet)]

Hi Matt,

I'd rather see something like we hide the mouse if we don't move it after a delay of a few seconds.

Also in the future we may need an option *show_pointer = True/False*

* mouse => we need to see the pointer when we move it and then hide it.
* finger + keyboard + remote control => always hidden

Cheers,
Samuel

[Matt Layman (mblayman)]

"Hi Matt,

I'd rather see something like we hide the mouse if we don't move it after a delay of a few seconds.

Also in the future we may need an option *show_pointer = True/False*

* mouse => we need to see the pointer when we move it and then hide it.
* finger + keyboard + remote control => always hidden

Cheers,
Samuel"

Samuel,

I think that those are very good points. However, since we don't do anything with pointer handling yet, would you be okay with this solution for now? I think that this fix is a good "half-way" solution until we can put a better one in place. And since it's only a couple of lines, it will be easy to remove later.

What do you think?

-Matt

[Samuel Buffet (samuel-buffet)]

Hi Matt,

"What do you think?"

Indeed the full code can be added later when will need it.

Samuel,

review: Approve

[Matt Layman (mblayman)]

Commit Message: Toggling fullscreen was fixed and the mouse cursor will now hide when in fullscreen mode. (Matt Layman)

=== modified file 'entertainerlib/frontend/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-03-21 20:31:35 +0000
+++ entertainerlib/frontend/gui/user_interface.py	2009-03-22 21:00:43 +0000
@@ -159,6 +159,7 @@
             UserEvent.NAVIGATE_PREVIOUS_PAGE : self._handle_default,
             UserEvent.NAVIGATE_NEXT_PAGE : self._handle_default,
             UserEvent.NAVIGATE_LAST_PAGE : self._handle_default,
+            UserEvent.TOGGLE_FULLSCREEN : self._handle_toggle_fullscreen,
             UserEvent.PLAYER_PLAY_PAUSE : self._handle_player_play_pause,
             UserEvent.PLAYER_STOP : self._handle_player_stop,
             UserEvent.USE_ASPECT_RATIO_1 : self._handle_aspect_ratio,
@@ -176,6 +177,7 @@
 
     def _fullscreen(self):
         '''Set the window, stage, and config to fullscreen dimensions.'''
+        self.stage.hide_cursor()
         self.window.fullscreen()
         self.stage.fullscreen()
         width, height = self.stage.get_size()
@@ -215,6 +217,7 @@
         if self.is_fullscreen:
             self.stage.unfullscreen()
             self.window.unfullscreen()
+            self.stage.show_cursor()
             self.config.set_stage_width(self.old_width)
             self.config.set_stage_height(self.old_height)
             self.is_fullscreen = False