From edd1d2a5eeae2488304b972e957067271a71e1a5 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Mon, 5 Mar 2012 17:28:49 +0100 Subject: [PATCH] core/window: remove some debugs --- kivy/core/window/__init__.py | 20 ++++++++++++-------- kivy/core/window/window_pygame.py | 5 ++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/kivy/core/window/__init__.py b/kivy/core/window/__init__.py index 7b4e7ec9f..3936c9995 100755 --- a/kivy/core/window/__init__.py +++ b/kivy/core/window/__init__.py @@ -20,6 +20,7 @@ from kivy.modules import Modules from kivy.event import EventDispatcher from kivy.properties import ListProperty, ObjectProperty, AliasProperty, \ NumericProperty, OptionProperty, StringProperty +from kivy.utils import platform # late import VKeyboard = None @@ -482,7 +483,6 @@ class WindowBase(EventDispatcher): # called, unset the trigger Clock.unschedule(self.create_window) - print 'create window !!' if not self.initialized: from kivy.core.gl import init_gl init_gl() @@ -496,11 +496,18 @@ class WindowBase(EventDispatcher): else: # if we get initialized more than once, then reload opengl state # after the second time. + # XXX check how it's working on embed platform. from kivy.graphics.opengl_utils import gl_reload - gl_reload() - def ask_update(dt): - self.canvas.ask_update() - Clock.schedule_once(ask_update, 0) + if platform() == 'linux': + # on linux, it's safe for just sending a resize. + self.dispatch('on_resize', *self.system_size) + + else: + # on other platform, window are recreated, we need to reload. + gl_reload() + def ask_update(dt): + self.canvas.ask_update() + Clock.schedule_once(ask_update, 0) # ensure the gl viewport is correct self.update_viewport() @@ -631,9 +638,6 @@ class WindowBase(EventDispatcher): def on_resize(self, width, height): '''Event called when the window is resized''' - print '-- on resize', width, height - from kivy.graphics.opengl_utils import gl_reload - gl_reload() self.update_viewport() def update_viewport(self): diff --git a/kivy/core/window/window_pygame.py b/kivy/core/window/window_pygame.py index 3218a9119..fa6a3de30 100644 --- a/kivy/core/window/window_pygame.py +++ b/kivy/core/window/window_pygame.py @@ -37,7 +37,6 @@ class WindowPygame(WindowBase): # have some weird bugs self.dispatch('on_mouse_up', 0, 0, 'all', []) - print 'window create' # force display to show (available only for fullscreen) displayidx = Config.getint('graphics', 'display') if not 'SDL_VIDEO_FULLSCREEN_HEAD' in environ and displayidx != -1: @@ -270,7 +269,8 @@ class WindowPygame(WindowBase): # video resize elif event.type == pygame.VIDEORESIZE: - self.system_size = event.size + self._size = event.size + self.update_viewport() elif event.type == pygame.VIDEOEXPOSE: self.canvas.ask_update() @@ -312,7 +312,6 @@ class WindowPygame(WindowBase): # Pygame wrapper # def _pygame_set_mode(self, size=None): - print '>>> pygame set mode', self._size, self.fullscreen, self.flags if size is None: size = self.size if self.fullscreen == 'auto':