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-07-29 14:24:09 +08:00
parent 534ee61e61
commit 25cbfeb90d
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
kivyblocks/twosides.py
View File

@ -46,6 +46,9 @@ class TwoSides(WidgetReady, BoxLayout):
def show_switch_image(self, o, v=None): def show_switch_image(self, o, v=None):
def show(*args): def show(*args):
if self.switch_image and self.width > self.height: if self.switch_image and self.width > self.height:
if self.switch_button in Window.children:
Window.remove_widget(self.switch_button)
self.set_switch_button_pos()
Window.add_widget(self.switch_button) Window.add_widget(self.switch_button)
self.switch_button_showed = True self.switch_button_showed = True
@ -71,12 +74,15 @@ class TwoSides(WidgetReady, BoxLayout):
}) })
button.bind(on_press=self.switch_portrait_widget) button.bind(on_press=self.switch_portrait_widget)
self.switch_button = button self.switch_button = button
self.set_switch_button_pos()
def switch_portrait_widget(self, *args): def switch_portrait_widget(self, *args):
def clear_modal(o, *args): def clear_modal(o, *args):
o.clear_widgets() o.clear_widgets()
if not self.fullscreen:
self.fullscreen = True
return
if not self.portrait_modal: if not self.portrait_modal:
y = self.height - CSize(4) y = self.height - CSize(4)
x = self.height * y / self.width x = self.height * y / self.width
@ -100,35 +106,30 @@ class TwoSides(WidgetReady, BoxLayout):
def on_size(self,*args): def on_size(self,*args):
if self.width >= self.height: if self.width >= self.height:
if self.switch_button: if not self.landscape_widget in self.children or \
self.set_switch_button_pos() self.panel_shape == 'portrait':
print('twosides.py:W-Window.rotation=',
self.app.get_rotation(),
Window.size)
if not self.landscape_widget in self.children:
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)
if self.switch_button_showed and self.cannt_rotation:
self.set_switch_button_pos()
if self.switch_button not in Window.children:
Window.add_widget(self.switch_button)
self.dispatch('on_afterswitch_landscape') self.dispatch('on_afterswitch_landscape')
self.panel_shape = 'landscape' if self.switch_button_showed and self.cannt_rotation:
if self.switch_button in Window.children:
Window.remove_widget(self.switch_button)
self.set_switch_button_pos()
Window.add_widget(self.switch_button)
self.panel_shape = 'landscape'
else: else:
print('twosides.py:H-Window.rotation=', if self.portrait_widget in self.children or \
self.app.get_rotation(), self.panel_shape == 'landscape':
Window.size)
if not self.portrait_widget in self.children:
self.dispatch('on_beforeswitch_portrait') self.dispatch('on_beforeswitch_portrait')
self.clear_widgets() self.clear_widgets()
self.add_widget(self.portrait_widget) self.add_widget(self.portrait_widget)
if self.switch_button in Window.children:
Window.remove_widget(self.switch_button)
self.cannt_rotation = False
self.panel_shape = 'portrait'
self.dispatch('on_afterswitch_portrait') self.dispatch('on_afterswitch_portrait')
self.dispatch('on_interactive') self.dispatch('on_interactive')
if self.switch_button in Window.children:
Window.remove_widget(self.switch_button)
self.cannt_rotation = False
self.panel_shape = 'portrait'
def on_beforeswitch_landscape(self, *args): def on_beforeswitch_landscape(self, *args):
pass pass