提交: 136d1542ceb50887873b813bc5fc4d7d559d7381 - haxe-koreader (hg)

Haxe bindings for koreader

Commit MetaInfo

• 修訂: 136d1542ceb50887873b813bc5fc4d7d559d7381 (tree)
• 時間: 2021-03-22 07:51:52
• 作者: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Log Message

Reuse code from the plugin

Change Summary

• modified: demo/Main.hx
• modified: demo/haxeplug/HaxePlugin.hx

差異

diff -r a5300699292f -r 136d1542ceb5 demo/Main.hx
--- a/demo/Main.hx	Sun Mar 21 23:18:44 2021 +0100
+++ b/demo/Main.hx	Sun Mar 21 23:51:52 2021 +0100
@@ -1,3 +1,4 @@
+import haxeplug.HaxePlugin;
 import koreader.ui.widget.container.FrameContainer;
 import koreader.ui.widget.container.MovableContainer;
 import koreader.ui.widget.container.CenterContainer;
@@ -5,8 +6,6 @@
 import koreader.ui.widget.Button;
 import koreader.ui.widget.HorizontalGroup;
 import koreader.ui.UIManager;
-import koreader.ui.widget.InfoMessage;
-import koreader.ui.widget.ConfirmBox;
 import koreader.Device;
 import koreader.Logger;
 
@@ -15,28 +14,11 @@
         trace("Haxe trace");
         Logger.instance.dbg("Debug information:", 1);
 
-        var confirm = ConfirmBox.create({
-            text: "Confirm box from Haxe",
-            ok_text: "OK text",
-            cancel_text: "Cancel text",
-            // ok_callback: blah,
-            ok_callback: function ok() {
-                var message = InfoMessage.create({text: "Accepted"});
-                UIManager.show(message);
-            },
-            cancel_callback: function cancel() {
-                var message = InfoMessage.create({text: "Canceled"});
-                UIManager.show(message);
-            },
-        });
-
         var grp = HorizontalGroup.create({
             widgets: [
                 Button.create({
                     text: "Left",
-                    callback: function left() {
-                        UIManager.show(confirm);
-                    }
+                    callback: HaxePlugin.displayWindow,
                 }),
                 VerticalGroup.create({
                     widgets: [

diff -r a5300699292f -r 136d1542ceb5 demo/haxeplug/HaxePlugin.hx
--- a/demo/haxeplug/HaxePlugin.hx	Sun Mar 21 23:18:44 2021 +0100
+++ b/demo/haxeplug/HaxePlugin.hx	Sun Mar 21 23:51:52 2021 +0100
@@ -11,23 +11,25 @@
     override function addToMainMenu(menu_items : Dynamic) {
         Plugin.registerTool(menu_items, "hxplugDemo", {
             text: "Demo haxe plugin",
-            callback: function hxplug() {
-                var confirm = ConfirmBox.create({
-                    text: "Confirm box from Haxe plugin",
-                    ok_text: "OK text",
-                    cancel_text: "Cancel text",
-                    ok_callback: function ok() {
-                        var response = HttpHelper.request("https://worldtimeapi.org/api/ip.txt");
-                        var message = InfoMessage.create({text: "Accepted\n" + response});
-                        UIManager.show(message);
-                    },
-                    cancel_callback: function cancel() {
-                        var message = InfoMessage.create({text: "Canceled"});
-                        UIManager.show(message);
-                    },
-                });
-                UIManager.show(confirm);
+            callback: displayWindow,
+        });
+    }
+
+    public static function displayWindow() {
+        var confirm = ConfirmBox.create({
+            text: "Confirm box from Haxe plugin",
+            ok_text: "OK text",
+            cancel_text: "Cancel text",
+            ok_callback: function ok() {
+                var response = HttpHelper.request("https://worldtimeapi.org/api/ip.txt");
+                var message = InfoMessage.create({text: "Accepted\n" + response});
+                UIManager.show(message);
+            },
+            cancel_callback: function cancel() {
+                var message = InfoMessage.create({text: "Canceled"});
+                UIManager.show(message);
             },
         });
+        UIManager.show(confirm);
     }
 }
\ No newline at end of file