split out edge detecting code a bit so it is easy to add the dock area and do that too

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 6a25a9aece93d8daa1bbc627f3e6257bfcfaee20..2010bf8fe4289b799ff96c3d422d41ee92c4245d 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -401,6 +401,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         text_a->texture[0].data.text.string = self->entry->data.normal.label;
         if (self->entry->data.normal.shortcut &&
             (self->frame->menu->show_all_shortcuts ||
+             self->entry->data.normal.shortcut_always_show ||
              self->entry->data.normal.shortcut_position > 0))
         {
             text_a->texture[0].data.text.shortcut = TRUE;
@@ -416,6 +417,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         sub = self->entry->data.submenu.submenu;
         text_a->texture[0].data.text.string = sub ? sub->title : "";
         if (sub->shortcut && (self->frame->menu->show_all_shortcuts ||
+                              sub->shortcut_always_show ||
                               sub->shortcut_position > 0))
         {
             text_a->texture[0].data.text.shortcut = TRUE;
@@ -1203,7 +1205,7 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
             func(entry, frame, client, state, data);
         else
             actions_run_acts(acts, OB_USER_ACTION_MENU_SELECTION,
-                             state, -1, -1, OB_FRAME_CONTEXT_NONE, client);
+                             state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, client);
     }
 }