提交: 5212866b825190b4c67f2209ffcfce1122b9e963 - haxe-koreader (hg)

Haxe bindings for koreader

Commit MetaInfo

• 修訂: 5212866b825190b4c67f2209ffcfce1122b9e963 (tree)
• 時間: 2021-03-21 21:50:01
• 作者: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Log Message

Add FrameContainer and MovableContainerParams

Change Summary

• modified: demo/Main.hx
• add: src/koreader/ui/widget/container/FrameContainer.lua.hx
• add: src/koreader/ui/widget/container/MovableContainer.lua.hx

差異

diff -r 750f85b086c7 -r 5212866b8251 demo/Main.hx
--- a/demo/Main.hx	Sun Mar 21 13:09:52 2021 +0100
+++ b/demo/Main.hx	Sun Mar 21 13:50:01 2021 +0100
@@ -1,3 +1,5 @@
+import koreader.ui.widget.container.FrameContainer;
+import koreader.ui.widget.container.MovableContainer;
 import koreader.ui.widget.container.CenterContainer;
 import koreader.ui.widget.VerticalGroup;
 import koreader.ui.widget.Button;
@@ -52,7 +54,13 @@
         var container = CenterContainer.create({
             dimen: Device.screen.getSize(),
             widgets: [
-                grp,
+                MovableContainer.create({                    
+                    widgets: [
+                        FrameContainer.create({
+                            widgets: [grp,],
+                        }),
+                    ],
+                }),
             ],
         });
 

diff -r 750f85b086c7 -r 5212866b8251 src/koreader/ui/widget/container/FrameContainer.lua.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/koreader/ui/widget/container/FrameContainer.lua.hx	Sun Mar 21 13:50:01 2021 +0100
@@ -0,0 +1,21 @@
+package koreader.ui.widget.container;
+
+import lua.Table;
+import koreader.hxutils.Tables;
+import koreader.ui.widget.container.WidgetContainer.WidgetContainerParams;
+
+@:luaRequire("ui/widget/container/framecontainer")
+@:build(KoreaderMacros.setupKoreaderExternClass())
+extern class FrameContainer extends WidgetContainer {
+    @:native("new")
+    private function create(params: Table<Dynamic, Dynamic>) : FrameContainer;
+
+    public inline static function create(params: FrameContainerParams) : FrameContainer {
+        var t = Tables.createTable(params, params.widgets);
+        return instance.create(t);
+    }
+}
+
+typedef FrameContainerParams = {
+    > WidgetContainerParams,
+} 
\ No newline at end of file

diff -r 750f85b086c7 -r 5212866b8251 src/koreader/ui/widget/container/MovableContainer.lua.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/koreader/ui/widget/container/MovableContainer.lua.hx	Sun Mar 21 13:50:01 2021 +0100
@@ -0,0 +1,22 @@
+package koreader.ui.widget.container;
+
+import lua.Table;
+import koreader.hxutils.Tables;
+import koreader.ui.widget.container.WidgetContainer.WidgetContainerParams;
+
+@:luaRequire("ui/widget/container/movablecontainer")
+@:build(KoreaderMacros.setupKoreaderExternClass())
+extern class MovableContainer extends WidgetContainer {
+    @:native("new")
+    private function create(params: Table<Dynamic, Dynamic>) : MovableContainer;
+
+    public inline static function create(params: MovableContainerParams) : MovableContainer {
+        var t = Tables.createTable(params, params.widgets);
+        return instance.create(t);
+    }
+}
+
+typedef MovableContainerParams = {
+    > WidgetContainerParams,
+    ?alpha : Int,
+} 
\ No newline at end of file