Skip to content

[222_60] Correct macOS modifier symbols in accent shortcut tooltips#2982

Merged
Yuki-Nagori merged 2 commits intoMoganLab:mainfrom
Prthmsh7:222_54
Mar 18, 2026
Merged

[222_60] Correct macOS modifier symbols in accent shortcut tooltips#2982
Yuki-Nagori merged 2 commits intoMoganLab:mainfrom
Prthmsh7:222_54

Conversation

@Prthmsh7
Copy link
Contributor

@Prthmsh7 Prthmsh7 commented Mar 15, 2026

fixes: #2962
This patch ensures that modifier symbols are correctly rendered in Qt tooltips on macOS through two small adjustments:

1. Tooltip UTF-8 Conversion

In src/Plugins/Qt/qt_ui_element.cpp, tooltip text is now passed through cork_to_utf8() before being converted to a Qt string. This converts TeXmacs character references into their proper Unicode symbols so that Qt displays them correctly.

2. macOS Shortcut Rendering Condition

In src/Texmacs/Server/tm_config.cpp, the kbd_system_prevails condition was refined to avoid applying legacy modifier substitutions when macOS fonts are already being used. This prevents conflicts with the font-based rendering of macOS modifier symbols.

After:
Screenshot 2026-03-16 at 2 04 06 AM

@Prthmsh7 Prthmsh7 changed the title fix #2962 : Correct macOS modifier symbols in accent shortcut tooltips [222_54] Correct macOS modifier symbols in accent shortcut tooltips Mar 15, 2026
@Prthmsh7
Copy link
Contributor Author

@JackYansongLi please review when free, thanks!

@Yuki-Nagori
Copy link
Contributor

The number needs to be updated. I checked the code and there's no problem.

@Prthmsh7 Prthmsh7 changed the title [222_54] Correct macOS modifier symbols in accent shortcut tooltips [222_60] Correct macOS modifier symbols in accent shortcut tooltips Mar 18, 2026
@Prthmsh7
Copy link
Contributor Author

@Yuki-Nagori Updated numbering in a follow-up commit. Please review when free. Thanks!

Copy link
Contributor

@Yuki-Nagori Yuki-Nagori left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Yuki-Nagori Yuki-Nagori merged commit ce28202 into MoganLab:main Mar 18, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

macOS 上重音符号快捷键显示有问题

2 participants