Merge branch 'hotfix-1.2.2' into develop

2016-01-02 16:52:31 +08:00
parent fec3aa3c8e 3856543daf
commit cd5a0bf554
9 changed files with 269 additions and 93 deletions
--- a/source/gui/widgets/menu.cpp
+++ b/source/gui/widgets/menu.cpp
@@ -526,17 +526,16 @@ namespace nana
 						auto index = state_.active;
 						for (auto & m : menu_->items)
 						{
+							if (0 == index--)
+								break;
+
 							if (m.flags.splitter)
 							{
 								pos.y += 2;
 								continue;
 							}

-							if (0 == index)
-								break;
-
 							pos.y += _m_item_height() + 1;
-							--index;
 						}

 						tmstamp = state_.active_timestamp;