fixed .move values being reset when using .resize()

script/decui/UI/Store.nut

@@ -0,0 +1,106 @@
+class Store {
+
+ data = null;
+ constructor(d = {}) {
+ this.data = {};
+
+ foreach (key,v in d){
+ local t = typeof v;
+ if (t=="string" || t == "bool" || t=="integer"){
+ this.put(key,v);
+ }else{
+ this.initDefaults(v);
+ this.data[key] <- v;
+ }
+ }
+
+
+ }
+
+ function put(key, value, opts={value=null, el="", elID=""}) {
+ this.initDefaults(opts);
+ opts.value = value;
+ this.data[key] <- opts;
+ }
+
+ function attachIDAndType(key,id, type) {
+ if (this.data.rawin(key)){
+ local o = this.getEntry(key);
+ o.elID = id;
+ o.el = type;
+ }
+ }
+
+ function set(key, val){
+ if (this.data.rawin(key)){
+ local o = this.data[key];
+ local old = o.value;
+ o.value = val;
+ if (o.el=="GUIEditbox" ){
+ UI.Editbox(o.elID).Text =val+""; 
+ } else if (o.el=="GUICheckbox"){
+ if (val == true){
+ UI.Checkbox(o.elID).AddFlags(GUI_FLAG_CHECKBOX_CHECKED);
+ }else{
+ UI.Checkbox(o.elID).RemoveFlags(GUI_FLAG_CHECKBOX_CHECKED);
+ }
+
+ } else if (o.el=="GUILabel"){
+ UI.Label(o.elID).setText(val+""); 
+ } 
+ if (o.onChange != null){
+ o.onChange(old, val);
+ }
+
+ }
+ }
+
+
+ function get(key){
+ if (key.find(".")){
+ local fields = split(key,".");
+ local o = this.getEntry(fields[0]);
+
+ if (o != null){
+
+ local val = o.value;
+ fields = fields.filter(function(idx,e) {
+ return e != fields[0];
+ });
+ foreach (field in fields ) {
+ val = val[field];
+ }
+ return val;
+ }
+ }
+ if (this.data.rawin(key)){
+ return this.data[key].value;
+ }
+ return null;
+ }
+
+ function getEntry(key){
+ if (this.data.rawin(key)){
+ return this.data[key];
+ }
+ return null;
+ }
+
+ function initDefaults(opts){
+
+ if (!opts.rawin("value")){
+ opts["value"] <- null;
+ }
+ if (!opts.rawin("el")){
+ opts["el"] <- "";
+ }
+ if (!opts.rawin("elID")){
+ opts["elID"] <- "";
+ }
+ if (!opts.rawin("onChange")){
+ opts["onChange"] <- null;
+ }
+
+
+ }
+}

script/decui/UI/UI.nut

@@ -18,11 +18,14 @@ class UI {
  listsNumeration = null;
  fetch = null;
  events = null;
+ store = null;
  streamControllers = [];
  lastClickedEl = null;
  openNots = 0;
  notsHeight = 0;
 
+
+
  constructor() {
 
  this.toDelete =[];
@@ -35,10 +38,14 @@ class UI {
  foreach (idx, name in names) {
  listsNumeration[name] <- 0;
  } 
-
+  
  this.fetch = Fetch(this);
  this.events = Events(this);
  }
+
+ function Data(data) {
+ this.store= Store(data);
+ }
 
  function processStream(streamIdentifier, stream){
  foreach(i, sc in this.streamControllers) {
@@ -994,6 +1001,12 @@ class UI {
 
  this.postConstruct(b);
 
+ this.postConstruct(b);
+ if (o.rawin("bindTo")){
+ this.store.attachIDAndType(o.bindTo,o.id, "GUILabel");
+ b.setText(this.store.get(o.bindTo));
+ }
+
  return b;
  }
  function Editbox(o){
@@ -1013,8 +1026,22 @@ class UI {
 
 
  this.postConstruct(b);
+ if (o.rawin("bindTo")){
+ this.store.attachIDAndType(o.bindTo,o.id, "GUIEditbox");
+ b.Text = this.store.get(o.bindTo);
+ }
+
  return b;
  } 
+
+ function setData(key,val){
+ this.store.set(key,val);
+ }
+
+ function getData(key){
+ this.store.get(key);
+ }
+
  function Canvas(o){
  if (typeof o == "string") {
  return this.fetch.canvas(o); 
@@ -1100,6 +1127,16 @@ class UI {
  this.listsNumeration.checkboxes++;
 
  this.postConstruct(b);
+
+ if (o.rawin("bindTo")){
+ this.store.attachIDAndType(o.bindTo,o.id, "GUICheckbox");
+ local val = this.store.get(o.bindTo);
+ if (val){
+ b.AddFlags(GUI_FLAG_CHECKBOX_CHECKED);
+ }else{
+ b.RemoveFlags(GUI_FLAG_CHECKBOX_CHECKED);
+ }
+ }
 
  return b; 
  }

script/decui/decui.nut

@@ -15,6 +15,7 @@ dofile("decui/components/Grid.nut");
 dofile("decui/UI/Fetch.nut");
 dofile("decui/UI/Events.nut");
 dofile("decui/UI/UI.nut");
+dofile("decui/UI/Store.nut");
 
 dofile("decui/util/StreamRequest.nut");
 dofile("decui/util/StreamReader.nut");

script/decui/extensions.nut

@@ -192,12 +192,14 @@ foreach(i,e in elements ) {
  }
 
  c.realign();
+ c.resetMoves();
  c.shiftPos();
  }
  }
-
+  
  if (this.autoResize){
  this.realign();
+ this.resetMoves();
  this.shiftPos();
  }
 
@@ -600,12 +602,14 @@ foreach(i,e in elements ) {
  } 
  if (adjusted){
  this.realign(); 
+ this.resetMoves();
  this.shiftPos(); 
 
  foreach (i, c in this.getChildren()) {
  if (!c.rawin("className")) {
  c.resetPosition();
  c.realign();
+ c.resetMoves();
  c.shiftPos();
  }
  }

script/main.nut

@@ -31,5 +31,6 @@ function Script::ScriptLoad(){
  //dofile("NotificationDemo.nut")
  //dofile("PopupDemo.nut")
  //dofile("TabviewDemo.nut")
+
 
 }