🧰: prevent world menu opening from overriding custom position

LivelyKernel · Oct 25, 2023 · 73eedf5 · 73eedf5
1 parent c99b5c4
commit 73eedf5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/lively.ide/studio/top-bar.cp.js b/lively.ide/studio/top-bar.cp.js
@@ -189,18 +189,18 @@ export class TopBarModel extends ViewModel {
   }
 
   shapeMenu (evt) {
-    const menu = $world.openWorldMenu(evt, this.getShapeMenuItems());
-    menu.position = this.ui.shapeModeButton.globalBounds().bottomLeft().subPt($world.scroll);
+    const pos = this.ui.shapeModeButton.globalBounds().bottomLeft().subPt($world.scroll);
+    $world.openWorldMenu(evt, this.getShapeMenuItems(), pos);
   }
 
   async saveMenu (evt) {
-    const menu = $world.openWorldMenu(evt, (await this.getSaveMenuItems()));
-    menu.position = this.ui.saveButton.globalBounds().bottomLeft().subPt($world.scroll);
+    const pos = this.ui.saveButton.globalBounds().bottomLeft().subPt($world.scroll);
+    $world.openWorldMenu(evt, (await this.getSaveMenuItems()), pos);
   }
 
   cursorMenu (evt) {
-    const menu = $world.openWorldMenu(evt, this.getHandAndHaloModeItems());
-    menu.position = this.ui.handOrHaloModeButton.globalBounds().bottomLeft().subPt($world.scroll);
+    const pos = this.ui.handOrHaloModeButton.globalBounds().bottomLeft().subPt($world.scroll);
+    $world.openWorldMenu(evt, this.getHandAndHaloModeItems(), pos);
   }
 
   cursorMode () {
@@ -209,8 +209,8 @@ export class TopBarModel extends ViewModel {
   }
 
   canvasMenu (evt) {
-    const menu = this.world().openWorldMenu(evt, this.getCanvasModeItems());
-    menu.position = this.ui.canvasModeButton.globalBounds().bottomLeft().subPt(this.world().scroll);
+    const pos = this.ui.canvasModeButton.globalBounds().bottomLeft().subPt(this.world().scroll);
+    this.world().openWorldMenu(evt, this.getCanvasModeItems(), pos);
   }
 
   onKeyUp () {

diff --git a/lively.ide/world.js b/lively.ide/world.js
@@ -782,13 +782,17 @@ export class LivelyWorld extends World {
     return aMorph;
   }
 
-  async openWorldMenu (evt, items) {
+  async openWorldMenu (evt, items, worldPos = false) {
     const eventState = this.env.eventDispatcher.eventState;
     if (eventState.menu) eventState.menu.remove();
     eventState.menu = items && items.length
       ? Menu.openAtHand(items, { hand: (evt && evt.hand) || this.firstHand })
       : null;
-    await eventState.menu.whenRendered();
+    if (worldPos) {
+      eventState.menu.position = worldPos;
+      return eventState.menu;
+    }
+    await eventState.menu.whenRendered(); // this causes weird flickering when
     return this.moveIntoVisibleBounds(eventState.menu);
   }