kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Make enterEventHook accept a QEnterEvent

Browse source
This commit is contained in:
Ilya Fedin 2021-10-19 16:33:00 +04:00 • committed by John Preston
parent 8e5d35229a
commit 534541367c
9 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/abstract_button.cpp
View file

@ -32,7 +32,7 @@ void AbstractButton::leaveEventHook(QEvent *e) {
return TWidget::leaveEventHook(e); return TWidget::leaveEventHook(e);
} }
void AbstractButton::enterEventHook(QEvent *e) { void AbstractButton::enterEventHook(QEnterEvent *e) {
checkIfOver(mapFromGlobal(QCursor::pos())); checkIfOver(mapFromGlobal(QCursor::pos()));
return TWidget::enterEventHook(e); return TWidget::enterEventHook(e);
} }

2
ui/abstract_button.h
View file

@ -54,7 +54,7 @@ public:
void clicked(Qt::KeyboardModifiers modifiers, Qt::MouseButton button); void clicked(Qt::KeyboardModifiers modifiers, Qt::MouseButton button);
protected: protected:
void enterEventHook(QEvent *e) override; void enterEventHook(QEnterEvent *e) override;
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
void mousePressEvent(QMouseEvent *e) override; void mousePressEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override;

14
ui/rp_widget.h
View file

@ -16,6 +16,7 @@
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtGui/QtEvents>
class TWidget; class TWidget;
@ -104,13 +105,22 @@ public:
} }
protected: protected:
void enterEvent(QEvent *e) final override { #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *e) final override {
if (auto parent = tparent()) { if (auto parent = tparent()) {
parent->leaveToChildEvent(e, this); parent->leaveToChildEvent(e, this);
} }
return enterEventHook(e); return enterEventHook(e);
} }
virtual void enterEventHook(QEvent *e) { #else // Qt >= 6.0.0
void enterEvent(QEvent *e) final override {
if (auto parent = tparent()) {
parent->leaveToChildEvent(e, this);
}
return enterEventHook(static_cast<QEnterEvent*>(e));
}
#endif // Qt < 6.0.0
virtual void enterEventHook(QEnterEvent *e) {
return Base::enterEvent(e); return Base::enterEvent(e);
} }

2
ui/widgets/inner_dropdown.cpp
View file

@ -129,7 +129,7 @@ void InnerDropdown::paintEvent(QPaintEvent *e) {
} }
} }
void InnerDropdown::enterEventHook(QEvent *e) { void InnerDropdown::enterEventHook(QEnterEvent *e) {
if (_autoHiding) { if (_autoHiding) {
showAnimated(_origin); showAnimated(_origin);
} }

2
ui/widgets/inner_dropdown.h
View file

@ -73,7 +73,7 @@ public:
protected: protected:
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
void enterEventHook(QEvent *e) override; void enterEventHook(QEnterEvent *e) override;
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
bool eventFilter(QObject *obj, QEvent *e) override; bool eventFilter(QObject *obj, QEvent *e) override;

2
ui/widgets/labels.cpp
View file

@ -491,7 +491,7 @@ void FlatLabel::mouseDoubleClickEvent(QMouseEvent *e) {
} }
} }
void FlatLabel::enterEventHook(QEvent *e) { void FlatLabel::enterEventHook(QEnterEvent *e) {
_lastMousePos = QCursor::pos(); _lastMousePos = QCursor::pos();
dragActionUpdate(); dragActionUpdate();
} }

2
ui/widgets/labels.h
View file

@ -154,7 +154,7 @@ protected:
void mousePressEvent(QMouseEvent *e) override; void mousePressEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override; void mouseReleaseEvent(QMouseEvent *e) override;
void mouseDoubleClickEvent(QMouseEvent *e) override; void mouseDoubleClickEvent(QMouseEvent *e) override;
void enterEventHook(QEvent *e) override; void enterEventHook(QEnterEvent *e) override;
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
void focusOutEvent(QFocusEvent *e) override; void focusOutEvent(QFocusEvent *e) override;
void focusInEvent(QFocusEvent *e) override; void focusInEvent(QFocusEvent *e) override;

4
ui/widgets/scroll_area.cpp
View file

@ -220,7 +220,7 @@ void ScrollBar::hideTimeout(crl::time dt) {
} }
} }
void ScrollBar::enterEventHook(QEvent *e) { void ScrollBar::enterEventHook(QEnterEvent *e) {
_hideTimer.cancel(); _hideTimer.cancel();
setMouseTracking(true); setMouseTracking(true);
setOver(true); setOver(true);
@ -639,7 +639,7 @@ void ScrollArea::keyPressEvent(QKeyEvent *e) {
} }
} }
void ScrollArea::enterEventHook(QEvent *e) { void ScrollArea::enterEventHook(QEnterEvent *e) {
if (_disabled) return; if (_disabled) return;
if (_st.hiding) { if (_st.hiding) {
_horizontalBar->hideTimeout(_st.hiding); _horizontalBar->hideTimeout(_st.hiding);

4
ui/widgets/scroll_area.h
View file

@ -82,7 +82,7 @@ public:
protected: protected:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;
void enterEventHook(QEvent *e) override; void enterEventHook(QEnterEvent *e) override;
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override;
void mousePressEvent(QMouseEvent *e) override; void mousePressEvent(QMouseEvent *e) override;
@ -185,7 +185,7 @@ protected:
void moveEvent(QMoveEvent *e) override; void moveEvent(QMoveEvent *e) override;
void touchEvent(QTouchEvent *e); void touchEvent(QTouchEvent *e);
void enterEventHook(QEvent *e) override; void enterEventHook(QEnterEvent *e) override;
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
protected: protected: