Commit: 1d4e7e1afd1f7edab6b2724973ad4707c7e152c0 - haxe-koreader (hg)

Haxe bindings for koreader

Commit MetaInfo

• Revision: 1d4e7e1afd1f7edab6b2724973ad4707c7e152c0 (tree)
• Time: 2022-03-04 07:27:15
• Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Log Message

Add ButtonDialog

Change Summary

• modified: demo/haxeplug/HaxePlugin.hx
• add: src/koreader/hxutils/LuaArray.lua.hx
• add: src/koreader/ui/widget/ButtonDialog.lua.hx

Incremental Difference

diff -r 7e51cfe8fc64 -r 1d4e7e1afd1f demo/haxeplug/HaxePlugin.hx
--- a/demo/haxeplug/HaxePlugin.hx	Tue Mar 01 23:09:22 2022 +0100
+++ b/demo/haxeplug/HaxePlugin.hx	Thu Mar 03 23:27:15 2022 +0100
@@ -6,6 +6,7 @@
 import koreader.ffi.Blitbuffer;
 import koreader.ui.UIManager;
 import koreader.ui.widget.Button;
+import koreader.ui.widget.ButtonDialog;
 import koreader.ui.widget.ConfirmBox;
 import koreader.ui.widget.container.CenterContainer;
 import koreader.ui.widget.container.FrameContainer;
@@ -78,6 +79,10 @@
                             callback: displayRegexTest,
                         }),
                         Button.create({
+                            text: "Button dialog",
+                            callback: displayButtonDialog,
+                        }),
+                        Button.create({
                             text: "Close",
                             callback: function close() {
                                 UIManager.close(mainWindow, Partial);
@@ -140,4 +145,14 @@
         var message = InfoMessage.create({text: "Regex result:\n" + text});
         UIManager.show(message);
     }
+
+    public static function displayButtonDialog() {
+        var callback = () -> UIManager.show(InfoMessage.create({text: "Pressed"}));
+        UIManager.show(ButtonDialog.create({
+            buttons: [[
+                { text: "Button 1", callback: callback, enabled: false},
+                { text: "Button 2", callback: callback},
+            ]],
+        }));
+    }
 }
\ No newline at end of file

diff -r 7e51cfe8fc64 -r 1d4e7e1afd1f src/koreader/hxutils/LuaArray.lua.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/koreader/hxutils/LuaArray.lua.hx	Thu Mar 03 23:27:15 2022 +0100
@@ -0,0 +1,23 @@
+package koreader.hxutils;
+
+import lua.Table;
+
+/**
+    Helper class to pass arrays to koreader functions
+**/
+abstract LuaArray<T>(lua.Table<Int, T>)
+{
+    inline function new(t:lua.Table<Int, T>) {
+        this = t;
+    }
+
+    @:from
+    static public function fromArray<T>(arr:Array<T>) {
+        return new LuaArray(lua.Table.fromArray(arr));
+    }
+
+    @:to
+    public function toArray() {
+        return Table.toArray(this);
+    }
+}
\ No newline at end of file

diff -r 7e51cfe8fc64 -r 1d4e7e1afd1f src/koreader/ui/widget/ButtonDialog.lua.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/koreader/ui/widget/ButtonDialog.lua.hx	Thu Mar 03 23:27:15 2022 +0100
@@ -0,0 +1,20 @@
+package koreader.ui.widget;
+
+import koreader.hxutils.LuaArray;
+import koreader.ui.widget.Button.ButtonParams;
+import koreader.ui.widget.container.InputContainer;
+
+@:luaRequire("ui/widget/buttondialog")
+@:build(KoreaderMacros.setupKoreaderExternClass())
+extern class ButtonDialog extends InputContainer {
+    @:native("new")
+    @:constructor
+    private function create(params: ButtonDialogParams) : ButtonDialog;
+}
+
+typedef ButtonDialogParams = {
+    > InputContainerParams,
+    ?buttons : LuaArray<LuaArray<ButtonParams>>,
+    ?tap_close_callback : () -> Void,
+    ?alpha : Float,
+}
\ No newline at end of file