Feather 0 Errors 0 Warnings 0 Suggestions

Author: evolutionleo

SimpleUI.yyp

@@ -1,4 +1,4 @@
 /// @desc set self.fps
 
-self.fps = fps_real
+_fps = fps_real
 alarm[0] = 8

fonts/fSimpleUITitle/fSimpleUITitle.yy

@@ -1,27 +1,29 @@
 /// @desc
 
 global.some_text = "Some big text"
-self.fps = -1
+_fps = -1
 alarm[0] = 8
 
 canvas = new SUICanvas([
 	new SUIText(room_width/2, room_height/2, SUIBind("global.some_text"),
 		{font: fSimpleUITitle, halign: fa_center, valign: fa_middle})
 ])
 
-canvas.appendChild(new SUIText(50, 50, SUIBind(".fps")))
+canvas.appendChild(new SUIText(50, 50, SUIBind("._fps")))
 canvas.appendChild(new SUIButton(200, 100, "Click me", function() { show_message_async("Clicked!") }))
 canvas.appendChild(new SUISprite(700, 50, sSimpleUIDemo, 0, {w: 200, h: 50}))
 canvas.appendChild(new SUITextInput(100, 400,,,SUIBind("global.some_text", "global.some_text"),"Enter the title"))
 
+
+var mx = SUIBind("mouse.x")
+var my = SUIBind("mouse.y")
+var mtext = SUIBind(function() { return "pos: " + string({x: mouse_x, y: mouse_y}) })
 canvas.appendChild(
 new SUIText(
 	// follow mouse
-	SUIBind("mouse.x"),
-	SUIBind("mouse.y"),
-	SUIBind(
-		function() { return "pos: " + string({x: mouse_x, y: mouse_y}) }
-	),
+	mx,
+	my,
+	mtext,
 	{
 		hoverable: false
 	}

objects/oSimpleUIDemo/Alarm_0.gml

@@ -23,10 +23,17 @@ function SUITextInput(x, y, w = 192, h = 48, text = "", placeholder = "", props
 	self.placeholder_element = undefined
 
 	init = function() {
-		self.box_element = appendChild(new SUIBox(0, 0, get("w"), get("h"), props))
-		self.text_element = appendChild(new SUIText(10, get("h")/2, SUIBind("self.text", "self.text"), props))
-		self.cursor_element = appendChild(new SUISprite(190, get("h")/2, sSimpleUITextCursor, 0))
-		self.placeholder_element = appendChild(new SUIText(10, get("h")/2, SUIBind("self.placeholder_text", "self.placeholder_text")))
+		var bx = 0, by = 0, bw = get("w"), bh = get("h")
+		self.box_element = appendChild(new SUIBox(bx, by, bw, bh, props))
+		
+		var tx = 10, ty = get("h")/2
+		self.text_element = appendChild(new SUIText(tx, ty, SUIBind("self.text", "self.text"), props))
+		
+		var cx = 190, cy = get("h")/2
+		self.cursor_element = appendChild(new SUISprite(cx, cy, sSimpleUITextCursor, 0))
+		
+		var px = 10, py = get("h")/2
+		self.placeholder_element = appendChild(new SUIText(px, py, SUIBind("self.placeholder_text", "self.placeholder_text")))
 
 		box_element.hoverable = false
 		text_element.hoverable = false

objects/oSimpleUIDemo/Create_0.gml

@@ -10,6 +10,7 @@ global.__SUIEmptyFunction = function() {}
 // if the mouse goes > this away from the border of a button, it will be "unclicked"
 #macro SUI_CLICK_OFFSET 96
 
+
 global.sui_canvases = []
 
 function SUICanvas(children = []) constructor {
@@ -42,7 +43,13 @@ function SUICanvas(children = []) constructor {
 		element.onSelect()
 	}
 
+	///@param {String} name
+	///@returns {Any} value
 	get = function(name) { return variable_struct_get(self, name) }
+	
+	///@param {String} name
+	///@param {Any} value
+	///@returns {Undefined}
 	set = function(name, value) { variable_struct_set(self, name, value) }
 
 	forEach = function(func, arr = self.children, parent = self) {
@@ -271,8 +278,23 @@ function SUIElement(x, y, props = {}, children = []) constructor {
 	getX = function() { return self.canvas.calculateX(self, self.parent) }
 	getY = function() { return self.canvas.calculateY(self, self.parent) }
 
+	
+	///@function
+	///@desc you should call this function at the end of your custom UI elements' constructor
+	///@param {Struct} props
+	///@self {SUIElement}
+	function SUILoadProps(props) {
+		SUIInherit(self, global.SUI_DEFAULT_PROPS)
+		if (variable_struct_exists(global.SUI_DEFAULT_ELEMENT_PROPS, self.__element_type))
+			SUIInherit(self, global.SUI_DEFAULT_ELEMENT_PROPS[$ self.__element_type])
+		SUIInherit(self, props)
+	}
+	
 	#region get/set
 
+	///@param {String} prop_name
+	///@param {Any} default_value
+	///@returns {Any} value
 	get = function(prop_name, default_value = undefined) {
 		var value = variable_struct_get(self, prop_name)
 		while (is_struct(value) and instanceof(value) == "SUIBinding") {
@@ -284,6 +306,8 @@ function SUIElement(x, y, props = {}, children = []) constructor {
 		else return value
 	}
 
+	///@param {String} prop_name
+	///@param {Any} value
 	set = function(prop_name, value) {
 		var old_value = variable_struct_get(self, prop_name)
 		if(is_struct(old_value) and instanceof(old_value) == "SUIBinding") {
@@ -345,7 +369,13 @@ function SUIElement(x, y, props = {}, children = []) constructor {
 	distanceToMouse = function() {
 		var mx = SUIMouseX
 		var my = SUIMouseY
-		return SUIDistanceToRectangle(mx, my, self.get("left"), self.get("top"), self.get("right"), self.get("bottom"))
+		
+		var left = self.get("left")
+		var top = self.get("top")
+		var right = self.get("right")
+		var bottom = self.get("bottom")
+		
+		return SUIDistanceToRectangle(mx, my, left, top, right, bottom)
 	}
 
 

scripts/SUITextBox/SUITextBox.gml

@@ -1,3 +1,6 @@
+///@function SUIBind(_get, _set)
+///@param {Function|String} _get
+///@param {Function|String} _set
 function SUIBind(_get = SUIEmptyFunction, _set = SUIEmptyFunction) {
 	// get = "global.something" or get = "oPlayer.username"
 	if is_string(_get) {

scripts/SimpleUI/SimpleUI.gml

@@ -14,11 +14,3 @@ global.SUI_DEFAULT_ELEMENT_PROPS = {
 	//}
 	// ...
 }
-
-// you should call this function at the end of your custom UI elements' constructor
-function SUILoadProps(props) {
-	SUIInherit(self, global.SUI_DEFAULT_PROPS)
-	if (variable_struct_exists(global.SUI_DEFAULT_ELEMENT_PROPS, self.__element_type))
-		SUIInherit(self, global.SUI_DEFAULT_ELEMENT_PROPS[$ self.__element_type])
-	SUIInherit(self, props)
-}

scripts/SimpleUIBinding/SimpleUIBinding.gml

@@ -19,6 +19,8 @@ function SUIDistanceToRectangle(px, py, x1, y1, x2, y2) {
 
 #region Variable stuff
 
+///@param {Struct} dest
+///@param {Struct} src
 function SUIInherit(dest, src) {
 	var var_names = variable_struct_get_names(src)
 	var names_len = variable_struct_names_count(src)
@@ -56,25 +58,28 @@ function SUIVarGet(scope, varname) {
 	}
 }
 
+///@function SUIVarSet(scope, varname, value)
+///@param {Any} scope
+///@param {String} varname
+///@param {Any} value
 function SUIVarSet(scope, varname, value) {
 	if (is_undefined(argument[1])) {
 		varname = argument[0]
 		value = argument[1]
 		scope = other
 	}
+	else {
+		value = argument[2]
+	}
 
 	if (scope == global) {
 		variable_global_set(varname, value)
 	}
+	else if (is_struct(scope)) {
+		variable_struct_set(scope, varname, value)
+	}
 	else {
-		with(scope) {
-			if (is_struct(self)) {
-				variable_struct_set(self, varname, value)
-			}
-			else {
-				variable_instance_set(self, varname, value)
-			}
-		}
+		variable_instance_set(scope, varname, value)
 	}
 }