Merge pull request #2426 from elpaso/bugfix-13747-bis

Added HiDPI support to QgsWebView
qgis · Nov 7, 2015 · 061bdde · 061bdde
2 parents f77d6cd + dbd9b9b
commit 061bdde
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h
@@ -16,11 +16,13 @@
 #ifndef QGSWEBVIEW_H
 #define QGSWEBVIEW_H
 
+
 #include <QWidget>
 #include <QPrinter>
 
 #ifdef WITH_QTWEBKIT
 #include <QWebView>
+#include <QDesktopWidget>
 
 class CORE_EXPORT QgsWebView : public QWebView
 {
@@ -29,7 +31,14 @@ class CORE_EXPORT QgsWebView : public QWebView
   public:
     explicit QgsWebView( QWidget* parent = 0 )
         : QWebView( parent )
-    {}
+    {
+      QDesktopWidget desktop;
+      // Apply zoom factor for HiDPI screens
+      if ( desktop.physicalDpiX( ) > 96 )
+      {
+        setZoomFactor( desktop.physicalDpiX( ) / 96 );
+      }
+    }
 };
 #else
 #include "qgswebpage.h"

diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.h b/src/gui/editorwidgets/qgsphotowidgetwrapper.h
@@ -22,7 +22,11 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QLineEdit>
-#include "qgswebview.h"
+
+#ifdef WITH_QTWEBKIT
+#include <QWebView>
+#endif
+
 
 /**
  * Wraps a photo widget. Will show a picture and a file chooser to change the picture.