浏览代码

[shgraph] Small style tweaks

Clement Espeute 1 年之前
父节点
当前提交
8cd1b7b080
共有 3 个文件被更改,包括 36 次插入21 次删除
  1. 6 0
      bin/style.css
  2. 8 0
      bin/style.less
  3. 22 21
      hide/view/shadereditor/ShaderEditor.hx

+ 6 - 0
bin/style.css

@@ -1951,6 +1951,12 @@ input[type=checkbox]:checked:after {
   font-size: 13px;
   padding-right: 5px;
 }
+.graph-view .tabs .tab .hide-block #parametersList .parameter .content {
+  padding: 4px;
+}
+.graph-view .tabs .tab .hide-block #parametersList .parameter .content > div {
+  margin-top: 2px;
+}
 .graph-view .tabs .tab .hide-block #parametersList .parameter > span {
   font-size: 12px;
 }

+ 8 - 0
bin/style.less

@@ -2144,6 +2144,14 @@ input[type=checkbox] {
 							}
 						}
 
+						.content {
+							padding: 4px;
+
+							>div {
+								margin-top: 2px;
+							}
+						}
+
 						/*.content {
 							background-color: #b3b3b3;
 							padding: 5px;

+ 22 - 21
hide/view/shadereditor/ShaderEditor.hx

@@ -798,29 +798,9 @@ class ShaderEditor extends hide.view.Graph {
 			beforeChange();
 			parameter.internal = internal.prop("checked");
 			afterChange();
-
 		});
 
-		header.appendTo(elt);
-		content.appendTo(elt);
-		var actionBtns = new Element('<div class="action-btns" ></div>').appendTo(content);
-		var deleteBtn = new Element('<input type="button" value="Delete" />');
-		deleteBtn.on("click", function() {
-			for (b in listOfBoxes) {
-				var shaderParam = Std.downcast(b.getInstance(), ShaderParam);
-				if (shaderParam != null && shaderParam.parameterId == parameter.id) {
-					error("This parameter is used in the graph.");
-					return;
-				}
-			}
-			beforeChange();
-			shaderGraph.removeParameter(parameter.id);
-			afterChange();
-			elt.remove();
-		});
-		deleteBtn.appendTo(actionBtns);
-
-		var perInstanceCb = new Element('<div><span>PerInstance</span><input type="checkbox"/><div>');
+		var perInstanceCb = new Element('<div><input type="checkbox" name="perinstance"/><label for="perinstance">Per instance</label><div>');
 		var shaderParams : Array<ShaderParam> = [];
 		for (b in listOfBoxes) {
 			var tmpShaderParam = Std.downcast(b.getInstance(), ShaderParam);
@@ -843,6 +823,27 @@ class ShaderEditor extends hide.view.Graph {
 		});
 		perInstanceCb.appendTo(content);
 
+		header.appendTo(elt);
+		content.appendTo(elt);
+		var actionBtns = new Element('<div class="action-btns" ></div>').appendTo(content);
+		var deleteBtn = new Element('<input type="button" value="Delete" />');
+		deleteBtn.on("click", function() {
+			for (b in listOfBoxes) {
+				var shaderParam = Std.downcast(b.getInstance(), ShaderParam);
+				if (shaderParam != null && shaderParam.parameterId == parameter.id) {
+					error("This parameter is used in the graph.");
+					return;
+				}
+			}
+			beforeChange();
+			shaderGraph.removeParameter(parameter.id);
+			afterChange();
+			elt.remove();
+		});
+		deleteBtn.appendTo(actionBtns);
+
+
+
 		var inputTitle = elt.find(".input-title");
 		inputTitle.on("click", function(e) {
 			e.stopPropagation();