yumoqing/kivyblocks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2021-06-29 19:59:36 +08:00
parent 0f924c47c6
commit 679967dccd
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kivyblocks/twosides.py
View File

@ -24,6 +24,8 @@ class TwoSides(WidgetReady, BoxLayout):
self.landscape_widget = blocks.widgetBuild(landscape) self.landscape_widget = blocks.widgetBuild(landscape)
blocks = Factory.Blocks() blocks = Factory.Blocks()
self.portrait_widget = blocks.widgetBuild(portrait) self.portrait_widget = blocks.widgetBuild(portrait)
self.switch_button = None
self.switch_button_showed = False
if self.switch_image: if self.switch_image:
self.build_switch_image() self.build_switch_image()
self.on_size_task = None self.on_size_task = None
@ -39,8 +41,10 @@ class TwoSides(WidgetReady, BoxLayout):
def show(*args): def show(*args):
if self.switch_image and self.width > self.height: if self.switch_image and self.width > self.height:
Window.add_widget(self.switch_button) Window.add_widget(self.switch_button)
self.switch_button_showed = True
print('show switch_buuton ....') print('show switch_buuton ....')
if self.fullscreen:
Clock.schedule_once(show, 2) Clock.schedule_once(show, 2)
def build_switch_image(self): def build_switch_image(self):
@ -94,8 +98,13 @@ class TwoSides(WidgetReady, BoxLayout):
self.dispatch('on_beforeswitch_landscape') self.dispatch('on_beforeswitch_landscape')
self.clear_widgets() self.clear_widgets()
self.add_widget(self.landscape_widget) self.add_widget(self.landscape_widget)
self.panel_shape = 'landscape' if self.switch_button_showed:
self.switch_button.y = self.height - \
self.switch_button.height
self.switch_button.x = 0
Window.add_widget(self.switch_button)
self.dispatch('on_afterswitch_landscape') self.dispatch('on_afterswitch_landscape')
self.panel_shape = 'landscape'
else: else:
print('twosides.py:Window.rotation=', Window.rotation, print('twosides.py:Window.rotation=', Window.rotation,
Window.size) Window.size)
@ -103,6 +112,8 @@ class TwoSides(WidgetReady, BoxLayout):
self.dispatch('on_beforeswitch_landscape') self.dispatch('on_beforeswitch_landscape')
self.clear_widgets() self.clear_widgets()
self.add_widget(self.portrait_widget) self.add_widget(self.portrait_widget)
if self.switch_button_showed:
Window.remove_widget(self.switch_button)
self.cannt_rotation = False self.cannt_rotation = False
self.panel_shape = 'portrait' self.panel_shape = 'portrait'
self.dispatch('on_afterswitch_landscape') self.dispatch('on_afterswitch_landscape')