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

bugfix

Browse Source
This commit is contained in:
yumoqing 2020-08-25 10:28:37 +08:00
parent d0165915a7
commit 5d61c2bec3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kivyblocks/orientationlayout.py
View File

@ -21,6 +21,8 @@ class OrientationLayout(WidgetReady, SwipeBehavior, FloatLayout):
SwipeBehavior.__init__(self) SwipeBehavior.__init__(self)
WidgetReady.__init__(self) WidgetReady.__init__(self)
Clock.schedule_once(self.build_children,0) Clock.schedule_once(self.build_children,0)
self.bind(on_swipe_left=self.toggle_second)
self.bind(on_swipe_right=self.toggle_second)
def build_children(self, *args): def build_children(self, *args):
if isinstance(self.main_widget, dict): if isinstance(self.main_widget, dict):
@ -33,8 +35,6 @@ class OrientationLayout(WidgetReady, SwipeBehavior, FloatLayout):
blocks.bind(on_built=self.second_widget_built) blocks.bind(on_built=self.second_widget_built)
blocks.bind(on_failed=self.widget_build_failed) blocks.bind(on_failed=self.widget_build_failed)
blocks.widgetBuild(self.second_widget, ancestor=self) blocks.widgetBuild(self.second_widget, ancestor=self)
self.bind(on_swipe_left=self.toggle_second)
self.bind(on_swipe_right=self.toggle_second)
def isLandscape(self): def isLandscape(self):
return self.width > self.height return self.width > self.height
@ -42,12 +42,17 @@ class OrientationLayout(WidgetReady, SwipeBehavior, FloatLayout):
def toggle_second(self,*args): def toggle_second(self,*args):
print('toggle_second() called ..') print('toggle_second() called ..')
if self.isLandscape(): if self.isLandscape():
if self.widget_second in self.children: if self.second_flg:
print('remove second widget ..')
self.remove_widget(self.widget_second) self.remove_widget(self.widget_second)
self.second_flg = False
else: else:
print('add second widget ..')
self.add_widget(self.widget_second) self.add_widget(self.widget_second)
self.second_flg = True
self.on_size(self.size) self.on_size(self.size)
def on_ready(self,*args): def on_ready(self,*args):
self.two_widget_layout() self.two_widget_layout()
@ -80,6 +85,8 @@ class OrientationLayout(WidgetReady, SwipeBehavior, FloatLayout):
self.remove_widget(self.widget_second) self.remove_widget(self.widget_second)
print('main_widget:width=%.02f,height=%.02f,pos=(%.02f,%.02f)' % (self.widget_main.width,self.widget_main.height,*self.widget_main.pos)) print('main_widget:width=%.02f,height=%.02f,pos=(%.02f,%.02f)' % (self.widget_main.width,self.widget_main.height,*self.widget_main.pos))
print('second_widget:width=%.02f,height=%.02f,pos=(%.02f,%.02f)' % (self.widget_second.width,self.widget_second.height,*self.widget_second.pos)) print('second_widget:width=%.02f,height=%.02f,pos=(%.02f,%.02f)' % (self.widget_second.width,self.widget_second.height,*self.widget_second.pos))
if self.second_flg:
self.add_widget(self.widget_second)
def vertical_layout(self): def vertical_layout(self):
self.widget_main.width = self.width self.widget_main.width = self.width