tidy up

mint.flow

@@ -2,6 +2,12 @@
  project : {
  name : 'mint',
  version : '1.0.0',
- author : 'underscorediscovery'
+ author : 'underscorediscovery',
+ build : {
+ dependencies : {
+ "hxparse" : '*',
+ "cassowary.hx" : '*'
+ }
+ }
  }
 }

mint/Window.hx

@@ -30,6 +30,8 @@ class Window extends Control {
  var down_start : Point;
  var _mouse:Point;
 
+ var resize_handle : Control;
+
  @:allow(mint.ControlRenderer)
  var window_options : WindowOptions;
 
@@ -56,6 +58,16 @@ class Window extends Control {
  var close_bounds = new Rect(bounds.w-24, 2, 22, 22 );
  var view_bounds = new Rect(24, 24, bounds.w - 48, bounds.h - 48 );
 
+ resize_handle = new Control({
+ parent : this,
+ bounds : new Rect(bounds.w-24, bounds.h-24, 24, 24),
+ name : name + '.resize_handle',
+ });
+
+ resize_handle.mouse_enabled = true;//options.resizable
+ resize_handle.mousedown.listen(on_resize_down);
+ resize_handle.mouseup.listen(on_resize_up);
+
  //create the title label
  title = new Label({
  parent : this,
@@ -88,6 +100,21 @@ class Window extends Control {
 
  } //new
 
+ var resizing = false;
+ var resize_start : Point;
+
+ function on_resize_up(e:MouseEvent, _) {
+ resizing = false;
+ canvas.dragged = null;
+ }
+
+ function on_resize_down(e:MouseEvent, _) {
+ if(resizing) return;
+ resizing = true;
+ resize_start = new Point(e.x, e.y);
+ canvas.dragged = this;
+ }
+
  function on_close() {
 
  onclose.emit();
@@ -114,6 +141,16 @@ class Window extends Control {
 
  super.onmousemove(e);
 
+ if(resizing) {
+ var diff_x = e.x - resize_start.x;
+ var diff_y = e.y - resize_start.y;
+ // resize_start
+ var ww = bounds.w + diff_x;
+ var hh = bounds.h + diff_y;
+ resize_start.set(e.x, e.y);
+ bounds = new Rect(bounds.x, bounds.y, ww, hh);
+ }
+
  if(dragging) {
 
  var diff_x = e.x - drag_start.x;
@@ -168,4 +205,14 @@ class Window extends Control {
 
  } //onmouseup
 
+ override function set_bounds( _b:Rect ) {
+
+ bounds = super.set_bounds(_b);
+
+ if(resize_handle != null)
+ resize_handle.bounds = new Rect(_b.w-24, _b.h-24, 24, 24);
+
+ return bounds;
+ }
+
 }

mint/module/render/List.hx

@@ -0,0 +1,118 @@
+package mint.render;
+
+import mint.Types;
+import mint.Renderer;
+
+import mint.render.LuxeMintRender;
+import mint.render.Convert;
+
+import luxe.Text;
+import luxe.Color;
+import luxe.Log.log;
+import luxe.Log._debug;
+import phoenix.geometry.RectangleGeometry;
+
+class List extends mint.render.Base {
+
+ public var list : mint.List;
+ public var text : Text;
+
+ public var selected_color: Int = 0x9dca63;
+ public var hover_color: Int = 0xffffff;
+
+ // public var select_rects: Array<RectangleGeometry>;
+ // public var hover_rect: RectangleGeometry;
+
+ public function new( _render:Renderer, _control:mint.List ) {
+
+ super(_render, _control);
+ list = _control;
+
+ _debug('create / ${control.name}');
+
+ list.onitementer.listen(onitementer);
+ list.onitemleave.listen(onitemleave);
+ list.onselect.listen(onselect);
+
+ // select_rects = [];
+
+ // hover_rect = Luxe.draw.rectangle({
+ // color: new Color(1,1,1,0.1).rgb(hover_color),
+ // x: 0, y:0, w:0, h:0, depth:_control.depth
+ // });
+
+ // var r = Luxe.draw.rectangle({
+ // color: new Color(1,1,1,1).rgb(selected_color),
+ // x: 0, y:0, w:0, h:0, depth:_control.depth
+ // });
+ // select_rects.push(r);
+
+ connect();
+ }
+
+ function onitementer(idx, ctrl:mint.Control, e) {
+ if(!selected) {
+ // var r = Convert.rect(ctrl.real_bounds);
+ // hover_rect.set({ rect:r, color:new Color(1,1,1,0.2) });
+ // hover_rect.color.tween(0.5,{a:0.1});
+ // hover_rect.depth = ctrl.depth+(ctrl.nodes*0.001)+0.00001;
+ }
+ }
+
+ function onitemleave(idx, ctrl, e) {
+ // if(!selected) hover_rect.color.tween(0.5,{a:0});
+ }
+
+ var selected = false;
+ function onselect(idx, ctrl:Control, e) {
+ selected = (null != ctrl);
+ // trace("SELECT " + selected + "/" + (ctrl != null ? ctrl.name : 'null'));
+ // if(selected) {
+ // var r = Convert.rect(ctrl.real_bounds);
+ // select_rects[0].set({ rect:r, color:new Color(1,1,1,1).rgb(selected_color) });
+ // select_rects[0].depth = ctrl.depth+(ctrl.nodes*0.001)+0.00002;
+ // } else {
+ // trace('lose selection');
+ // select_rects[0].color.tween(0.5,{a:0});
+ // }
+ }
+
+ override function ondestroy() {
+ disconnect();
+ destroy();
+
+ // hover_rect.drop();
+ // select_rects[0].drop();
+ }
+
+ override function onclip( _rect:Rect ) {
+ _debug('clip / $_rect');
+ if(_rect == null) {
+ // hover_rect.clip_rect = null;
+ // select_rects[0].clip_rect = null;
+ } else {
+ // var r = Convert.rect(_rect);
+ // hover_rect.clip_rect = r;
+ // select_rects[0].clip_rect = r;
+ }
+ } //onclip
+
+ override function ontranslate( _x:Float=0.0, _y:Float=0.0, _offset:Bool=false ) {
+ _debug('translate / $_x / $_y / $_offset');
+ // hover_rect.transform.pos.add_xyz(_x, _y);
+ // select_rects[0].transform.pos.add_xyz(_x, _y);
+ } //ontranslate
+
+ override function onvisible( _visible:Bool ) {
+ _debug('visible / $_visible');
+ // hover_rect.visible = _visible;
+ // select_rects[0].visible = _visible;
+ } //onvisible
+
+ override function ondepth( _depth:Float ) {
+ _debug('depth / $_depth');
+ // select_rects[0].depth = list.depth+(list.nodes*0.001)+0.00002;
+ // hover_rect.depth = list.depth+(list.nodes*0.001)+0.00002;
+ } //ondepth
+
+} //Label

mint/render/Scroll.hx → mint/module/render/Scroll.hx

@@ -113,8 +113,8 @@ class Scroll extends mint.render.Base {
  override function onvisible( _visible:Bool ) {
  _debug('visible / $_visible');
  visual.visible = _visible;
- scrollh.visible = scroll.scroll.h.enabled;
- scrollv.visible = scroll.scroll.v.enabled;
+ scrollh.visible = scroll.scroll.h.enabled && _visible;
+ scrollv.visible = scroll.scroll.v.enabled && _visible;
  } //onvisible
 
  override function ondepth( _depth:Float ) {

tests/test_luxe/src/Main.hx

@@ -25,23 +25,23 @@ class Main extends luxe.Game {
  var window: mint.Window;
  var window2: mint.Window;
 
- var render: LuxeMintRenderer;
+ var render: LuxeMintRender;
 
  var debug : Bool = false;
 
  override function ready() {
 
- Luxe.renderer.clear_color.rgb(0x373737);
+ Luxe.renderer.clear_color.rgb(0x161619);
 
- var t = Luxe.loadTexture('assets/transparency.png');
- t.onload = function(_) {
+ var te = Luxe.resources.load_texture('assets/transparency.png');
+ te.then(function(t) {
 
  // new Props();
  // new MintFormat();
 
  // return;
 
- render = new LuxeMintRenderer();
+ render = new LuxeMintRender();
  canvas = new mint.Canvas({
  renderer: render,
  bounds: new Rect(10,10,900,512)
@@ -124,7 +124,7 @@ class Main extends luxe.Game {
 
  trace(canvas.nodes);
 
- }
+ });
 
 
  } //ready