Changeset 67176 in vbox

Timestamp:

May 31, 2017 2:50:59 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115852

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: A bit of HiDPI support for snapshot screenshot code.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp

@@ -33 +33 @@
 
 /* GUI includes: */
+# include "UIDesktopWidgetWatchdog.h"
 # include "UISnapshotDetailsWidget.h"
 # include "UIMessageCenter.h"
@@ -82 +83 @@
     /** Prepares all. */
     void prepare();
+
+    /** Adjusts window size. */
+    void adjustWindowSize();
 
     /** Adjusts picture. */
@@ -169 +173 @@
     m_fZoomMode = !m_fZoomMode;
 
+    /* Adjust the windiow size: */
+    adjustWindowSize();
     /* Adjust the picture: */
     adjustPicture();
@@ -222 +228 @@
     }
 
-    /* Calculate aspect-ratio: */
-    double dAspectRatio = (double)m_pixmapScreenshot.height() / m_pixmapScreenshot.width();
+    /* Apply language settings: */
+    retranslateUi();
+
+    /* Adjust window size: */
+    adjustWindowSize();
+
+    /* Center according requested widget: */
+    VBoxGlobal::centerWidget(this, parentWidget(), false);
+}
+
+void UIScreenshotViewer::adjustWindowSize()
+{
+    /* Acquire current host-screen size, fallback to 1024x768 if failed: */
+    QSize screenSize = gpDesktop->screenGeometry(parentWidget()).size();
+    if (!screenSize.isValid())
+        screenSize = QSize(1024, 768);
+    const int iInitWidth = screenSize.width() * .50 /* 50% of host-screen width */;
+
+    /* Calculate screenshot aspect-ratio: */
+    const double dAspectRatio = (double)m_pixmapScreenshot.height() / m_pixmapScreenshot.width();
+
     /* Calculate maximum window size: */
-    const QSize maxSize = m_pixmapScreenshot.size() + QSize(m_pScrollArea->frameWidth() * 2, m_pScrollArea->frameWidth() * 2);
+    const QSize maxSize = m_fZoomMode
+                        ? screenSize * .9 /* 90% of host-screen size */ +
+                          QSize(m_pScrollArea->frameWidth() * 2, m_pScrollArea->frameWidth() * 2)
+                        : m_pixmapScreenshot.size() /* just the screenshot size */ +
+                          QSize(m_pScrollArea->frameWidth() * 2, m_pScrollArea->frameWidth() * 2);
+
     /* Calculate initial window size: */
-    const QSize initSize = QSize(640, (int)(640 * dAspectRatio)).boundedTo(maxSize);
+    const QSize initSize = QSize(iInitWidth, (int)(iInitWidth * dAspectRatio)).boundedTo(maxSize);
 
     /* Apply maximum window size restrictions: */
@@ -233 +263 @@
     /* Apply initial window size: */
     resize(initSize);
-
-    /* Apply language settings: */
-    retranslateUi();
-
-    /* Center according requested widget: */
-    VBoxGlobal::centerWidget(this, parentWidget(), false);
 }
 
@@ -245 +269 @@
     if (m_fZoomMode)
     {
+        /* Adjust visual aspects: */
         m_pScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         m_pScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -254 +279 @@
     else
     {
+        /* Adjust visual aspects: */
         m_pScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         m_pScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);