feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt6: enterEvent now gets passed a QEnterEvent

Browse Source 
Add a Utils::EnterEvent for porting.

Task-number: QTCREATORBUG-24098
Change-Id: I2782fe33e41a813b5562676f6dc87d6d53babdd3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-28 16:27:54 +02:00
parent 8d6ee2509d
commit 929e3819a8
18 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/fancymainwindow.cpp
View File

@@ -26,6 +26,7 @@
#include "fancymainwindow.h"
#include "algorithm.h"
#include "porting.h"
#include "qtcassert.h"
#include "stringutils.h"
@@ -74,7 +75,7 @@ public:
DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable = false);
bool eventFilter(QObject *, QEvent *event) override;
void enterEvent(QEvent *event) override;
void enterEvent(EnterEvent *event) override;
void leaveEvent(QEvent *event) override;
void handleMouseTimeout();
void handleToplevelChanged(bool floating);
@@ -114,7 +115,7 @@ public:
QSize minimumSizeHint() const override { return sizeHint(); }
void enterEvent(QEvent *event) override
void enterEvent(EnterEvent *event) override
{
if (isEnabled())
update();
@@ -193,7 +194,7 @@ public:
setProperty("managed_titlebar", 1);
}
void enterEvent(QEvent *event) override
void enterEvent(EnterEvent *event) override
{
setActive(true);
QWidget::enterEvent(event);
@@ -303,7 +304,7 @@ bool DockWidget::eventFilter(QObject *, QEvent *event)
return false;
}
void DockWidget::enterEvent(QEvent *event)
void DockWidget::enterEvent(EnterEvent *event)
{
if (!m_immutable)
QApplication::instance()->installEventFilter(this);