Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into geometric_scheme

include/nana/gui/widgets/skeletons/text_editor.hpp

@@ -220,7 +220,7 @@ namespace nana{	namespace widgets
 			void set_end_caret();
 			
 			bool hit_text_area(const point&) const;
-			bool hit_select_area(nana::upoint pos) const;
+			bool hit_select_area(nana::upoint pos, bool ignore_when_select_all) const;
 
 			bool move_select();
 			bool mask(wchar_t);
@@ -355,10 +355,9 @@ namespace nana{	namespace widgets
 
 			struct selection
 			{
-				enum mode_selection_t{mode_no_selected, mode_mouse_selected, mode_method_selected};
+				enum mode_selection_t{mode_no_selected, mode_mouse_selected, mode_method_selected, mode_move_selected};
 
 				mode_selection_t mode_selection;
-				bool dragged;
 				nana::upoint a, b;
 			}select_;
 

source/gui/widgets/menu.cpp

@@ -398,24 +398,28 @@ namespace nana
 						//Draw text, the text is transformed from orignal for hotkey character
 						wchar_t hotkey;
 						std::string::size_type hotkey_pos;
-						auto text = to_wstring(API::transform_shortkey_text(m.text, hotkey, &hotkey_pos));
+						auto text = API::transform_shortkey_text(m.text, hotkey, &hotkey_pos);
 
 						if (m.image.empty() == false)
 							renderer->item_image(graph, nana::point(item_r.x + 5, item_r.y + static_cast<int>(item_h_px - image_px) / 2 - 1), image_px, m.image);
 
-						renderer->item_text(graph, nana::point(item_r.x + 40, item_r.y + text_top_off), to_utf8(text), strpixels, attr);
+						renderer->item_text(graph, nana::point(item_r.x + 40, item_r.y + text_top_off), text, strpixels, attr);
 
 						if (hotkey)
 						{
 							m.hotkey = hotkey;
 							if (m.flags.enabled)
 							{
-								unsigned off_w = (hotkey_pos ? graph.text_extent_size(text, static_cast<unsigned>(hotkey_pos)).width : 0);
+								auto off_px = (hotkey_pos ? graph.text_extent_size(text.c_str(), hotkey_pos).width : 0);
-								nana::size hotkey_size = graph.text_extent_size(text.c_str() + hotkey_pos, 1);
+								auto hotkey_px = graph.text_extent_size(text.c_str() + hotkey_pos, 1).width;
-								int x = item_r.x + 40 + off_w;
-								int y = item_r.y + text_top_off + hotkey_size.height;
 
-								graph_->line({ x, y }, { x + static_cast<int>(hotkey_size.width) - 1, y }, colors::black);
+								unsigned ascent, descent, inleading;
+								graph.text_metrics(ascent, descent, inleading);
+
+								int x = item_r.x + 40 + off_px;
+								int y = item_r.y + text_top_off + ascent + 1;
+
+								graph_->line({ x, y }, { x + static_cast<int>(hotkey_px)-1, y }, colors::black);
 							}
 						}
 
@@ -582,9 +586,12 @@ namespace nana
 							}
 							else if(m.flags.enabled)
 							{
-								std::move(fn_close_tree_)();
+								fn_close_tree_();
+								if (m.functor)
+								{
 									item_proxy ip(index, m);
 									m.functor.operator()(ip);
+								}
 								return 1;
 							}
 						}

source/gui/widgets/skeletons/text_editor.cpp

@@ -1290,7 +1290,6 @@ namespace nana{	namespace widgets
 			text_area_.scroll_pixels = 16;
 			text_area_.hscroll = text_area_.vscroll = 0;
 			select_.mode_selection = selection::mode_no_selected;
-			select_.dragged = false;
 
 			API::create_caret(wd, 1, line_height());
 			API::bgcolor(wd, colors::white);
@@ -1646,13 +1645,10 @@ namespace nana{	namespace widgets
 
 			if(left_button)
 			{
-				auto caret_pos_before = caret();
 				mouse_caret(scrpos);
 
-				if(select_.mode_selection != selection::mode_no_selected)
+				if (selection::mode_mouse_selected == select_.mode_selection || selection::mode_method_selected == select_.mode_selection)
 					set_end_caret();
-				else if ((!select_.dragged) && (caret_pos_before != caret()))
-					select_.dragged = true;
 
 				text_area_.border_renderer(graph_, _m_bgcolor());
 				return true;
@@ -1672,6 +1668,13 @@ namespace nana{	namespace widgets
 					API::capture_window(window_, true);
 					text_area_.captured = true;
 
+
+					if (this->hit_select_area(behavior_->screen_to_caret(arg.pos), true))
+					{
+						select_.mode_selection = selection::mode_move_selected;
+					}
+					else
+					{
 						//Set caret pos by screen point and get the caret pos.
 						mouse_caret(arg.pos);
 						if (arg.shift)
@@ -1693,25 +1696,26 @@ namespace nana{	namespace widgets
 						}
 						select_.mode_selection = selection::mode_mouse_selected;
 					}
+				}
 
 				text_area_.border_renderer(graph_, _m_bgcolor());
 				return true;
 			}
 			else if (event_code::mouse_up == arg.evt_code)
 			{
-				auto is_prev_no_selected = (select_.mode_selection == selection::mode_no_selected);
+				bool updated = false;
 
 				if (select_.mode_selection == selection::mode_mouse_selected)
 				{
 					select_.mode_selection = selection::mode_no_selected;
 					set_end_caret();
 				}
-				else if (is_prev_no_selected)
+				else if (selection::mode_move_selected == select_.mode_selection)
 				{
-					if ((!select_.dragged) || (!move_select()))
+					if (!move_select())
 						select(false);
+					updated = true;
 				}
-				select_.dragged = false;
 
 				API::capture_window(window_, false);
 				text_area_.captured = false;
@@ -1720,8 +1724,7 @@ namespace nana{	namespace widgets
 
 				text_area_.border_renderer(graph_, _m_bgcolor());
 
-				//Redraw if is_prev_no_selected is true
+				return updated;
-				return is_prev_no_selected;
 			}
 			return false;
 		}
@@ -1861,11 +1864,21 @@ namespace nana{	namespace widgets
 			return ((text_area_.area.x <= pos.x && pos.x < _m_end_pos(true)) && (text_area_.area.y <= pos.y && pos.y < _m_end_pos(false)));
 		}
 
-		bool text_editor::hit_select_area(nana::upoint pos) const
+		bool text_editor::hit_select_area(nana::upoint pos, bool ignore_when_select_all) const
 		{
 			nana::upoint a, b;
 			if(_m_get_sort_select_points(a, b))
 			{
+				if (ignore_when_select_all)
+				{
+					if (a.x == 0 && a.y == 0 && (b.y + 1) == static_cast<unsigned>(textbase_.lines()))
+					{
+						//is select all
+						if (b.x == static_cast<unsigned>(textbase_.getline(b.y).size()))
+							return false;
+					}
+				}
+
 				if((pos.y > a.y || (pos.y == a.y && pos.x >= a.x)) && ((pos.y < b.y) || (pos.y == b.y && pos.x < b.x)))
 					return true;
 			}
@@ -1874,7 +1887,10 @@ namespace nana{	namespace widgets
 
 		bool text_editor::move_select()
 		{
-			if(hit_select_area(points_.caret) || (select_.b == points_.caret))
+			if (! attributes_.editable)
+				return false;
+
+			if(hit_select_area(points_.caret, true) || (select_.b == points_.caret))
 			{
 				points_.caret = select_.b;