diff options
| author | Maxim Cournoyer <[email protected]> | 2022-09-27 15:59:30 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-09-27 15:59:30 -0400 |
| commit | 990a4822f1cb45c1470fe38cbf17fd7bb54d0088 (patch) | |
| tree | 1c1ff41c9264fe5af5ee0b8723d1e367e958c051 /gnu/packages/patches/jami-fix-esc-bug.patch | |
| parent | 91db77c955cc7ef95dd8b535e40d6b4cf28669ec (diff) | |
| parent | 3c6e220d8100281074c414a43c1efe9a01b53771 (diff) | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
Diffstat (limited to 'gnu/packages/patches/jami-fix-esc-bug.patch')
| -rw-r--r-- | gnu/packages/patches/jami-fix-esc-bug.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gnu/packages/patches/jami-fix-esc-bug.patch b/gnu/packages/patches/jami-fix-esc-bug.patch deleted file mode 100644 index 6d78542f1e..0000000000 --- a/gnu/packages/patches/jami-fix-esc-bug.patch +++ /dev/null @@ -1,24 +0,0 @@ -This fixes the issue where pressing the ESC key would hide the Jami -GUI on systems lacking a notification tray. - -From 47fd4c38ddd8bd350319ce9bb750ca496826e655 Mon Sep 17 00:00:00 2001 -From: Sébastien Blin <[email protected]> -Date: Fri, 29 Jul 2022 21:24:01 -0400 -Subject: [PATCH] layoutmanager: fix popFullScreenItem - -Change-Id: I79780d4ad570846e6f3c52734dd627bcd0e11327 ---- - -diff --git a/src/app/LayoutManager.qml b/src/app/LayoutManager.qml -index 98516ce..87f13ac 100644 ---- a/client-qt/src/app/LayoutManager.qml -+++ b/client-qt/src/app/LayoutManager.qml -@@ -176,7 +176,7 @@ - - // Only leave fullscreen mode if our window isn't in fullscreen - // mode already. -- if (priv.fullScreenItems.length === 0) { -+ if (priv.fullScreenItems.length === 0 && priv.windowedVisibility !== Window.Hidden) { - // Simply recall the last visibility state. - visibility = priv.windowedVisibility - } |