Attachment 17520 Details for Bug 52611 – patch for 9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch in qt6-base

[patch] patch for 9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch in qt6-base

patch-for-shortcuts.patch (text/plain), 1.35 KB, created by Max Pozdeev on 2025-01-12 15:59:04 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Max Pozdeev

Created: 2025-01-12 15:59:04 MSK

Size: 1.35 KB

patch

obsolete

>diff --git a/9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch b/9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch
>index 7e6354c9..d91f334a 100644
>--- a/9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch
>+++ b/9003-qt6-base-6.7.2-qmenu_fix_shortcuts.patch
>@@ -84,7 +84,7 @@ diff -Naur qtbase-everywhere-src-6.7.2.orig/src/gui/platform/unix/qxkbcommon.cpp
> +                // but Ctrl++ is more specific than +, so we should skip the last one
> +                bool ambiguous = false;
> +                for (QKeyCombination shortcut : std::as_const(result)) {
>-+                    if (shortcut.key() == qtKey && shortcut.keyboardModifiers() == mods) {
>++                    if (shortcut.key() == qtKey && (shortcut.keyboardModifiers() & mods) == mods) {
> +                        ambiguous = true;
> +                        break;
> +                    }
>@@ -92,7 +92,7 @@ diff -Naur qtbase-everywhere-src-6.7.2.orig/src/gui/platform/unix/qxkbcommon.cpp
> +                if (ambiguous)
> +                    continue;
> +
>-+                if (!result.contains(qtKey + int(mods))) //NOTE: We should disallow duplicates in the result list
>++                if (!result.contains(qtKey + int(mods))) //NOTE: We should disallow duplicates in the result list (TODO: Is this check really needed?)
> +                result += QKeyCombination::fromCombined(qtKey + int(mods));
> +            }
> +        }

Actions: View | Diff

Attachments on bug 52611: 17520 | 17524 | 17525 | 17531