From 269144e24d44ee2ebe4054c858a826d21215f592 Mon Sep 17 00:00:00 2001 From: Manuel Quiñones Date: Tue, 23 Oct 2012 14:35:11 +0000 Subject: Revert "Touch: Get out of activity fullscreen mode SL #4013" This is in toolkit now, commit 20ef2975 . This reverts commit c9975a7c356b6c7d81473560cd7d5d611c82bfcb. --- (limited to 'webactivity.py') diff --git a/webactivity.py b/webactivity.py index 81ec4fd..0fbf858 100644 --- a/webactivity.py +++ b/webactivity.py @@ -54,7 +54,6 @@ from sugar3.graphics.icon import Icon from sugar3 import mime from sugar3.graphics.toolbarbox import ToolbarButton -from sugar3.graphics.window import _UNFULLSCREEN_BUTTON_VISIBILITY_TIMEOUT PROFILE_VERSION = 2 @@ -208,9 +207,6 @@ class WebActivity(activity.Activity): self.model = Model() self.model.connect('add_link', self._add_link_model_cb) - self.set_events(Gdk.EventMask.TOUCH_MASK) - self.connect('event', self.__event_cb) - # HACK to allow Escape key stop loading on fullscreen mode # http://bugs.sugarlabs.org/ticket/1434 self.disconnect_by_func(self._Window__key_press_cb) @@ -435,20 +431,6 @@ class WebActivity(activity.Activity): def _go_home_button_cb(self, button): self._tabbed_view.load_homepage() - def __event_cb(self, widget, event): - if self._is_fullscreen and event.type == Gdk.EventType.TOUCH_END: - # Show Unfullscreen button when the user clicks over the canvas - self._unfullscreen_button.show() - - if self._unfullscreen_button_timeout_id is not None: - GObject.source_remove(self._unfullscreen_button_timeout_id) - self._unfullscreen_button_timeout_id = None - - self._unfullscreen_button_timeout_id = \ - GObject.timeout_add_seconds( \ - _UNFULLSCREEN_BUTTON_VISIBILITY_TIMEOUT, \ - self._Window__unfullscreen_button_timeout_cb) - def _key_press_cb(self, widget, event): # HACK: this is the hacked version of # sugar3.graphics.Window.__key_press_cb function to allow stop -- cgit v0.9.1