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

Don't grab QWhatsThis background on Windows

Browse Source 
The workaround also is no longer needed on Windows so it can be removed
completely.

This patch amends 6a28b391f71d8626c1793aa3bf732dea10519653.

Task-number: QTBUG-113556
Pick-to: 6.5
Change-Id: I69155e54da26acd49faf72816d1439fb3e322de9
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Oliver Wolff 2023-05-16 09:51:50 +02:00 committed by Volker Hilsheimer
parent 3cee2f1950
commit 47e63d436e
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/kernel/qwhatsthis.cpp
View File

@ -110,9 +110,6 @@ public:
static QWhatsThat *instance; static QWhatsThat *instance;
protected: protected:
#if defined(Q_OS_WIN)
void showEvent(QShowEvent *e) override;
#endif
void mousePressEvent(QMouseEvent*) override; void mousePressEvent(QMouseEvent*) override;
void mouseReleaseEvent(QMouseEvent*) override; void mouseReleaseEvent(QMouseEvent*) override;
void mouseMoveEvent(QMouseEvent*) override; void mouseMoveEvent(QMouseEvent*) override;
@ -125,9 +122,6 @@ private:
QString text; QString text;
QTextDocument* doc; QTextDocument* doc;
QString anchor; QString anchor;
#if defined(Q_OS_WIN)
QPixmap background;
#endif
}; };
QWhatsThat *QWhatsThat::instance = nullptr; QWhatsThat *QWhatsThat::instance = nullptr;
@ -201,13 +195,6 @@ QWhatsThat::~QWhatsThat()
delete doc; delete doc;
} }
#if defined(Q_OS_WIN)
void QWhatsThat::showEvent(QShowEvent *)
{
background = QGuiApplication::primaryScreen()->grabWindow(0, x(), y(), width(), height());
}
#endif
void QWhatsThat::mousePressEvent(QMouseEvent* e) void QWhatsThat::mousePressEvent(QMouseEvent* e)
{ {
pressed = true; pressed = true;
@ -267,10 +254,6 @@ void QWhatsThat::paintEvent(QPaintEvent*)
if (drawShadow) if (drawShadow)
r.adjust(0, 0, -shadowWidth, -shadowWidth); r.adjust(0, 0, -shadowWidth, -shadowWidth);
QPainter p(this); QPainter p(this);
#if defined(Q_OS_WIN)
// Needed due to supposed lack of support for NoSystemBackground on Windows
p.drawPixmap(0, 0, background);
#endif
p.setPen(QPen(palette().toolTipText(), 0)); p.setPen(QPen(palette().toolTipText(), 0));
p.setBrush(palette().toolTipBase()); p.setBrush(palette().toolTipBase());
p.drawRect(r); p.drawRect(r);