From f380aadf9450fed6164d656709257af9f0d68812 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 17 Nov 2022 15:02:46 +0800
Subject: [PATCH] bugfix

---
 kivyblocks/landscopehide.py | 90 +++++++++++++++++++++++++++++++++++++
 kivyblocks/register.py      |  5 +++
 2 files changed, 95 insertions(+)
 create mode 100644 kivyblocks/landscopehide.py

diff --git a/kivyblocks/landscopehide.py b/kivyblocks/landscopehide.py
new file mode 100644
index 0000000..f7a4edd
--- /dev/null
+++ b/kivyblocks/landscopehide.py
@@ -0,0 +1,90 @@
+
+from kivy.uix.floatlayout import FloatLayout
+from kivy.uix.widget import Widget
+from kivyblocks.bgcolorbehavior import BGColorBehavior
+from kivyblocks.utils import SUPER
+from kivyblocks.mixin import get_mixins, filter_mixin
+from kivyblocks.register import widget_build
+
+class LandscopeHide(FloatLayout):
+	def __init__(self, fix_desc=None, float_desc=None, **kw):
+		self.fix_widget = None
+		self.float_widget = None
+		self.float_show_landscope = False
+		FloatLayout.__init__(self, **kw)
+		if fix_desc:
+			if isinstance(fix_desc, Widget):
+				self.fix_widget = fix_desc
+			else:
+				self.fix_widget = widget_build(fix_desc)
+		if float_desc:
+			if isinstance(float_desc, Widget):
+				self.float_widget = float_desc
+			else:
+				self.float_widget = widget_build(float_desc)
+		self.bind(size=self.size_changed)
+
+	def get_subwidgets(self):
+		return (self.fix_widget, self.float_widget)
+
+	def hide_float(self):
+		self.float_show_landscope = False
+		if not self.is_landscope():
+			return
+		if self.float_widget not in self.children:
+			return 
+		self.remove_widget(self.float_widget)
+
+	def force_show_float(self):
+		self.float_show_landscope = True
+		if self.float_widget in self.children:
+			return
+		self.show_float()
+
+	def is_landscope(self):
+		return self.width > self.height
+		
+	def size_changed(self, *args):
+		print(f'force={self.float_show_landscope}, landscope={self.is_landscope()}, w={self.width}, h={self.height}')
+		self.rate = min(*self.size) / max(*self.size)
+		self.clear_widgets()
+		self.show_fix()
+		self.show_float()
+
+	def show_fix(self):
+		if self.is_landscope():
+			print('show_fix() landscope')
+			self.fix_widget.size_hint = (1, 1)
+			self.fix_widget.pos = (0,0)
+		else:
+			print('show_fix() not landscope')
+			self.fix_widget.size_hint = (1, None)
+			self.fix_widget.height = self.width * self.rate
+			self.fix_widget.pos = (0, self.height - self.fix_widget.height)
+		self.add_widget(self.fix_widget)
+		
+	def show_float(self):
+		if self.is_landscope():
+			if self.float_show_landscope:
+				print('show_float() landscope')
+				self.float_widget.size_hint = (None, 1)
+				self.float_widget.width = self.height * self.rate
+				self.float_widget.pos = (0, 0)
+				self.add_widget(self.float_widget)
+		else:
+			print('show_float() not landscope')
+			self.float_widget.size_hint = (1, None)
+			self.float_widget.height = self.height - self.fix_widget.height
+			self.float_widget.pos = (0, 0)
+			self.add_widget(self.float_widget)
+
+if __name__ == '__main__':
+	from kivy.app import App
+	from kivy.uix.button import Button
+
+	class TestApp(App):
+		def build(self):
+			x = LandscopeHide(fix_desc=Button(text='Fix'),
+								float_desc=Button(text='Float'))
+			return x
+	TestApp().run()
diff --git a/kivyblocks/register.py b/kivyblocks/register.py
index 635c3f6..5ba1768 100644
--- a/kivyblocks/register.py
+++ b/kivyblocks/register.py
@@ -155,3 +155,8 @@ def register_blocks(name, value):
 	except:
 		Logger.info(f'plugin : register_blocks():{name} register error')
 
+def widget_build(desc):
+	b = Factory.Blocks()
+	w = b.widgetBuild(desc)
+	return w
+