Merge branch 'patch' into gh-pages

JannisX11 · Nov 2, 2023 · 4b1ae74 · 4b1ae74
2 parents 734f280 + eba0c09
commit 4b1ae74
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/css/dialogs.css b/css/dialogs.css
@@ -1515,7 +1515,10 @@ dialog#edit_bedrock_binding > .dialog_wrapper > .dialog_content {
 		background-color: transparent;
 	}
 	#bar_item_list li {
-		padding: 4px; 
+		padding: 4px;
+		height: 32px;
+		display: flex;
+		gap: 8px;
 	}
 	#bar_item_list li:hover {
 		color: var(--color-light);
@@ -1525,7 +1528,7 @@ dialog#edit_bedrock_binding > .dialog_wrapper > .dialog_content {
 		height: 26px;
 		vertical-align: text-top;
 	}
-	#bar_item_list li:not(:hover) div.icon_wrapper.add, #bar_item_list li:hover div.icon_wrapper.normal {
+	#bar_item_list li:not(:hover) div.icon_wrapper.add, #bar_item_list li:hover > .icon {
 		display: none;
 	}
 	#bar_items_current {

diff --git a/js/display_mode.js b/js/display_mode.js
@@ -2146,7 +2146,7 @@ BARS.defineActions(function() {
 			Project.model_3d.position.set(-20, 21, 0);
 			Project.model_3d.rotation.set(
 				Math.degToRad(-95),
-				Math.degToRad(44),
+				Math.degToRad(45),
 				Math.degToRad(115),
 				'ZYX'
 			);

diff --git a/js/interface/menu.js b/js/interface/menu.js
@@ -62,6 +62,7 @@ class Menu {
 		this.onClose = this.options.onClose;
 	}
 	hover(node, event, expand) {
+		if (node.classList.contains('focused')) return;
 		if (event) event.stopPropagation()
 		$(open_menu.node).find('li.focused').removeClass('focused')
 		$(open_menu.node).find('li.opened').removeClass('opened')

diff --git a/js/io/project.js b/js/io/project.js
@@ -510,8 +510,7 @@ new Property(ModelProject, 'array', 'timeline_setups', {
 	condition: () => Format.animation_mode,
 });
 new Property(ModelProject, 'object', 'unhandled_root_fields', {
-	exposed: false,
-	default: {}
+	exposed: false
 });
 
 

diff --git a/js/util/property.js b/js/util/property.js
@@ -19,6 +19,7 @@ class Property {
 				case 'number': this.default = 0; break;
 				case 'boolean': this.default = false; break;
 				case 'array': this.default = []; break;
+				case 'object': this.default = {}; break;
 				case 'instance': this.default = null; break;
 				case 'vector': this.default = [0, 0, 0]; break;
 				case 'vector2': this.default = [0, 0]; break;
@@ -31,6 +32,7 @@ class Property {
 			case 'number': this.isNumber = true; break;
 			case 'boolean': this.isBoolean = true; break;
 			case 'array': this.isArray = true; break;
+			case 'object': this.isObject = true; break;
 			case 'instance': this.isInstance = true; break;
 			case 'vector': this.isVector = true; break;
 			case 'vector2': this.isVector2 = true; break;
@@ -68,6 +70,10 @@ class Property {
 	getDefault(instance) {
 		if (typeof this.default == 'function') {
 			return this.default(instance);
+		} else if (this.isArray) {
+			return this.default.slice();
+		} else if (this.isObject) {
+			return Object.keys(this.default).length ? JSON.parse(JSON.stringify(this.default)) : {};
 		} else {
 			return this.default;
 		}