branches/new_menus/src/emu/ui/menubar.c
| r29569 | r29570 | |
|---|
| 254 | 254 | { |
| 255 | 255 | int code_previous_menu = IPT_INVALID; |
| 256 | 256 | int code_next_menu = IPT_INVALID; |
| 257 | | int code_child_menu = IPT_INVALID; |
| 257 | int code_child_menu1 = IPT_INVALID; |
| 258 | int code_child_menu2 = IPT_INVALID; |
| 258 | 259 | int code_parent_menu = IPT_INVALID; |
| 259 | 260 | int code_previous_sub_menu = IPT_INVALID; |
| 260 | 261 | int code_next_sub_menu = IPT_INVALID; |
| r29569 | r29570 | |
|---|
| 271 | 272 | // no pull down menu selected |
| 272 | 273 | code_previous_menu = IPT_UI_LEFT; |
| 273 | 274 | code_next_menu = IPT_UI_RIGHT; |
| 274 | | code_child_menu = IPT_UI_DOWN; |
| 275 | code_child_menu1 = IPT_UI_DOWN; |
| 275 | 276 | } |
| 276 | 277 | else |
| 277 | 278 | { |
| r29569 | r29570 | |
|---|
| 279 | 280 | code_previous_menu = IPT_UI_UP; |
| 280 | 281 | code_next_menu = IPT_UI_DOWN; |
| 281 | 282 | if (m_selected_item->child()) |
| 282 | | code_child_menu = IPT_UI_SELECT; |
| 283 | { |
| 284 | code_child_menu1 = IPT_UI_SELECT; |
| 285 | code_child_menu2 = IPT_UI_RIGHT; |
| 286 | } |
| 283 | 287 | code_previous_sub_menu = IPT_UI_LEFT; |
| 284 | 288 | code_next_sub_menu = IPT_UI_RIGHT; |
| 285 | 289 | if (m_selected_item->parent()->is_sub_menu()) |
| r29569 | r29570 | |
|---|
| 292 | 296 | result = walk_selection_previous(); |
| 293 | 297 | else if (input_pressed_safe(code_next_menu)) |
| 294 | 298 | result = walk_selection_next(); |
| 295 | | else if (input_pressed_safe(code_child_menu)) |
| 299 | else if (input_pressed_safe(code_child_menu1) || input_pressed_safe(code_child_menu2)) |
| 296 | 300 | result = walk_selection_child(); |
| 297 | 301 | else if (input_pressed_safe(IPT_UI_CANCEL)) |
| 298 | 302 | result = walk_selection_escape(); |