forked from qt-creator/qt-creator
Qt6: enterEvent now gets passed a QEnterEvent
Add a Utils::EnterEvent for porting. Task-number: QTCREATORBUG-24098 Change-Id: I2782fe33e41a813b5562676f6dc87d6d53babdd3 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -164,7 +164,7 @@ bool FancyTabBar::event(QEvent *event)
|
||||
}
|
||||
|
||||
// Resets hover animation on mouse enter
|
||||
void FancyTabBar::enterEvent(QEvent *event)
|
||||
void FancyTabBar::enterEvent(EnterEvent *event)
|
||||
{
|
||||
Q_UNUSED(event)
|
||||
m_hoverRect = QRect();
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <utils/infobar.h>
|
||||
#include <utils/porting.h>
|
||||
|
||||
#include <QIcon>
|
||||
#include <QWidget>
|
||||
@@ -87,7 +88,7 @@ public:
|
||||
void paintTab(QPainter *painter, int tabIndex) const;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void mouseMoveEvent(QMouseEvent *event) override;
|
||||
void enterEvent(QEvent *event) override;
|
||||
void enterEvent(Utils::EnterEvent *event) override;
|
||||
void leaveEvent(QEvent *event) override;
|
||||
bool validIndex(int index) const { return index >= 0 && index < m_tabs.count(); }
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ void WelcomePageButton::mousePressEvent(QMouseEvent *)
|
||||
d->onClicked();
|
||||
}
|
||||
|
||||
void WelcomePageButton::enterEvent(QEvent *)
|
||||
void WelcomePageButton::enterEvent(EnterEvent *)
|
||||
{
|
||||
d->doUpdate(true);
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "core_global.h"
|
||||
|
||||
#include <utils/id.h>
|
||||
#include <utils/porting.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QObject>
|
||||
@@ -76,7 +77,7 @@ public:
|
||||
~WelcomePageButton() override;
|
||||
|
||||
void mousePressEvent(QMouseEvent *) override;
|
||||
void enterEvent(QEvent *) override;
|
||||
void enterEvent(Utils::EnterEvent *) override;
|
||||
void leaveEvent(QEvent *) override;
|
||||
|
||||
void setText(const QString &text);
|
||||
|
||||
@@ -50,9 +50,10 @@
|
||||
#include <texteditor/textdocument.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/porting.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/tooltip/tooltip.h>
|
||||
#include <utils/treemodel.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/utilsicons.h>
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
@@ -456,15 +457,9 @@ public:
|
||||
|
||||
~DebuggerToolTipWidget() override { DEBUG("DESTROY DEBUGGERTOOLTIP WIDGET"); }
|
||||
|
||||
void closeEvent(QCloseEvent *) override
|
||||
{
|
||||
DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET");
|
||||
}
|
||||
void closeEvent(QCloseEvent *) override { DEBUG("CLOSE DEBUGGERTOOLTIP WIDGET"); }
|
||||
|
||||
void enterEvent(QEvent *) override
|
||||
{
|
||||
DEBUG("ENTER DEBUGGERTOOLTIP WIDGET");
|
||||
}
|
||||
void enterEvent(EnterEvent *) override { DEBUG("ENTER DEBUGGERTOOLTIP WIDGET"); }
|
||||
|
||||
void leaveEvent(QEvent *) override
|
||||
{
|
||||
@@ -1085,7 +1080,7 @@ void DebuggerToolTipManagerPrivate::loadSessionData()
|
||||
closeAllToolTips();
|
||||
const QString data = SessionManager::value(sessionSettingsKeyC).toString();
|
||||
QXmlStreamReader r(data);
|
||||
if (r.readNextStartElement() && r.name() == sessionDocumentC) {
|
||||
if (r.readNextStartElement() && r.name() == QLatin1String(sessionDocumentC)) {
|
||||
while (!r.atEnd()) {
|
||||
if (readStartElement(r, toolTipElementC)) {
|
||||
const QXmlStreamAttributes attributes = r.attributes();
|
||||
|
||||
@@ -120,7 +120,7 @@ void DragTool::paintEvent(QPaintEvent *event)
|
||||
}
|
||||
}
|
||||
|
||||
void DragTool::enterEvent(QEvent *event)
|
||||
void DragTool::enterEvent(Utils::EnterEvent *event)
|
||||
{
|
||||
Q_UNUSED(event)
|
||||
update();
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <utils/porting.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QIcon>
|
||||
|
||||
@@ -46,7 +48,7 @@ public:
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
void enterEvent(QEvent *event) override;
|
||||
void enterEvent(Utils::EnterEvent *event) override;
|
||||
void leaveEvent(QEvent *event) override;
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
void mouseMoveEvent(QMouseEvent *event) override;
|
||||
|
||||
@@ -73,7 +73,7 @@ void ColorThemeItem::openColorDialog()
|
||||
}
|
||||
}
|
||||
|
||||
void ColorThemeItem::enterEvent(QEvent *e)
|
||||
void ColorThemeItem::enterEvent(Utils::EnterEvent *e)
|
||||
{
|
||||
m_pen.setWidth(isEnabled() ? 3 : 1);
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <utils/porting.h>
|
||||
|
||||
#include <QFrame>
|
||||
#include <QPen>
|
||||
|
||||
@@ -53,7 +55,7 @@ signals:
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *e) override;
|
||||
void enterEvent(QEvent *e) override;
|
||||
void enterEvent(Utils::EnterEvent *e) override;
|
||||
void leaveEvent(QEvent *e) override;
|
||||
void mousePressEvent(QMouseEvent *e) override;
|
||||
|
||||
|
||||
@@ -41,13 +41,14 @@
|
||||
#include <coreplugin/modemanager.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/icon.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/hostosinfo.h>
|
||||
#include <utils/icon.h>
|
||||
#include <utils/porting.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/styledbar.h>
|
||||
#include <utils/treemodel.h>
|
||||
#include <utils/theme/theme.h>
|
||||
#include <utils/treemodel.h>
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QHeaderView>
|
||||
@@ -194,7 +195,7 @@ public:
|
||||
setLayout(layout);
|
||||
}
|
||||
|
||||
void enterEvent(QEvent *) override
|
||||
void enterEvent(EnterEvent *) override
|
||||
{
|
||||
QPalette pal;
|
||||
pal.setColor(QPalette::Window, themeColor(Theme::Welcome_HoverColor));
|
||||
|
||||
Reference in New Issue
Block a user