Various biome fixes

deepnight · Nov 30, 2023 · 025e9e9 · 025e9e9
1 parent 58e6b04
commit 025e9e9
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 25 deletions.
diff --git a/app/assets/css/app.min.css b/app/assets/css/app.min.css
diff --git a/app/assets/css/app.scss b/app/assets/css/app.scss
@@ -8576,16 +8576,27 @@ body.sorting ul.collapsedSortTarget {
 					.biome {
 						display: flex;
 						align-items: center;
+						justify-content: center;
 						cursor: pointer;
+						min-width: 24px;
+
+						&:hover{
+							background-color: transparentize($color: white, $amount: 0.6);
+						}
 
 						img {
 							margin-left: -10px;
 						}
 						img:first-of-type {
 							margin-left: 0;
 						}
-						&:hover{
-							background-color: transparentize($color: white, $amount: 0.6);
+
+						.empty {
+							width: 8px;
+							height: 8px;
+							border-radius: 8px;
+							border: 1px solid black;
+							opacity: 0.4;
 						}
 					}
 

diff --git a/src/electron.renderer/data/def/LayerDef.hx b/src/electron.renderer/data/def/LayerDef.hx
@@ -718,5 +718,12 @@ class LayerDef {
 						i++;
 			}
 		}
+
+		if( biomeFieldUid==null )
+			for(rg in autoRuleGroups)
+				if( rg.requiredBiomeValues.length>0 ) {
+					App.LOG.add("tidy", 'Removed biome value from group ${rg.name} in $this');
+					rg.requiredBiomeValues = [];
+				}
 	}
 }
diff --git a/src/electron.renderer/ui/modal/ContextMenu.hx b/src/electron.renderer/ui/modal/ContextMenu.hx
@@ -16,12 +16,18 @@ typedef ContextAction = {
 	var ?separatorAfter: Bool;
 	var ?subMenu: Void->ContextActions;
 	var ?selectionTick : Bool;
-	var ?closeAfter : Bool;
+	var ?keepOpen : Bool;
+}
+
+enum ContextMenuElement {
+	CM_Action(a:ContextAction);
+	CM_Title(str:LocaleString);
 }
 
 class ContextMenu extends ui.Modal {
 	public static var ALL : Array<ContextMenu> = [];
 	var jAttachTarget : js.jquery.JQuery; // could be empty
+	var elements : Array<ContextMenuElement> = [];
 
 	public function new(?m:Coords, ?jNear:js.jquery.JQuery, ?openEvent:js.jquery.Event, isSubMenu=false) {
 		super();
@@ -118,7 +124,20 @@ class ContextMenu extends ui.Modal {
 	}
 
 
+	function reAttach() {
+		jContent.empty();
+		var elems = elements.copy();
+		elements = [];
+		for(e in elems)
+			switch e {
+				case CM_Action(a): add(a);
+				case CM_Title(str): addTitle(str);
+			}
+	}
+
+
 	public function addTitle(str:LocaleString) {
+		elements.push( CM_Title(str) );
 		var jTitle = new J('<div class="title">$str</div>');
 		jTitle.appendTo(jContent);
 		applyAnchor();
@@ -162,20 +181,24 @@ class ContextMenu extends ui.Modal {
 
 		// Button action
 		jButton.click( (_)->{
-			if( a.subMenu==null && a.closeAfter!=false )
-				closeAll();
+			if( a.cb!=null )
+				a.cb();
+
+			if( a.subMenu==null ) {
+				if( a.keepOpen==true )
+					reAttach();
+				else
+					closeAll();
+			}
 
 			if( a.subMenu!=null ) {
 				addClass("subMenuOpen");
 				var c = new ContextMenu(jButton, true);
-				c.onCloseCb = ()->{
-					removeClass("subMenuOpen");
-				}
+				c.onCloseCb = ()->removeClass("subMenuOpen");
+
 				for(subAction in a.subMenu())
 					c.add(subAction);
 			}
-			if( a.cb!=null )
-				a.cb();
 		});
 
 		return jButton;
@@ -186,6 +209,8 @@ class ContextMenu extends ui.Modal {
 		if( a.show!=null && !a.show() )
 			return new js.jquery.JQuery();
 
+		elements.push( CM_Action(a) );
+
 		var jButton = createButton(a);
 		jButton.appendTo(jContent);
 		applyAnchor();

diff --git a/src/electron.renderer/ui/modal/panel/EditAllAutoLayerRules.hx b/src/electron.renderer/ui/modal/panel/EditAllAutoLayerRules.hx
@@ -545,8 +545,8 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 					invalidateRuleGroup(rg);
 					editor.ge.emit( LayerRuleGroupChanged(rg) );
 				},
-				closeAfter: false,
 				selectionTick: rg.requiredBiomeValues.length==0 ? true : null,
+				keepOpen: true,
 			});
 			for(ev in enumDef.values) {
 				subMenu.push({
@@ -559,7 +559,7 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 					},
 					selectionTick: rg.requiredBiomeValues.contains(ev.id) ? true : null,
 					jHtmlImg: ev.tileRect!=null ? project.resolveTileRectAsHtmlImg(ev.tileRect) : null,
-					closeAfter: false,
+					keepOpen: true,
 				});
 			}
 		}
@@ -639,21 +639,24 @@ class EditAllAutoLayerRules extends ui.modal.Panel {
 
 		// Biome
 		var jBiome = jGroupHeader.find(".biome");
-		if( rg.requiredBiomeValues.length>0 ) {
-			var biomeImgs = ld.getRuleGroupBiomeHtmlImgs(rg,22);
-			if( biomeImgs.length>0 ) {
-				for( jImg in biomeImgs )
-					jImg.appendTo(jBiome);
+		if( ld.biomeFieldUid==null )
+			jBiome.hide();
+		else {
+			if( rg.requiredBiomeValues.length>0 ) {
+				var biomeImgs = ld.getRuleGroupBiomeHtmlImgs(rg,22);
+				if( biomeImgs.length>0 )
+					for( jImg in biomeImgs )
+						jImg.appendTo(jBiome);
 			}
+			else
+				jBiome.append('<span class="empty"/>');
+
 			jBiome.click( (ev)->{
-				var actions = createBiomePickerCtxActions(rg);
 				var ctx = new ContextMenu(ev);
 				for(a in createBiomePickerCtxActions(rg))
 					ctx.add(a);
 			});
 		}
-		else
-			jBiome.hide();
 
 		// Add rule
 		var jAdd = jGroupHeader.find(".addRule");

diff --git a/src/electron.renderer/ui/modal/panel/EditLayerDefs.hx b/src/electron.renderer/ui/modal/panel/EditLayerDefs.hx
@@ -442,7 +442,7 @@ class EditLayerDefs extends ui.modal.Panel {
 				}
 			);
 
-			// Biome enum select
+			// Biome field select
 			var enumFieldUids = project.defs.levelFields.filter( f->f.isEnum() ).map( f->f.uid );
 			JsTools.createValuesSelect(
 				jForm.find("[name=biomeField]"),
@@ -460,10 +460,8 @@ class EditLayerDefs extends ui.modal.Panel {
 						new LastChance(Lang.t._("Changed auto-layer biome enum"), project);
 
 					cur.biomeFieldUid = uid;
-
-					// TODO cleanup rules with invalid biome values
-
 					editor.ge.emit( LayerDefChanged(cur.uid) );
+					cur.tidy(project);
 				}
 			);
 		}