Changeset 70598 in vbox

Timestamp:

Jan 16, 2018 1:08:33 PM (7 years ago)

Author:

vboxsync

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

120308

Message:

FE:Qt bugref:9072: Give key focus to text edit as log viewer pops up

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogPage.h (modified) (1 diff)
• UIVMLogViewerTextEdit.cpp (modified) (2 diffs)
• UIVMLogViewerTextEdit.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -240 +240 @@
 }
 
+void UIVMLogPage::showEvent(QShowEvent *pEvent)
+{
+    if(m_pTextEdit)
+        m_pTextEdit->setFocus();
+    QWidget::showEvent(pEvent);
+}
+
 void UIVMLogPage::sltAddBookmark(LogBookmark bookmark)
 {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.h

@@ -96 +96 @@
     void setWrapLines(bool bWrapLines);
 
+protected:
+
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
+
 private slots:
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp

@@ -135 +135 @@
     void mouseMoveEvent(QMouseEvent *pEvent)
     {
-        m_pTextEdit->setMouseCursorLine(m_pTextEdit->lineNumberForPos(pEvent->pos()));
+        if (m_pTextEdit)
+            m_pTextEdit->setMouseCursorLine(m_pTextEdit->lineNumberForPos(pEvent->pos()));
         repaint();
     }
@@ -141 +142 @@
     void mousePressEvent(QMouseEvent *pEvent)
     {
-        m_pTextEdit->toggleBookmark(m_pTextEdit->bookmarkForPos(pEvent->pos()));
+        if (m_pTextEdit)
+            m_pTextEdit->toggleBookmark(m_pTextEdit->bookmarkForPos(pEvent->pos()));
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.h

@@ -38 +38 @@
 
     UIVMLogViewerTextEdit(QWidget* parent = 0);
+
     int  lineNumberAreaWidth();
     void lineNumberAreaPaintEvent(QPaintEvent *event);
@@ -58 +59 @@
     virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
     virtual void mouseMoveEvent(QMouseEvent *pEvent) /* override */;
-    virtual void leaveEvent(QEvent * event) /* override */;
+    virtual void leaveEvent(QEvent * pEvent) /* override */;
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -679 +679 @@
 
     m_fIsPolished = true;
-
-    /* Make sure the log view widget has the focus: */
-    if (currentLogPage())
-        currentLogPage()->setFocus();
 }