Cleanup ctx menu positionner

deepnight · Nov 29, 2023 · d25a74a · d25a74a
1 parent 3f3f674
commit d25a74a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/src/electron.renderer/ui/Modal.hx b/src/electron.renderer/ui/Modal.hx
@@ -66,6 +66,8 @@ class Modal extends dn.Process {
 
 
 	function applyAnchor() {
+		anchorInvalidated = false;
+
 		var docHei = App.ME.jDoc.innerHeight();
 
 		switch anchor {
@@ -304,9 +306,7 @@ class Modal extends dn.Process {
 
 	override function postUpdate() {
 		super.postUpdate();
-		if( anchorInvalidated ) {
-			anchorInvalidated = false;
+		if( anchorInvalidated )
 			applyAnchor();
-		}
 	}
 }
diff --git a/src/electron.renderer/ui/modal/ContextMenu.hx b/src/electron.renderer/ui/modal/ContextMenu.hx
@@ -26,6 +26,9 @@ class ContextMenu extends ui.Modal {
 			ME.destroy();
 		ME = this;
 
+		setTransparentMask();
+		addClass("contextMenu");
+
 		if( openEvent!=null || jNear!=null ) {
 			var jEventTarget = jNear!=null ? jNear : new J(openEvent.target);
 			jAttachTarget = jEventTarget;
@@ -34,28 +37,21 @@ class ContextMenu extends ui.Modal {
 			jAttachTarget.addClass("contextMenuOpen");
 
 			if( jEventTarget.is("button") || jEventTarget.parent().is("button") || jNear!=null )
-				placer = ()->setAnchor( MA_JQuery(jEventTarget) );
+				setAnchor( MA_JQuery(jEventTarget) );
 			else if( openEvent!=null )
-				placer = ()->setAnchor( MA_Coords(new Coords(openEvent.pageX, openEvent.pageY)) );
-
+				setAnchor( MA_Coords(new Coords(openEvent.pageX, openEvent.pageY)) );
 		}
 		else {
 			jAttachTarget = new J("");
 			if( m!=null )
-				placer = ()->setAnchor( MA_Coords(m) );
+				setAnchor( MA_Coords(m) );
 		}
-
-		setTransparentMask();
-		addClass("contextMenu");
-		placer();
 	}
 
 	public function enableNoWrap() {
 		jContent.addClass("noWrap");
 	}
 
-	dynamic function placer() {}
-
 	public static inline function isOpen() return ME!=null && !ME.destroyed;
 
 	override function onDispose() {
@@ -104,14 +100,8 @@ class ContextMenu extends ui.Modal {
 	}
 
 
-	override function onResize() {
-		super.onResize();
-		checkPosition();
-	}
-
-
-	function checkPosition() {
-		placer();
+	override function applyAnchor() {
+		super.applyAnchor();
 
 		var pad = 16;
 		var docHei = App.ME.jDoc.innerHeight();
@@ -127,7 +117,7 @@ class ContextMenu extends ui.Modal {
 	public function addTitle(str:LocaleString) {
 		var jTitle = new J('<div class="title">$str</div>');
 		jTitle.appendTo(jContent);
-		checkPosition();
+		applyAnchor();
 	}
 
 	public function add(a:ContextAction) {
@@ -160,7 +150,7 @@ class ContextMenu extends ui.Modal {
 		if( a.separatorAfter )
 			jButton.addClass("separatorAfter");
 
-		checkPosition();
+		applyAnchor();
 		return jButton;
 	}
 }