InputText: On OSX, inhibit usage of Alt key to toggle menu when active (used for work skip).

ocornut · ocornut · commit fc505322134b · 2023-01-25T21:44:30.000+01:00
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -49,6 +49,7 @@ All changes:
 - Text: Tweaked rendering of three-dots "..." ellipsis variant. (#2775, #4269)
 - InputText: Added support for Ctrl+Delete to delete up to end-of-word. (#6067) [@ajweeks]
   (Not adding Super+Delete to delete to up to end-of-line on OSX, as OSX doesn't have it)
+- InputText: On OSX, inhibit usage of Alt key to toggle menu when active (used for work skip).
 - Menus: Fixed layout of MenuItem()/BeginMenu() when label contains a '\n'. (#6116) [@imkcy9]
 - PlotHistogram, PlotLines: Passing negative sizes honor alignment like other widgets.
 - ImDrawList: Added missing early-out in AddPolyline() and AddConvexPolyFilled() when
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
@@ -4096,6 +4096,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
             state->Stb.insert_mode = 1; // stb field name is indeed incorrect (see #2863)
     }
 
+    const bool is_osx = io.ConfigMacOSXBehaviors;
     if (g.ActiveId != id && init_make_active)
     {
         IM_ASSERT(state && state->ID == id);
@@ -4118,6 +4119,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
             SetKeyOwner(ImGuiKey_PageUp, id);
             SetKeyOwner(ImGuiKey_PageDown, id);
         }
+        if (is_osx)
+            SetKeyOwner(ImGuiMod_Alt, id);
         if (flags & (ImGuiInputTextFlags_CallbackCompletion | ImGuiInputTextFlags_AllowTabInput)) // Disable keyboard tabbing out as we will use the \t character.
             SetKeyOwner(ImGuiKey_Tab, id);
     }
@@ -4187,7 +4190,6 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
         const float mouse_x = (io.MousePos.x - frame_bb.Min.x - style.FramePadding.x) + state->ScrollX;
         const float mouse_y = (is_multiline ? (io.MousePos.y - draw_window->DC.CursorPos.y) : (g.FontSize * 0.5f));
 
-        const bool is_osx = io.ConfigMacOSXBehaviors;
         if (select_all)
         {
             state->SelectAll();
@@ -4288,7 +4290,6 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
         state->Stb.row_count_per_page = row_count_per_page;
 
         const int k_mask = (io.KeyShift ? STB_TEXTEDIT_K_SHIFT : 0);
-        const bool is_osx = io.ConfigMacOSXBehaviors;
         const bool is_wordmove_key_down = is_osx ? io.KeyAlt : io.KeyCtrl;                     // OS X style: Text editing cursor movement using Alt instead of Ctrl
         const bool is_startend_key_down = is_osx && io.KeySuper && !io.KeyCtrl && !io.KeyAlt;  // OS X style: Line/Text Start and End using Cmd+Arrows instead of Home/End
 

Original file line number	Diff line number	Diff line change
`@@ -4096,6 +4096,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_`
`4096`	`4096`	`state->Stb.insert_mode = 1; // stb field name is indeed incorrect (see #2863)`
`4097`	`4097`	`}`
`4098`	`4098`
	`4099`	`+ const bool is_osx = io.ConfigMacOSXBehaviors;`
`4099`	`4100`	`if (g.ActiveId != id && init_make_active)`
`4100`	`4101`	`{`
`4101`	`4102`	`IM_ASSERT(state && state->ID == id);`
`@@ -4118,6 +4119,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_`
`4118`	`4119`	`SetKeyOwner(ImGuiKey_PageUp, id);`
`4119`	`4120`	`SetKeyOwner(ImGuiKey_PageDown, id);`
`4120`	`4121`	`}`
	`4122`	`+ if (is_osx)`
	`4123`	`+ SetKeyOwner(ImGuiMod_Alt, id);`
`4121`	`4124`	`if (flags & (ImGuiInputTextFlags_CallbackCompletion \| ImGuiInputTextFlags_AllowTabInput)) // Disable keyboard tabbing out as we will use the \t character.`
`4122`	`4125`	`SetKeyOwner(ImGuiKey_Tab, id);`
`4123`	`4126`	`}`
`@@ -4187,7 +4190,6 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_`
`4187`	`4190`	`const float mouse_x = (io.MousePos.x - frame_bb.Min.x - style.FramePadding.x) + state->ScrollX;`
`4188`	`4191`	`const float mouse_y = (is_multiline ? (io.MousePos.y - draw_window->DC.CursorPos.y) : (g.FontSize * 0.5f));`
`4189`	`4192`
`4190`		`- const bool is_osx = io.ConfigMacOSXBehaviors;`
`4191`	`4193`	`if (select_all)`
`4192`	`4194`	`{`
`4193`	`4195`	`state->SelectAll();`
`@@ -4288,7 +4290,6 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_`
`4288`	`4290`	`state->Stb.row_count_per_page = row_count_per_page;`
`4289`	`4291`
`4290`	`4292`	`const int k_mask = (io.KeyShift ? STB_TEXTEDIT_K_SHIFT : 0);`
`4291`		`- const bool is_osx = io.ConfigMacOSXBehaviors;`
`4292`	`4293`	`const bool is_wordmove_key_down = is_osx ? io.KeyAlt : io.KeyCtrl; // OS X style: Text editing cursor movement using Alt instead of Ctrl`
`4293`	`4294`	`const bool is_startend_key_down = is_osx && io.KeySuper && !io.KeyCtrl && !io.KeyAlt; // OS X style: Line/Text Start and End using Cmd+Arrows instead of Home/End`
`4294`	`4295`