diff --git a/.travis.yml b/.travis.yml index 2cd0ff8..72aa64f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ os: - linux haxe: - - "3.4.2" + - "3.4.4" - development before_install: diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 0000000..d650512 --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,5 @@ +Change Log +--------- +* 0.0.2 + * Enhanced text input / display +* 0.0.1 - Initial Release diff --git a/TravisBuild.hx b/TravisBuild.hx new file mode 100644 index 0000000..2c3d368 --- /dev/null +++ b/TravisBuild.hx @@ -0,0 +1,29 @@ +import haxe.io.Path; +import haxe.macro.Compiler; +import sys.io.Process; + +using StringTools; + +class TravisBuild { + public static function addNmeClasspaths () { + var proc = new Process("haxelib", ["path", "nme"]); + proc.exitCode(); + var path = proc.stdout.readAll().toString().split("\n"); + proc.close(); + + var cp = ""; + for (p in path) { + if (p.startsWith("-L ") || p.startsWith("-D ") || p == "") { + continue; + } + cp = p; + break; + } + + Compiler.addClassPath(Path.join([cp, "src"])); + + if (Compiler.getDefine("NME_NO_HAXE_COMPAT") == null) { + Compiler.addClassPath(Path.join([cp, "src/haxe/compat"])); + } + } +} diff --git a/haxe/ui/backend/ImageDisplayBase.hx b/haxe/ui/backend/ImageDisplayBase.hx index 65ab543..ec071af 100644 --- a/haxe/ui/backend/ImageDisplayBase.hx +++ b/haxe/ui/backend/ImageDisplayBase.hx @@ -93,7 +93,7 @@ class ImageDisplayBase { if(_imageClipRect == null) { sprite.scrollRect = null; } else { - sprite.scrollRect = new openfl.geom.Rectangle(-_left, -_top, Math.fround(_imageClipRect.width), Math.fround(_imageClipRect.height)); + sprite.scrollRect = new flash.geom.Rectangle(-_left, -_top, Math.fround(_imageClipRect.width), Math.fround(_imageClipRect.height)); sprite.x = _imageClipRect.left; sprite.y = _imageClipRect.top; } diff --git a/haxe/ui/backend/ScreenBase.hx b/haxe/ui/backend/ScreenBase.hx index 16b24e0..0d28c5b 100644 --- a/haxe/ui/backend/ScreenBase.hx +++ b/haxe/ui/backend/ScreenBase.hx @@ -21,7 +21,7 @@ class ScreenBase { Lib.current.stage.addEventListener(nme.events.Event.RESIZE, onStageResize); } - public var options(default, default):Dynamic; + public var options(default, default):ToolkitOptions; public var width(get, null):Float; public function get_width():Float { diff --git a/haxe/ui/backend/ToolkitOptions.hx b/haxe/ui/backend/ToolkitOptions.hx new file mode 100644 index 0000000..00c0616 --- /dev/null +++ b/haxe/ui/backend/ToolkitOptions.hx @@ -0,0 +1,4 @@ +package haxe.ui.backend; + +typedef ToolkitOptions = { +} diff --git a/linux.hxml b/linux.hxml index c9471f7..8e4d20c 100644 --- a/linux.hxml +++ b/linux.hxml @@ -13,4 +13,5 @@ -cp . #--no-output +--macro TravisBuild.addNmeClasspaths() --macro haxe.macro.Compiler.include("haxe.ui") diff --git a/windows.hxml b/windows.hxml index cef97d3..c2ee70e 100644 --- a/windows.hxml +++ b/windows.hxml @@ -13,4 +13,5 @@ -cp . #--no-output +--macro TravisBuild.addNmeClasspaths() --macro haxe.macro.Compiler.include("haxe.ui")