diff --git a/src/haxe/ru/m/puzzlez/PuzzlezTheme.hx b/src/haxe/ru/m/puzzlez/PuzzlezTheme.hx index 40340b9..6650fe2 100644 --- a/src/haxe/ru/m/puzzlez/PuzzlezTheme.hx +++ b/src/haxe/ru/m/puzzlez/PuzzlezTheme.hx @@ -27,8 +27,8 @@ class PuzzlezTheme extends Theme { "font.color" => Color.fromString("red"), ], "text")); - var size = 42; - var smallSize = 32; + var size = Device.isMobile() ? 64 : 42; + var smallSize = Device.isMobile() ? 42 : 32; register(new Style("icon", [ "geometry.width" => SizeValue.fromInt(size), "geometry.height" => SizeValue.fromInt(size), diff --git a/src/haxe/ru/m/puzzlez/view/BackgroundPopup.yaml b/src/haxe/ru/m/puzzlez/view/BackgroundPopup.yaml index 48af784..4ee6e9b 100644 --- a/src/haxe/ru/m/puzzlez/view/BackgroundPopup.yaml +++ b/src/haxe/ru/m/puzzlez/view/BackgroundPopup.yaml @@ -19,7 +19,7 @@ view: - id: selected $type: haxework.view.SpriteView geometry.width: 100% - geometry.height: 100 + geometry.height: 200 - id: colors $type: haxework.view.data.DataView factory: ~colorButtonFactory @@ -36,10 +36,6 @@ view: $type: haxework.view.layout.TailLayout margin: 5 +onDataSelect: ~(imageId) -> selected = IMAGE(imageId) - - id: image - $type: ru.m.view.ColorView - geometry.hAlign: center - +onSelect: ~(color) -> selected = COLOR(color) - $type: haxework.view.group.HGroupView geometry.width: 100% layout.hAlign: center diff --git a/src/haxe/ru/m/view/ColorView.hx b/src/haxe/ru/m/view/ColorView.hx deleted file mode 100644 index 97f2753..0000000 --- a/src/haxe/ru/m/view/ColorView.hx +++ /dev/null @@ -1,36 +0,0 @@ -package ru.m.view; - -import flash.events.MouseEvent; -import haxework.color.Color; -import haxework.signal.Signal; -import haxework.view.ImageView; -import openfl.Assets; - -class ColorView extends ImageView { - - public var onSelect(default, null):Signal = new Signal(); - - public function new() { - super(Assets.getBitmapData("resources/colors.png")); - content.cacheAsBitmap = true; - content.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown); - } - - private function onMouseDown(event:MouseEvent):Void { - content.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove); - content.stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp); - onMouseMove(event); - } - - private function onMouseMove(event:MouseEvent):Void { - if (event.localX >= width || event.localY >= height) { - return; - } - onSelect.emit(image.getPixel32(Std.int(event.localX), Std.int(event.localY))); - } - - private function onMouseUp(event:MouseEvent):Void { - content.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove); - content.stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp); - } -} diff --git a/src/resources/colors.png b/src/resources/colors.png deleted file mode 100644 index 396dd9b..0000000 Binary files a/src/resources/colors.png and /dev/null differ diff --git a/work.md b/work.md index 42eb1dd..c651593 100644 --- a/work.md +++ b/work.md @@ -3,3 +3,4 @@ * navigation * render: table scale/move * images paginator +* image preview