mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
parent
c9d3f7a0eb
commit
3f724e1c6a
1 changed files with 5 additions and 16 deletions
|
@ -167,22 +167,11 @@ QByteArray Utility::userAgentString()
|
||||||
void Utility::raiseDialog( QWidget *raiseWidget )
|
void Utility::raiseDialog( QWidget *raiseWidget )
|
||||||
{
|
{
|
||||||
#ifndef TOKEN_AUTH_ONLY
|
#ifndef TOKEN_AUTH_ONLY
|
||||||
// viel hilft viel ;-)
|
if( raiseWidget && raiseWidget->parentWidget() == 0) {
|
||||||
if( raiseWidget ) {
|
raiseWidget->hide();
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && \
|
// Qt has a bug which causes parent-less dialogs to pop-under.
|
||||||
(defined(Q_OS_WIN) || defined (Q_OS_MAC))
|
raiseWidget->setWindowFlags(raiseWidget->windowFlags() & ~Qt::Dialog);
|
||||||
Qt::WindowFlags eFlags = raiseWidget->windowFlags();
|
raiseWidget->showNormal();
|
||||||
if (!(eFlags & Qt::WindowStaysOnTopHint)) {
|
|
||||||
eFlags |= Qt::WindowStaysOnTopHint;
|
|
||||||
raiseWidget->setWindowFlags(eFlags);
|
|
||||||
raiseWidget->show();
|
|
||||||
eFlags &= ~Qt::WindowStaysOnTopHint;
|
|
||||||
raiseWidget->setWindowFlags(eFlags);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
raiseWidget->show();
|
|
||||||
raiseWidget->raise();
|
|
||||||
raiseWidget->activateWindow();
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue