From ccc3c8690003f0cb3048c124604b435b87d8a5a0 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Thu, 31 Aug 2023 15:11:35 +0200 Subject: [PATCH] Rename 'alternative' to 'snap cursor, with ALT or option key (OSX) --- src/UserInterfaceManager.cpp | 8 ++++---- src/defines.h | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp index 896c7ce..10624d1 100644 --- a/src/UserInterfaceManager.cpp +++ b/src/UserInterfaceManager.cpp @@ -4678,7 +4678,7 @@ void Navigator::RenderMousePointerSelector(const ImVec2 &size) ImVec2 bottom = ImGui::GetCursorScreenPos(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup)) { - ImGuiToolkit::ToolTip("Alternative cursor", "ALT"); + ImGuiToolkit::ToolTip("Snap cursor", ALT_MOD); counter_menu_timeout=0; } @@ -4734,10 +4734,10 @@ void Navigator::RenderMousePointerSelector(const ImVec2 &size) ImGui::SetCursorPosY(margin.y); ImGui::TextDisabled(" |"); ImGui::SameLine(0, IMGUI_SAME_LINE); - ImGuiToolkit::ButtonToggle(Settings::application.mouse_pointer_lock ? ICON_FA_LOCK " ALT LOCK" : ICON_FA_UNLOCK " ALT LOCK", + ImGuiToolkit::ButtonToggle(Settings::application.mouse_pointer_lock ? ICON_FA_LOCK ALT_LOCK : ICON_FA_UNLOCK ALT_LOCK, &Settings::application.mouse_pointer_lock, - "Activate the selected alternative mouse pointer by pressing the ALT key.\n\n" - ICON_FA_LOCK " ALT LOCK keeps the alternative mouse pointer active."); + "Activate the selected snap mouse pointer by pressing the [" ALT_MOD "] key.\n\n" + ICON_FA_LOCK ALT_LOCK " keeps the snap mouse pointer active."); ImGui::PopFont(); // timer to close menu like a tooltip diff --git a/src/defines.h b/src/defines.h index 25ca532..445a1de 100644 --- a/src/defines.h +++ b/src/defines.h @@ -132,10 +132,12 @@ #ifdef APPLE #define CTRL_MOD "Cmd+" -#define ALT_MOD "Option+" +#define ALT_MOD "option" +#define ALT_LOCK " OPT LOCK" #else #define CTRL_MOD "Ctrl+" -#define ALT_MOD "Alt+" +#define ALT_MOD "Alt" +#define ALT_LOCK " ALT LOCK" #endif #define MENU_NEW_FILE ICON_FA_FILE " New"