From 1f892ff92d00b74f11271e6493341ae1b47217f6 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Wed, 5 Mar 2025 15:34:45 +1100
Subject: [PATCH] Fix #83819: Toolbar tooltip missing with custom-keymap

When accessing the key-map for tooltips it's important to use
the final "user" keymap, combine from "active" & "default".

Using the active keyconfig would only keys from key-maps that had
been modified.
---
 scripts/startup/bl_ui/space_toolsystem_common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/startup/bl_ui/space_toolsystem_common.py b/scripts/startup/bl_ui/space_toolsystem_common.py
index 5b73989dbee..31bbce3491c 100644
--- a/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -1222,7 +1222,7 @@ def keymap_from_id(context, space_type, idname):
 def _keymap_from_item(context, item):
     if item.keymap is not None:
         wm = context.window_manager
-        keyconf = wm.keyconfigs.active
+        keyconf = wm.keyconfigs.user
         return keyconf.keymaps.get(item.keymap[0])
     return None
 
-- 
GitLab