mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"

Browse source 
This reverts commit 8f616969ab.

Turns out that with the upgrade to the new released Qt 5.12.5 the issue
has been solved by the Qt developers, so this fix becomes obsolete.

Signed-off-by: Michael Schuster <michael@schuster.ms>
This commit is contained in:
Michael Schuster 2019-09-27 04:54:04 +02:00
parent f6b03f0186
commit 00db94a73c
No known key found for this signature in database
GPG key ID: 00819E3BF4177B28
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/settingsdialog.cpp
View file

@ -168,23 +168,6 @@ void SettingsDialog::changeEvent(QEvent *e)
QDialog::changeEvent(e);
}
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void SettingsDialog::showEvent(QShowEvent *e)
{
QDialog::showEvent(e);
QTimer::singleShot(100, this, &SettingsDialog::timerShowEvent);
}
void SettingsDialog::timerShowEvent()
{
update();
repaint();
}
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
void SettingsDialog::slotSwitchPage(QAction *action)
{
_ui->stack->setCurrentWidget(_actionGroupWidgets.value(action));

12
src/gui/settingsdialog.h
View file

@ -68,22 +68,10 @@ protected:
void accept() override;
void changeEvent(QEvent *) override;
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void showEvent(QShowEvent *) override;
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
private slots:
void accountAdded(AccountState *);
void accountRemoved(AccountState *);
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
#if (defined(Q_OS_WIN) && (QT_VERSION >= QT_VERSION_CHECK(5, 12, 4)))
void timerShowEvent();
#endif
// FIX - White Window issue on Windows after Qt 5.12.4 upgrade ///////////////////////////////
private:
void customizeStyle();
void activityAdded(AccountState *);