From 938deb630787f27244af5f3d5fbd233fc353ef77 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Tue, 25 Aug 2020 09:10:40 +0800
Subject: [PATCH] bugfix

---
 kivyblocks/blocks.py            |  4 --
 kivyblocks/orientationlayout.py | 98 +++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 kivyblocks/orientationlayout.py

diff --git a/kivyblocks/blocks.py b/kivyblocks/blocks.py
index 3685f94..3001978 100755
--- a/kivyblocks/blocks.py
+++ b/kivyblocks/blocks.py
@@ -258,10 +258,6 @@ class Blocks(EventDispatcher):
 		return obj
 
 	def __build(self,desc:dict,ancestor=None):
-		def checkReady(w,o):
-			w.children_ready[o] = True
-			if all(w.children_ready.values()):
-				w.ready = True
 		widgetClass = desc.get('widgettype',None)
 		if not widgetClass:
 			print("__build(), desc invalid", desc)
diff --git a/kivyblocks/orientationlayout.py b/kivyblocks/orientationlayout.py
new file mode 100644
index 0000000..886420b
--- /dev/null
+++ b/kivyblocks/orientationlayout.py
@@ -0,0 +1,98 @@
+from kivy.factory import Factory
+from kivy.uix.widget import Widget
+from kivy.uix.floatlayout import FloatLayout
+from kivy.uix.boxlayout import BoxLayout
+from kivyblocks.blocks import Blocks
+from kivyblocks.swipebehavior import SwipeBehavior
+from kivyblocks.ready import WidgetReady
+
+class OrientationleLayout(WidgetReady, SwipeBehavior, FloatLayout):
+	"""
+	TwinStyleLayout layout two widget verical when parital orientation
+	and second widget hide when it is in landscape
+	"""
+	def __init__(self,	main_widet=None, second_widget=None, **kw):
+		self.main_widget = main_widget
+		self.second_widget = second_widget
+		self.widget_main = main_widget
+		self.widget_second = second_widget
+		self.second_flg = False
+		FloatLayout.__init__(self, **kw)
+		SwipeBehavior.__init__(self)
+		WidgetReady.__init__(self)
+		self.bind(on_swipe_left=self.toggle_second)
+		self.bind(on_swipe_right=self.toggle_second)
+
+	def isLandscape(self):
+		return self.width > self.height
+
+	def toggle_second(self,*args):
+		if self.isLandscape():
+			if self.widget_second in self.children:
+				self.remove_widget(self.widget_second)
+			else:
+				self.add_widget(self.widget_second)
+				self.on_size(self.size)
+
+	def on_ready(self,*args):
+		if isinstance(main_widget, dict):
+			blocks = Blocks()
+			blocks.bind(on_built=self.main_widget_built)
+			blocks.bind(on_failed=self.widget_build_failed)
+			blocks.widgetBuild(main_widget, ancestor=self)
+		if isinstance(second_widget, dict):
+			blocks = Blocks()
+			blocks.bind(on_built=self.second_widget_built)
+			blocks.bind(on_failed=self.widget_build_failed)
+			blocks.widgetBuild(second_widget, ancestor=self)
+		self.two_widget_layout()
+
+	def on_size(self,*args):
+		self.two_widget_layout()
+
+	def on_pos(self,*args):
+		self.two_widget_layout()
+
+	def two_widget_layout(self, *args):
+		if not isinstance(self.widget_main, Widget) or not isinstance(self.widget_second, Widget):
+			# Clock.schedule_once(self.two_widget_layout,0)
+			return
+
+		if self.isLandscape():
+			self.horizontal_layout()
+		else:
+			self.vertical_layout()
+
+	def horizontal_layout(self):
+		self.widget_main.size = self.size
+		self.widget_main.pos = self.pos
+		self.widget_second.height = self.height
+		self.widget_second.width = self.width * self.height / self.width
+		self.widget_second.pos = (0,0)
+		self.widget_second.opacity = 0.6
+		if self.widget_second in self.children:
+			self.remove_widget(self.widget_second)
+
+	def vertical_layout(self):
+		self.widget_main.width = self.width
+		self.widget_main.height = self.width / 16 * 10
+		self.widget_main.pos = (0, self.height - self.widget_main.height)
+		self.widget_second.width = self.width
+		self.widget_second.height = self.height - self.widget_main.height
+		self.widget_second.pos = (0,0)
+		self.widget_second.opacity = 1
+
+	def main_widget_built(self,o,w):
+		self.widget_main = w
+		if isinstance(self.widget_main, Widget) and isinstance(self.widget_second, Widget):
+			self.ready()
+
+
+	def second_widget_bult(self,o,w):
+		self.widget_second = w
+		if isinstance(self.widget_main, Widget) and isinstance(self.widget_second, Widget):
+			self.ready()
+	
+	def widget_build_failed(self, o, e):
+		pass
+