Commit: 49243744bee211cd36fd6907013714e4fe9e5cd1 - haxeui-koreader (hg)

Commit MetaInfo

• Revisão: 49243744bee211cd36fd6907013714e4fe9e5cd1 (tree)
• Hora: 2022-07-16 05:44:15
• Autor: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fast...>
• Commiter: Jaime Marquínez Ferrándiz

Mensagem de Log

Allow opening dialogs

Mudança Sumário

• modified: assets/main-view.xml
• modified: demo.hxml
• modified: demo/MainView.hx
• modified: src/haxe/ui/backend/ComponentImpl.hx
• modified: src/haxe/ui/backend/native.xml
• add: assets/custom-dialog.xml
• add: demo/CustomDialog.hx
• add: src/haxe/ui/backend/DialogBase.hx
• add: src/haxe/ui/backend/koreader/DialogWrapper.hx
• add: src/haxe/ui/backend/koreader/creators/DialogCreator.hx

Diff

diff -r 452e094b9e3f -r 49243744bee2 assets/custom-dialog.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/assets/custom-dialog.xml	Fri Jul 15 22:44:15 2022 +0200
@@ -0,0 +1,6 @@
+<dialog>
+    <vbox>
+        <label text="Custom dialog" />
+        <button text="Close" id="btnClose"/>
+    </vbox>
+</dialog>
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 assets/main-view.xml
--- a/assets/main-view.xml	Tue Apr 05 21:34:31 2022 +0200
+++ b/assets/main-view.xml	Fri Jul 15 22:44:15 2022 +0200
@@ -19,5 +19,7 @@
                 <button text="Y" />
             </hbox>
         </vbox>
+
+        <button text="Open custom dialog" id="btnDialog" />
     </hbox>
 </vbox>
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 demo.hxml
--- a/demo.hxml	Tue Apr 05 21:34:31 2022 +0200
+++ b/demo.hxml	Fri Jul 15 22:44:15 2022 +0200
@@ -2,6 +2,9 @@
 #
 # SPDX-License-Identifier: Unlicense
 
+
+--library haxeui-core
+--library haxe-koreader
 --class-path src
 
 --macro include("haxe.ui.backend.koreader")
@@ -11,9 +14,6 @@
 --class-path demo
 --main Main
 
---library haxeui-core
---library haxe-koreader
-
 --dce full
 
 --lua out/haxeui_demo.lua

diff -r 452e094b9e3f -r 49243744bee2 demo/CustomDialog.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/demo/CustomDialog.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -0,0 +1,14 @@
+import haxe.ui.events.MouseEvent;
+import haxe.ui.containers.dialogs.Dialog;
+
+@:build(haxe.ui.ComponentBuilder.build("assets/custom-dialog.xml"))
+class CustomDialog extends Dialog {
+    public function new() {
+        super();
+    }    
+    
+    @:bind(btnClose, MouseEvent.CLICK)
+    private function onOpenDialog(e:MouseEvent) {
+        this.hide();
+    }
+}
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 demo/MainView.hx
--- a/demo/MainView.hx	Tue Apr 05 21:34:31 2022 +0200
+++ b/demo/MainView.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -21,4 +21,10 @@
     private function onMyButton(e:MouseEvent) {
         btn2.text = "Clicked!";
     }
+    
+    @:bind(btnDialog, MouseEvent.CLICK)
+    private function onOpenDialog(e:MouseEvent) {
+        var dialog = new CustomDialog();
+        dialog.showDialog();
+    }
 }
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 src/haxe/ui/backend/ComponentImpl.hx
--- a/src/haxe/ui/backend/ComponentImpl.hx	Tue Apr 05 21:34:31 2022 +0200
+++ b/src/haxe/ui/backend/ComponentImpl.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -6,6 +6,7 @@
 
 import haxe.ui.backend.koreader.creators.Creator;
 import haxe.ui.backend.koreader.WidgetWrapper;
+import haxe.ui.backend.koreader.DialogWrapper;
 import haxe.ui.components.Button;
 import haxe.ui.components.Label;
 import haxe.ui.containers.HBox;
@@ -43,7 +44,7 @@
             parent = Toolkit.screen.mainContainer;
         }
 
-        var creatorClass:String = Toolkit.nativeConfig.query('component[id=${className}].@creator', null, this);
+        var creatorClass:String = this.getCreator();
         if (creatorClass != null) {
             var creator : Creator = Type.createInstance(Type.resolveClass(creatorClass), [this]);
             this.wrapper = creator.createWrapper(parent);
@@ -54,4 +55,42 @@
 
         parent.children.push(cast(this, Component));
     }
+
+    private function getCreator() {
+        var valueType = Type.typeof(this);
+        switch (valueType) {
+            case TClass(cls):
+                return this.getCreatorClassname(cls);
+            default:
+                return null;
+        } 
+    }
+
+    private function getCreatorClassname(cls : Class<Dynamic>) {
+        if (cls == null) {
+            trace('the class for the component ${className} is null');
+            return null;
+        }
+        var clsName = Type.getClassName(cls);
+        trace(clsName);
+        var creatorClass = Toolkit.nativeConfig.query('component[id=${clsName}].@creator', null, this);
+        if (creatorClass != null) {
+            return creatorClass;
+        } else {
+            return this.getCreatorClassname(Type.getSuperClass(cls));
+        }
+    }
+
+    override function handleVisibility(show:Bool) {
+        if (this.wrapper is DialogWrapper) {
+            var dlgWrapper = cast(this.wrapper, DialogWrapper);
+            if (show) {
+                UIManager.show(dlgWrapper.dialog);
+                UIManager.setDirty(dlgWrapper.dialog, Partial); 
+            } else {
+                UIManager.close(dlgWrapper.dialog);
+                UIManager.setDirty(dlgWrapper.dialog, Partial); 
+            }
+        }
+    }
 }
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 src/haxe/ui/backend/DialogBase.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/DialogBase.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -0,0 +1,40 @@
+package haxe.ui.backend;
+
+import haxe.exceptions.NotImplementedException;
+import haxe.ui.containers.Box;
+import haxe.ui.containers.VBox;
+import haxe.ui.containers.dialogs.Dialog.DialogButton;
+import haxe.ui.core.Component;
+
+class DialogBase extends Component {
+    public var modal:Bool = true;
+    public var buttons:DialogButton = null;
+    public var centerDialog:Bool = true;
+    public var button:DialogButton = null;
+
+    public var dialogContentContainer:VBox;
+    public var dialogContent:VBox;
+    public var customDialogFooterContainer:Box;
+    public var customDialogFooter:Box;
+
+    public var title:String;
+
+    public function new() {
+        super();
+        this._hidden = true;
+    }
+
+    public function showDialog(modal:Bool = true) {
+        this.modal = modal;
+        show();
+    }
+
+    override function show() {
+        this.ready();
+        super.show();
+    }
+
+    private function createButtons() {
+        throw new NotImplementedException();
+    }
+}

diff -r 452e094b9e3f -r 49243744bee2 src/haxe/ui/backend/koreader/DialogWrapper.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/koreader/DialogWrapper.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -0,0 +1,12 @@
+package haxe.ui.backend.koreader;
+
+import koreader.ui.widget.Widget;
+
+class DialogWrapper extends WidgetWrapper {
+    public var dialog : Widget;
+    
+    public function new(dialog : Widget, container : Widget) {
+        super(container);
+        this.dialog = dialog;
+    }
+}
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 src/haxe/ui/backend/koreader/creators/DialogCreator.hx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/haxe/ui/backend/koreader/creators/DialogCreator.hx	Fri Jul 15 22:44:15 2022 +0200
@@ -0,0 +1,46 @@
+package haxe.ui.backend.koreader.creators;
+
+import koreader.ui.widget.container.MovableContainer;
+import koreader.Device;
+import koreader.ui.widget.container.CenterContainer;
+import koreader.ffi.Blitbuffer;
+import koreader.ui.widget.VerticalGroup;
+import koreader.ui.Size;
+import koreader.ui.widget.container.FrameContainer;
+import koreader.ui.widget.Widget;
+
+@:keep
+class DialogCreator extends Creator {
+    private var _dialog : haxe.ui.containers.dialogs.Dialog;
+
+    public function new(dialog : haxe.ui.containers.dialogs.Dialog) {
+        super(dialog);
+        this._dialog = dialog;
+    }
+
+	function createWidget() : Widget {
+		throw new haxe.exceptions.NotImplementedException();
+	}
+
+    override function createWrapper(parent : WidgetWrapper) : WidgetWrapper {
+        var frame = FrameContainer.create({
+            background: Blitbuffer.COLOR_GRAY,
+            bordersize: Size.border.window,
+            radius: Size.radius.window,
+            padding: Size.padding.default_,
+        });
+
+        var group = VerticalGroup.create({});
+        frame.addWidget(group);
+
+        var dialog = CenterContainer.create({
+            dimen: Device.screen.getSize(),
+            widgets: [
+                MovableContainer.create({
+                    widgets: [frame],
+                }),
+            ],
+        });
+        return new DialogWrapper(dialog, group);
+    }
+}
\ No newline at end of file

diff -r 452e094b9e3f -r 49243744bee2 src/haxe/ui/backend/native.xml
--- a/src/haxe/ui/backend/native.xml	Tue Apr 05 21:34:31 2022 +0200
+++ b/src/haxe/ui/backend/native.xml	Fri Jul 15 22:44:15 2022 +0200
@@ -12,4 +12,5 @@
     <component id="haxe.ui.components.Label" allowChildren="false" creator="haxe.ui.backend.koreader.creators.LabelCreator" />
     <component id="haxe.ui.containers.HBox" allowChildren="true" creator="haxe.ui.backend.koreader.creators.HBoxCreator" />
     <component id="haxe.ui.containers.VBox" allowChildren="true" creator="haxe.ui.backend.koreader.creators.VBoxCreator" />
+    <component id="haxe.ui.containers.dialogs.Dialog" allowChildren="true" creator="haxe.ui.backend.koreader.creators.DialogCreator" />
 </native>
\ No newline at end of file