New Grid and Notification component and several styling and alignment…

… bugfixes
newk5 · Apr 7, 2020 · b335d54 · b335d54
1 parent 3ebf010
commit b335d54
Show file tree

Hide file tree

Showing 19 changed files with 1,484 additions and 188 deletions.
diff --git a/script/GridDemo.nut b/script/GridDemo.nut
@@ -0,0 +1,48 @@
+ local grid = UI.Grid({
+ id = "grid"
+ align = "top_center" 
+ move = { down = "15%"}
+ rows =2
+ columns =4
+ margin = 5
+ cellWidth = 80
+ cellHeight = 80
+ borderStyle = {
+ color =::Colour(255,0,0)
+ size = 2
+ } 
+ onHoverOverCell = function(cell){
+ cell.Colour = ::Colour(150,200,150);
+ }
+ onHoverOutCell = function(cell){
+ cell.Colour = ::Colour(0,0,0,0);
+ }
+ onCellClick = function(cell){
+ cell.Colour = ::Colour(150,150,200);
+ }
+
+}); 
+
+//adds components to the grid row by row
+grid.add(
+ UI.Canvas({
+ id = "c"
+ Color = ::Colour(230,231,92,100)
+ })
+)
+grid.add(
+ UI.Canvas({
+ id = "c2"
+ Color = ::Colour(230,231,92,100)
+ })
+)
+
+//adds components to the grid in a specific cell
+grid.put(
+ UI.Canvas({
+ id = "c3"
+ Color = ::Colour(10,231,92,100)
+ }),
+ 1, //row
+ 3 //column
+)
diff --git a/script/NotificationDemo.nut b/script/NotificationDemo.nut
@@ -0,0 +1,32 @@
+UI.Notification({
+ id="not" 
+ type = "info" 
+ title = "INFORMATION" 
+ time = 10 //seconds before it disappears
+ Size = VectorScreen(200, 90) 
+ text = "HELLO"
+ autoSize = true 
+ })
+ UI.Notification({
+ id="not2" 
+ type = "success" 
+ title = "SUCCESS" 
+ time = 5 
+ text = "HELLO"
+ })
+ UI.Notification({
+ id="not3" 
+ type = "warning" 
+ title = "WARNING" 
+ time = 10 
+ Size = VectorScreen(200, 90) 
+ text = "HELLO" 
+ })
+ UI.Notification({
+ id="not4" 
+ type = "error" 
+ title = "ERROR" 
+ time = 10 
+ Size = VectorScreen(200, 90) 
+ text = "HELLO"
+ })
diff --git a/script/TableDemo.nut b/script/TableDemo.nut
@@ -4,14 +4,13 @@ UI.Cursor("ON");
 local t = UI.DataTable({
  id="tbl", 
  contextMenu = {
- type = "canvas"
  options = [
  { 
  name = "Delete",
  color = Colour(255,0,0),
  onClick = function() {
  local row = this.data.row; //clicked row
- // ::removeData(row);
+
  UI.DataTable("tbl").removeRow(row);
  }
 

diff --git a/script/debug.nut b/script/debug.nut
@@ -84,7 +84,7 @@
  }
 
 
- function errorHandling(err) {
+function errorHandling(err) {
  local stackInfos = getstackinfos(2);
 
  if (stackInfos) {

diff --git a/script/decui/Timers.nut b/script/decui/Timers.nut
@@ -67,7 +67,6 @@ Timer <- {
  {
  tm.CallCount++;
  tm.LastCall = CurrTime;
-
  tm.Listener.pacall(tm.Args);
 
  if (tm.Repeat != 0 && tm.CallCount >= tm.Repeat)

diff --git a/script/decui/UI/Events.nut b/script/decui/UI/Events.nut
@@ -9,11 +9,10 @@
  } 
 
  function onGameResize(){
-
- foreach(i,list in this.UI.lists ) { 
+ 
+ foreach(i,list in this.UI.lists ) {  
  foreach(c,e in list ) { 
- if (e.parents.len() == 0){
-
+ if (e.rawin("parents") && e.parents.len() == 0){
 
  if (e.rawin("RelativeSize") && e.RelativeSize != null && e.RelativeSize.len() > 0){
 
@@ -25,6 +24,7 @@
  } 
  e.updateBorders();
 
+
  }else{
 
  e.resetPosition();
@@ -33,7 +33,6 @@
  e.shiftPos(); 
  }
 
-
  }
 
  foreach (idx, child in e.getChildren() ){
@@ -45,16 +44,25 @@
  if (child.rawin("onGameResize") && child.onGameResize != null){
  child.onGameResize();
  }
+ if (child.hidden){
+ child.hide();
+ }
+ if (child.hidden){
+ child.hidden = false; //after being realigned, the GUIElement is no longer hidden so we need to re-apply the hidden 'state'
+ child.hide(); 
+ }
  }
  if (e.rawin("onGameResize") && e.onGameResize != null){
  e.onGameResize();
  }
+
+ if (e.hidden){
+ e.hidden = false; //after being realigned, the GUIElement is no longer hidden so we need to re-apply the hidden 'state'
+ e.hide(); 
+ }
+
  }
-
-
-
-
-
+
  }
  }
  } 
@@ -164,23 +172,26 @@
  }
 
  function onHoverOver(el){ 
+ if (el.rawin("metadata") && el.metadata != null){
 
- this.UI.hoveredEl= { id =el.id, list = el.metadata.list };
- try {
- if (el.tooltip != null){
- local isString = (typeof el.tooltip ) == "string";
- local doesNotSpecifyEvent = isString ? true : !el.tooltip.rawin("event");
- local eventIsNotFocus = !doesNotSpecifyEvent ? el.tooltip.event != "focus" : true;
-
- if (isString || doesNotSpecifyEvent || eventIsNotFocus) {
- el.showTooltip();
- }
- } 
- } catch(e){
+
+ this.UI.hoveredEl= { id =el.id, list = el.metadata.list };
+ try {
+ if (el.tooltip != null){
+ local isString = (typeof el.tooltip ) == "string";
+ local doesNotSpecifyEvent = isString ? true : !el.tooltip.rawin("event");
+ local eventIsNotFocus = !doesNotSpecifyEvent ? el.tooltip.event != "focus" : true;
+
+ if (isString || doesNotSpecifyEvent || eventIsNotFocus) {
+ el.showTooltip();
+ }
+ } 
+ } catch(e){
 
- } 
- if(el.onHoverOver!=null){
- el.onHoverOver();
+ } 
+ if(el.onHoverOver!=null){
+ el.onHoverOver();
+ }
  }
 
  }