Changeset 81226 in vbox

Timestamp:

Oct 11, 2019 12:45:23 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510. Some fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIGuestProcessControlWidget.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/information/UIInformationPerformanceMonitor.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp

@@ -316 +316 @@
 {
     saveSettings();
+    cleanupListener();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1597 +1597 @@
     if (m_pSoftKeyboardDialog)
     {
+        m_pSoftKeyboardDialog->show();
         m_pSoftKeyboardDialog->raise();
+        m_pSoftKeyboardDialog->setWindowState(m_pSoftKeyboardDialog->windowState() & ~Qt::WindowMinimized);
+        m_pSoftKeyboardDialog->activateWindow();
         return;
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.cpp

@@ -139 +139 @@
     UIMetric *m_pMetric;
     QSize m_size;
-    QFont m_font;
+    QFont m_axisFont;
     int m_iMarginLeft;
     int m_iMarginRight;
@@ -182 +182 @@
     , m_fIsAreaChartAllowed(false)
 {
+    m_axisFont = font();
+    m_axisFont.setPixelSize(14);
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, &UIChart::customContextMenuRequested,
@@ -190 +192 @@
 
     m_iMarginLeft = 1 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    m_iMarginRight = 9 * QFontMetrics(font()).width('X');
+    m_iMarginRight = 9 * QFontMetrics(m_axisFont).width('X');
     m_iMarginTop = 0.3 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    m_iMarginBottom = 2 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+    m_iMarginBottom = QFontMetrics(m_axisFont).height();
 
     float fAppIconSize = qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
@@ -202 +204 @@
 }
 
-void UIChart::setFontSize(int iFontSize)
-{
-    m_font.setPixelSize(iFontSize);
-}
-
-int UIChart::fontSize() const
-{
-    return m_font.pixelSize();
-}
 
 bool UIChart::isPieChartAllowed() const
@@ -327 +320 @@
 
     QPainter painter(this);
+    painter.setFont(m_axisFont);
     painter.setRenderHint(QPainter::Antialiasing);
 
@@ -454 +448 @@
 void UIChart::drawXAxisLabels(QPainter &painter, int iXSubAxisCount)
 {
+    QFont painterFont = painter.font();
     QFontMetrics fontMetrics(painter.font());
     int iFontHeight = fontMetrics.height();
@@ -953 +948 @@
     }
 
-    QScrollArea *pScrollArea = new QScrollArea;
+    QScrollArea *pScrollArea = new QScrollArea(this);
     m_pMainLayout->addWidget(pScrollArea);
-    QWidget *pContainerWidget = new QWidget;
-    QGridLayout *pContainerLayout = new QGridLayout;
+
+    QWidget *pContainerWidget = new QWidget(pScrollArea);
+    QGridLayout *pContainerLayout = new QGridLayout(pContainerWidget);
     pContainerWidget->setLayout(pContainerLayout);
     pContainerLayout->setSpacing(10);
@@ -974 +970 @@
         if (!m_metrics.contains(strMetricName))
             continue;
-        QLabel *pLabel = new QLabel;
+        QLabel *pLabel = new QLabel(this);
         pLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop);
         pChartLayout->addWidget(pLabel);