From 7f5c8ff1ff4ee3beeccb3f08eaa02025f30bde2d Mon Sep 17 00:00:00 2001 From: yumoqing Date: Mon, 23 Dec 2019 10:07:49 +0800 Subject: [PATCH] bugfix --- kivyblocks/pagescontainer.py | 2 +- kivyblocks/vplayer.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kivyblocks/pagescontainer.py b/kivyblocks/pagescontainer.py index 84d1ec7..5c759f0 100644 --- a/kivyblocks/pagescontainer.py +++ b/kivyblocks/pagescontainer.py @@ -17,7 +17,7 @@ class PageContainer(FloatLayout): Window.bind(size=self.on_window_size) def on_window_size(self,o,v=None): - if self.size != Window.size: + if self.size[0] != Window.size[0] or self.size[1] != Window.size[1]: print('on_window_size event fired ....',self.size, Window.size) self.size = Window.size self.reshowBackButton() diff --git a/kivyblocks/vplayer.py b/kivyblocks/vplayer.py index e811ec4..0565c48 100644 --- a/kivyblocks/vplayer.py +++ b/kivyblocks/vplayer.py @@ -1,5 +1,6 @@ import os import sys +from kivy.utils import platform from traceback import print_exc from kivy.core.window import Window from kivy.uix.floatlayout import FloatLayout @@ -217,7 +218,6 @@ class VPlayer(FloatLayout): print('Window size=',Window.size) self._fullscreen_state = state = { - "WindowSize":Window.size, 'parent': self.parent, 'pos': self.pos, 'size': self.size, @@ -225,7 +225,9 @@ class VPlayer(FloatLayout): 'size_hint': self.size_hint, 'window_children': window.children[:]} - Window.maximize() + print('vplayer fullscreen,platform=',platform) + if platform in ['windows', 'linux','macOS' ]: + Window.maximize() # remove all window children for child in window.children[:]: window.remove_widget(child) @@ -253,8 +255,9 @@ class VPlayer(FloatLayout): self.size = state['size'] if state['parent'] is not window: state['parent'].add_widget(self) - Window.size = state['WindowSize'] - print('state_size=',state['WindowSize'], 'windowsize=',Window.size) + print('vplayer fullscreen,platform=',platform) + if platform in ['windows', 'linux','macOS' ]: + Window.restore() def buildMenu(self,obj,touch): if not self.collide_point(*touch.pos):