mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 07:05:13 +00:00
Code Issues Releases Wiki Activity

Fix TDESKTOP_USE_PORTAL on gtk environments

Browse Source
This commit is contained in:
Ilya Fedin
2020-11-02 03:26:06 +04:00
committed by John Preston
parent 204a08df14
commit 44c24f9fff
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
View File

@@ -113,14 +113,15 @@ bool UseNative(Type type = Type::ReadFile) {
// or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3) // or if QT_QPA_PLATFORMTHEME=(gtk2|gtk3)
// or if portals are used and operation is to open folder // or if portals are used and operation is to open folder
// and portal doesn't support folder choosing // and portal doesn't support folder choosing
const auto neededForPortal = UseXDGDesktopPortal() const auto neededForPortal = (type == Type::ReadFolder)
&& type == Type::ReadFolder
&& !CanOpenDirectoryWithPortal(); && !CanOpenDirectoryWithPortal();
const auto neededNonForced = DesktopEnvironment::IsGtkBased() const auto neededNonForced = DesktopEnvironment::IsGtkBased()
|| neededForPortal; || (UseXDGDesktopPortal() && neededForPortal);
const auto excludeNonForced = InFlatpak() || InSnap(); const auto excludeNonForced = InFlatpak()
|| InSnap()
|| (UseXDGDesktopPortal() && !neededForPortal);
return IsGtkIntegrationForced() return IsGtkIntegrationForced()
|| (neededNonForced && !excludeNonForced); || (neededNonForced && !excludeNonForced);