Fix buttons with no icon

HeapsIO · Apr 17, 2023 · 12532ba · 12532ba
1 parent a892bbe
commit 12532ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hide/comp/Toolbar.hx b/hide/comp/Toolbar.hx
@@ -64,7 +64,7 @@ class Toolbar extends Component {
 
 	public function addButton( icon : String, ?label : String, ?onClick : Void -> Void, ?rightClick : Void -> Void ) {
 		var e = new Element('<div class="button2" title="${label==null ? "" : label}"></div>');
-        if (icon != "") {
+        if (icon != "" && icon != null) {
             e.append(new Element('<div class="icon ico ico-$icon"/>'));
         }
         else {

diff --git a/hide/view/Prefab.hx b/hide/view/Prefab.hx
@@ -476,11 +476,11 @@ class Prefab extends FileView {
 
 		toolsDefs.push({id: "", title : "", icon : "", type : Separator});
 
-		toolsDefs.push({id: "graphicsFilters", title : "Graphics filters", type : Menu(filtersToMenuItem(graphicsFilters, "Graphics"))});
+		toolsDefs.push({id: "graphicsFilters", title : "Graphics filters", type : Popup((e) -> new FiltersPopup(null, e, this, sceneFilters, "Graphics"))});
 
 		toolsDefs.push({id: "", title : "", icon : "", type : Separator});
 
-		toolsDefs.push({id: "sceneFilters", title : "Scene filters", type : Menu(filtersToMenuItem(sceneFilters, "Scene"))});
+		toolsDefs.push({id: "sceneFilters", title : "Scene filters", type : Popup((e) -> new FiltersPopup(null, e, this, sceneFilters, "Scene"))});
 
 		toolsDefs.push({id: "", title : "", icon : "", type : Separator});