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

Fix conflict between presentationMode and warp indicator

Browse Source 
With presentationMode turned on, the search shortcut display can hide
the wrap indicator. When showing a text indicator and a pixmap
indicator, simply move the one shown later a bit down.

Fixes: QTCREATORBUG-15371
Change-Id: I015dc6ebab29f2f4d863e68359f2bcaee706c805
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Eike Ziller
2019-09-12 15:21:10 +02:00
parent c9e536b9eb
commit fe62dde830
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/libs/utils/fadingindicator.cpp
View File

@@ -69,8 +69,11 @@ public:
m_label->setText(text); m_label->setText(text);
layout()->setSizeConstraint(QLayout::SetFixedSize); layout()->setSizeConstraint(QLayout::SetFixedSize);
adjustSize(); adjustSize();
if (QWidget *parent = parentWidget()) QWidget *parent = parentWidget();
move(parent->rect().center() - rect().center()); QPoint pos = parent ? (parent->rect().center() - rect().center()) : QPoint();
if (pixmapIndicator && pixmapIndicator->geometry().intersects(QRect(pos, size())))
pos.setY(pixmapIndicator->geometry().bottom() + 1);
move(pos);
} }
void setPixmap(const QString &uri) void setPixmap(const QString &uri)
@@ -79,8 +82,11 @@ public:
m_pixmap.load(StyleHelper::dpiSpecificImageFile(uri)); m_pixmap.load(StyleHelper::dpiSpecificImageFile(uri));
layout()->setSizeConstraint(QLayout::SetNoConstraint); layout()->setSizeConstraint(QLayout::SetNoConstraint);
resize(m_pixmap.size() / m_pixmap.devicePixelRatio()); resize(m_pixmap.size() / m_pixmap.devicePixelRatio());
if (QWidget *parent = parentWidget()) QWidget *parent = parentWidget();
move(parent->rect().center() - rect().center()); QPoint pos = parent ? (parent->rect().center() - rect().center()) : QPoint();
if (textIndicator && textIndicator->geometry().intersects(QRect(pos, size())))
pos.setY(textIndicator->geometry().bottom() + 1);
move(pos);
} }
void run(int ms) void run(int ms)
@@ -90,6 +96,9 @@ public:
QTimer::singleShot(ms, this, &FadingIndicatorPrivate::runInternal); QTimer::singleShot(ms, this, &FadingIndicatorPrivate::runInternal);
} }
static QPointer<FadingIndicatorPrivate> textIndicator;
static QPointer<FadingIndicatorPrivate> pixmapIndicator;
protected: protected:
void paintEvent(QPaintEvent *) override void paintEvent(QPaintEvent *) override
{ {
@@ -119,13 +128,17 @@ private:
QPixmap m_pixmap; QPixmap m_pixmap;
}; };
QPointer<FadingIndicatorPrivate> FadingIndicatorPrivate::textIndicator;
QPointer<FadingIndicatorPrivate> FadingIndicatorPrivate::pixmapIndicator;
} // Internal } // Internal
namespace FadingIndicator { namespace FadingIndicator {
void showText(QWidget *parent, const QString &text, TextSize size) void showText(QWidget *parent, const QString &text, TextSize size)
{ {
static QPointer<Internal::FadingIndicatorPrivate> indicator; QPointer<Internal::FadingIndicatorPrivate> &indicator
= Internal::FadingIndicatorPrivate::textIndicator;
if (indicator) if (indicator)
delete indicator; delete indicator;
indicator = new Internal::FadingIndicatorPrivate(parent, size); indicator = new Internal::FadingIndicatorPrivate(parent, size);
@@ -135,7 +148,8 @@ void showText(QWidget *parent, const QString &text, TextSize size)
void showPixmap(QWidget *parent, const QString &pixmap) void showPixmap(QWidget *parent, const QString &pixmap)
{ {
static QPointer<Internal::FadingIndicatorPrivate> indicator; QPointer<Internal::FadingIndicatorPrivate> &indicator
= Internal::FadingIndicatorPrivate::pixmapIndicator;
if (indicator) if (indicator)
delete indicator; delete indicator;
indicator = new Internal::FadingIndicatorPrivate(parent, LargeText); indicator = new Internal::FadingIndicatorPrivate(parent, LargeText);