Context menu offset

Author: tentone

README.md

@@ -159,6 +159,8 @@
 	- Resize is now a part of Object3D
 	- Improvements to nsp files
 		- Moved from base64 to raw binary data.
+	- Cube camera preview
+	- Fixed dropdown menus getting out of screen
 
 ### Tech
 nunuStudio is built on top of a number of open source projects

build/nunu.editor.min.js

@@ -123,11 +123,11 @@ LensFlare.prototype.copy = function (source)
  */
 LensFlare.prototype.addFlare = function(texture, size, distance, blending, color, opacity)
 {
-	if(size === undefined) size = -1;
-	if(distance === undefined) distance = 0;
-	if(opacity === undefined) opacity = 1;
-	if(color === undefined) color = new Color(0xffffff);
-	if(blending === undefined) blending = NormalBlending;
+	if(size === undefined){size = -1;}
+	if(distance === undefined){distance = 0;}
+	if(opacity === undefined){opacity = 1;}
+	if(color === undefined){color = new Color(0xffffff)}
+	if(blending === undefined){blending = NormalBlending;}
 
 	distance = Math.min(distance, Math.max(0, distance));
 

docs/editor/nunu.editor.min.js

@@ -1,7 +1,7 @@
 "use strict";
 
 //Based on code from cannonjs debug shape renderer made by schteppe
-function PhysicsObjectHelper(obj)
+function PhysicsObjectHelper(obj, color)
 {
 	THREE.Object3D.call(this);
 
@@ -11,7 +11,7 @@ function PhysicsObjectHelper(obj)
 
 	this.material = new THREE.MeshBasicMaterial(
 	{
-		color: 0x00FF00,
+		color: (color !== undefined) ? color : 0x00FF00,
 		wireframe: false,
 		transparent: true,
 		opacity: 0.5

source/core/objects/misc/LensFlare.js

@@ -13,6 +13,7 @@ function ContextMenu(parent)
 	//Attributes
 	this.size = new THREE.Vector2(130, 20);
 	this.position = new THREE.Vector2(0, 0);
+	this.offset = new THREE.Vector2(20, 10);
 	this.visible = true;
 
 	//Options
@@ -93,7 +94,6 @@ ContextMenu.prototype.addMenu = function(name)
 //Update interface
 ContextMenu.prototype.updateInterface = function()
 {
-	//Visibility
 	if(this.visible)
 	{
 		this.element.style.visibility = "visible";
@@ -108,10 +108,21 @@ ContextMenu.prototype.updateInterface = function()
 		}
 
 		//Element
-		this.element.style.top = this.position.y + "px";
-		this.element.style.left = this.position.x + "px";
+		this.element.style.top = (this.position.y - this.offset.y) + "px";
+		this.element.style.left = (this.position.x - this.offset.x) + "px";
 		this.element.style.width = this.size.x + "px";
-		this.element.style.height = (this.size.y * this.options.length)+ "px";
+		this.element.style.height = (this.size.y * this.options.length) + "px";
+
+		//Check if its inside window
+		var out = DOMUtils.checkBorder(this.element);
+		if(out.x !== 0)
+		{
+			this.element.style.left = (this.position.x + this.offset.x - this.size.x) + "px"; 
+		}
+		if(out.y !== 0)
+		{
+			this.element.style.top = (this.position.y - this.offset.y - out.y) + "px";
+		}
 	}
 	else
 	{

source/editor/helpers/PhysicsObjectHelper.js

@@ -273,8 +273,6 @@ DropdownMenu.prototype.setExpanded = function(expanded)
 				this.panel.style.top = (this.position.y - out.y) + "px";
 			}
 		}
-
-		console.log(out);
 	}
 	else
 	{

source/editor/ui/ContextMenu.js

@@ -189,7 +189,7 @@ function TreeElement(container)
 			//Context menu
 			var context = new ContextMenu();
 			context.size.set(150, 20);
-			context.position.set(event.clientX - 5, event.clientY - 5);
+			context.position.set(event.clientX, event.clientY);
 
 			//Open editor
 			if(self.obj instanceof Scene)

source/editor/ui/DropdownMenu.js

@@ -21,7 +21,7 @@ function AudioAsset(parent)
 	{
 		var context = new ContextMenu();
 		context.size.set(130, 20);
-		context.position.set(event.clientX - 5, event.clientY - 5);
+		context.position.set(event.clientX, event.clientY);
 
 		context.addOption("Create Emitter", function()
 		{

source/editor/ui/TreeElement.js

@@ -21,7 +21,7 @@ function FontAsset(parent)
 	{
 		var context = new ContextMenu();
 		context.size.set(130, 20);
-		context.position.set(event.clientX - 5, event.clientY - 5);
+		context.position.set(event.clientX, event.clientY);
 
 		context.addOption("Rename", function()
 		{