1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused virtual method QWindowPrivate::allowClickThrough

Browse Source 
Always returned true, also in the QWidgetWindowPrivate override.

Change-Id: I01d11ae6f85882b52ce397125f994eea663ffcb5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-07-06 21:54:36 +02:00
parent 23282ac23d
commit bb5171fb54
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/kernel/qwindow_p.h
View File

@ -129,9 +129,6 @@ public:
static Qt::WindowState effectiveState(Qt::WindowStates); static Qt::WindowState effectiveState(Qt::WindowStates);
// ### Qt6: unused
virtual bool allowClickThrough(const QPoint &) const { return true; }
QWindow::SurfaceType surfaceType = QWindow::RasterSurface; QWindow::SurfaceType surfaceType = QWindow::RasterSurface;
Qt::WindowFlags windowFlags = Qt::Window; Qt::WindowFlags windowFlags = Qt::Window;
QWindow *parentWindow = nullptr; QWindow *parentWindow = nullptr;

2
src/plugins/platforms/cocoa/qnsview_mouse.mm
View File

@ -225,8 +225,6 @@
QPointF windowPoint; QPointF windowPoint;
QPointF screenPoint; QPointF screenPoint;
[self convertFromScreen:[NSEvent mouseLocation] toWindowPoint: &windowPoint andScreenPoint: &screenPoint]; [self convertFromScreen:[NSEvent mouseLocation] toWindowPoint: &windowPoint andScreenPoint: &screenPoint];
if (!qt_window_private(m_platformWindow->window())->allowClickThrough(screenPoint.toPoint()))
return NO;
return YES; return YES;
} }

6
src/widgets/kernel/qwidgetwindow.cpp
View File

@ -115,7 +115,6 @@ public:
if (QWidget *widget = q->widget()) if (QWidget *widget = q->widget())
QWidgetPrivate::get(widget)->updateContentsRect(); QWidgetPrivate::get(widget)->updateContentsRect();
} }
bool allowClickThrough(const QPoint &) const override;
}; };
QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
@ -231,11 +230,6 @@ static inline bool shouldBePropagatedToWidget(QEvent *event)
} }
} }
bool QWidgetWindowPrivate::allowClickThrough(const QPoint &) const
{
return true;
}
bool QWidgetWindow::event(QEvent *event) bool QWidgetWindow::event(QEvent *event)
{ {
if (!m_widget) if (!m_widget)