nw2: Fix Win.zoomLevel

rogerwang · rogerwang · commit 67f77173c47c · 2019-01-08T05:12:53.000-07:00
Ref nwjs#5875
diff --git a/src/api/nw_current_window_internal.idl b/src/api/nw_current_window_internal.idl
@@ -36,10 +36,10 @@ namespace nw.currentWindowInternal {
     static bool isKioskInternal();
     static void capturePageInternal(optional CapturePageOptions options, optional CapturePageCallback callback);
     static void clearMenu(optional long win);
-    static MenuPatch[] setMenu(long id, optional long wid);
+    static MenuPatch[] setMenu(long id, optional long winId);
     static void reloadIgnoringCache();
-    static double getZoom();
-    static void setZoom(double level);
+    static double getZoom(optional long winId);
+    static void setZoom(double level, optional long winId);
     static void setShowInTaskbar(boolean show);
     static DOMString getTitleInternal(optional long winId);
     static void setTitleInternal(DOMString title, optional long winId);
diff --git a/src/api/nw_window_api.cc b/src/api/nw_window_api.cc
@@ -721,6 +721,16 @@ NwCurrentWindowInternalReloadIgnoringCacheFunction::Run() {
 
 bool NwCurrentWindowInternalGetZoomFunction::RunNWSync(base::ListValue* response, std::string* error) {
   content::WebContents* web_contents = GetSenderWebContents();
+  if (args_->GetSize() > 0) {
+    int id = 0;
+    args_->GetInteger(0, &id);
+    Browser* browser = getBrowser(this, id);
+    if (!browser) {
+      *error = "no browser window found";
+      return false;
+    }
+    web_contents = browser->tab_strip_model()->GetActiveWebContents();
+  }
   if (!web_contents)
     return false;
   double zoom_level =
@@ -734,6 +744,16 @@ bool NwCurrentWindowInternalSetZoomFunction::RunNWSync(base::ListValue* response
 
   EXTENSION_FUNCTION_VALIDATE(args_->GetDouble(0, &zoom_level));
   content::WebContents* web_contents = GetSenderWebContents();
+  if (args_->GetSize() > 1) {
+    int id = 0;
+    args_->GetInteger(1, &id);
+    Browser* browser = getBrowser(this, id);
+    if (!browser) {
+      *error = "no browser window found";
+      return false;
+    }
+    web_contents = browser->tab_strip_model()->GetActiveWebContents();
+  }
   if (!web_contents)
     return false;
   ZoomController* zoom_controller =
diff --git a/src/resources/api_nw_newwin.js b/src/resources/api_nw_newwin.js
@@ -579,10 +579,10 @@ Object.defineProperty(NWWindow.prototype, 'title', {
 });
 Object.defineProperty(NWWindow.prototype, 'zoomLevel', {
   get: function() {
-    return currentNWWindowInternal.getZoom();
+    return currentNWWindowInternal.getZoom(this.cWindow.id);
   },
   set: function(val) {
-    currentNWWindowInternal.setZoom(val);
+    currentNWWindowInternal.setZoom(val, this.cWindow.id);
   }
 });
 Object.defineProperty(NWWindow.prototype, 'isTransparent', {
