From 449fa0ef2c61c0b1c9c554e0bdfdabf9681065e8 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 29 Jul 2020 19:28:02 +0400 Subject: [PATCH] Don't focus parent window after opening file dialog --- .../platform/linux/file_utilities_linux.cpp | 16 +++++++--------- .../platform/linux/file_utilities_linux.h | 9 +++------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp index 4ae87497c8..a05155bfe4 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp @@ -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 #include #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION #include + +extern "C" { +#undef signals +#include +#include +#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 guard = this; d->exec(); if (guard.isNull()) diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h index 08de04aae1..13fe85301a 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.h +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.h @@ -12,14 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include -extern "C" { -#undef signals #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION -#include -#include +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 {