procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Don't focus parent window after opening file dialog

Browse source
This commit is contained in:
Ilya Fedin 2020-07-29 19:28:02 +04:00 committed by John Preston
parent dc9d0aae54
commit 449fa0ef2c
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
View file

@ -11,18 +11,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/linux/linux_gdk_helper.h"
#include "platform/linux/linux_desktop_environment.h"
#include "platform/linux/specific_linux.h"
#include "core/application.h"
#include "mainwindow.h"
#include "boxes/abstract_box.h"
#include "storage/localstorage.h"
#include "base/platform/base_platform_file_utilities.h"
#include "base/call_delayed.h"
#include <QtCore/QProcess>
#include <QtGui/QDesktopServices>
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
#include <private/qguiapplication_p.h>
extern "C" {
#undef signals
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#define signals public
} // extern "C"
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
namespace Platform {
@ -461,12 +465,6 @@ int GtkFileDialog::exec() {
show();
if (const auto parent = parentWidget()) {
base::call_delayed(200, parent, [=] {
parent->activateWindow();
});
}
QPointer<QDialog> guard = this;
d->exec();
if (guard.isNull())

9
Telegram/SourceFiles/platform/linux/file_utilities_linux.h
View file

@ -12,14 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow>
#include <QtWidgets/QFileDialog>
extern "C" {
#undef signals
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
#include <gtk/gtk.h>
#include <gdk/gdk.h>
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkDialog GtkDialog;
typedef struct _GtkFileFilter GtkFileFilter;
#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
#define signals public
} // extern "C"
namespace Platform {
namespace File {