Merge branch 'develop' into prepare-utf8

2016-01-03 14:18:03 +08:00
parent 0a4f04267e cd5a0bf554
commit 0bb7c788d5
13 changed files with 522 additions and 108 deletions
--- a/source/gui/widgets/menu.cpp
+++ b/source/gui/widgets/menu.cpp
@@ -528,17 +528,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;