mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes-1.0.1' of https://github.com/beru/nana into beru-hotfixes-1.0.1

Browse Source 
Conflicts:
	source/gui/widgets/menubar.cpp
This commit is contained in:
Jinhao 2015-04-22 00:01:29 +08:00
commit 281fea01d1
1 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/gui/widgets/menubar.cpp
View File

@ -296,14 +296,26 @@ namespace nana
state_.menu->pick(); state_.menu->pick();
break; break;
default: default:
if (2 != state_.menu->send_shortkey(arg.key)) //Katsuhisa Yuasa: menubar key_press improvements
//send_shortkey has 3 states, 0 = UNKNOWN KEY, 1 = ITEM, 2 = GOTO SUBMENU
int sk_state = state_.menu->send_shortkey(arg.key);
switch(sk_state)
{
case 0: //UNKNOWN KEY
break;
case 1: //ITEM
if (state_.active != npos)
{ {
_m_total_close(); _m_total_close();
if (arg.key == 18) //ALT if (arg.key == 18) //ALT
state_.behavior = state_.behavior_focus; state_.behavior = state_.behavior_focus;
} }
else break;
case 2: //GOTO SUBMENU
state_.menu->goto_submen(); state_.menu->goto_submen();
break;
}
break;
} }
} }
else else
@ -315,12 +327,30 @@ namespace nana
case keyboard::os_arrow_left: case keyboard::os_arrow_left:
_m_move(keyboard::os_arrow_right != arg.key); _m_move(keyboard::os_arrow_right != arg.key);
break; break;
case keyboard::os_arrow_up:
case keyboard::os_arrow_down:
case keyboard::enter:
state_.menu_active = true;
if(_m_popup_menu())
state_.menu->goto_next(true);
break;
case keyboard::escape: case keyboard::escape:
if(state_.behavior == state_.behavior_focus) if(state_.behavior == state_.behavior_focus)
{ {
state_.active= npos; state_.active= npos;
state_.behavior = state_.behavior_none; state_.behavior = state_.behavior_none;
} }
break;
default:
std::size_t index = items_->find(arg.key);
if(index != npos)
{
state_.active = index;
state_.menu_active = true;
if(_m_popup_menu())
state_.menu->goto_next(true);
}
break;
} }
} }