X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=xulapp%2Fchrome%2Fmandelbrot%2Fcontent%2Fmandelbrot.js;h=0a4a31aeeb64a771a9ea20466ccb6ffe07f481a9;hp=95c0e1401eace09be8514a7cb85e4b837421fca5;hb=3e3d9a1d1c51a41435682714a8d601bf641629b5;hpb=8a2b6e174e3cd0d1d30bb48e9842c4e8bfba2827

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js
index 95c0e14..0a4a31a 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.js
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js
@@ -442,24 +442,17 @@ function mouseevent(etype, event) {
         if (zoomend.y < zoomstart.y)
           [zoomend.y, zoomstart.y] = [zoomstart.y, zoomend.y];
 
-        let prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                .getService(Components.interfaces.nsIPromptService);
-        let ok = prompts.confirm(null, gMbrotBundle.getString("zoomConfirmTitle"),
-                                 gMbrotBundle.getString("zoomConfirmLabel"));
-        // ok is now true if OK was clicked, and false if cancel was clicked
-        if (ok) {
-          // determine new "coordinates"
-          let CWidth = gCurrentImageData.C_max.r - gCurrentImageData.C_min.r;
-          let CHeight = gCurrentImageData.C_max.i - gCurrentImageData.C_min.i;
-          let newC_min = new complex(
-              gCurrentImageData.C_min.r + zoomstart.x / gCurrentImageData.iWidth * CWidth,
-              gCurrentImageData.C_min.i + zoomstart.y / gCurrentImageData.iHeight * CHeight);
-          let newC_max = new complex(
-              gCurrentImageData.C_min.r + zoomend.x / gCurrentImageData.iWidth * CWidth,
-              gCurrentImageData.C_min.i + zoomend.y / gCurrentImageData.iHeight * CHeight);
-
-          adjustCoordsAndDraw(newC_min, newC_max);
-        }
+        // determine new "coordinates"
+        let CWidth = gCurrentImageData.C_max.r - gCurrentImageData.C_min.r;
+        let CHeight = gCurrentImageData.C_max.i - gCurrentImageData.C_min.i;
+        let newC_min = new complex(
+            gCurrentImageData.C_min.r + zoomstart.x / gCurrentImageData.iWidth * CWidth,
+            gCurrentImageData.C_min.i + zoomstart.y / gCurrentImageData.iHeight * CHeight);
+        let newC_max = new complex(
+            gCurrentImageData.C_min.r + zoomend.x / gCurrentImageData.iWidth * CWidth,
+            gCurrentImageData.C_min.i + zoomend.y / gCurrentImageData.iHeight * CHeight);
+
+        adjustCoordsAndDraw(newC_min, newC_max);
       }
       zoomstart = undefined;
       break;
@@ -683,10 +676,16 @@ function setPalette(aPaletteID) {
 }
 
 function imgSettings() {
-  if (document.getElementById("mandelbrotWindow").nodeName == "page")
-    document.getElementById("imgSettingsPanel").showPopup(null, "before_start");
-  else
-    window.openDialog("chrome://mandelbrot/content/image-settings.xul");
+  let anchor = null;
+  let position = "before_start";
+  if (document.getElementById("mandelbrotWindow").nodeName == "page") {
+    anchor = document.getElementById("mandelbrotToolbar");
+  }
+  else {
+    anchor = document.getElementById("mandelbrotMenubar");
+    position = "after_start";
+  }
+  document.getElementById("imgSettingsPanel").showPopup(anchor, position);
 }
 
 function updateDebugMenu() {