Stopped setting assumed screen resolution in Mozilla/XULRunner 1.8 since the browser...

[videolink.git] / videolink.cpp

diff --git a/videolink.cpp b/videolink.cpp
index 8ab52660ec2b3d347692a499af9cb4194c20d1fa..bda78ce113c51bca35894e3db3e14795eb7455b6 100644 (file)
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -885,8 +885,21 @@ namespace
        // slightly different but unfortunately Mozilla doesn't
        // support non-square pixels (and neither do fontconfig or Xft
        // anyway).
-       check(pref_branch->SetIntPref("browser.display.screen_resolution",
-                                     40));
+
+       // The browser.display.screen_resolution preference sets the
+       // the nominal resolution for dimensions expressed in pixels.
+       // (They may be scaled!)  In Mozilla 1.7 it also sets the
+       // assumed resolution of the display - hence pixel sizes are
+       // respected on-screen - but this is no longer the case in
+       // 1.8.  Therefore it was renamed to layout.css.dpi in 1.8.1.
+       // In 1.8 we need to set the assumed screen resolution
+       // separately, but don't know how yet.  Setting one to 40
+       // but not the other is *bad*, so currently we set neither.
+
+#      if MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR < 8
+           check(pref_branch->SetIntPref("browser.display.screen_resolution",
+                                         40));
+#      endif
     }
 
 } // namespace