Merge branch 'develop'

include/nana/gui/detail/drawer.hpp

@@ -16,7 +16,7 @@
 #include <vector>
 #include "general_events.hpp"
 #include <nana/paint/graphics.hpp>
-#include <nana/paint/image.hpp>
+//#include <nana/paint/image.hpp>	//deprecated
 #include <functional>
 
 namespace nana

include/nana/gui/widgets/listbox.hpp

@@ -185,7 +185,7 @@ namespace nana
 			public:
 				trigger();
 				~trigger();
-				essence_t& essence();
+				//essence_t& essence();	//deprecated
 				essence_t& essence() const;
 				void draw();
 			private:
@@ -618,15 +618,15 @@ By \a clicking on one header the list get \a reordered, first up, and then down
 		{
 			typedef typename nana::detail::type_escape<Key>::type key_t;
 			nana::key<key_t, std::less<key_t> > key(kv);
-			_m_ease_key(&key);
+			_m_erase_key(&key);
 		}
 
 		template<typename Key>
 		void erase_key(Key&& kv)
 		{
 			typedef typename nana::detail::type_escape<Key>::type key_t;
 			nana::key<key_t, std::less<key_t> > key(std::move(kv));
-			_m_ease_key(&key);
+			_m_erase_key(&key);
 		}
 
 		bool sortable() const;
@@ -661,7 +661,7 @@ By \a clicking on one header the list get \a reordered, first up, and then down
 		drawerbase::listbox::essence_t & _m_ess() const;
 		nana::any* _m_anyobj(size_type cat, size_type index, bool allocate_if_empty) const;
 		drawerbase::listbox::category_t* _m_at_key(std::shared_ptr<nana::detail::key_interface>);
-		void _m_ease_key(nana::detail::key_interface*);
+		void _m_erase_key(nana::detail::key_interface*);
 	};
 
 	namespace dev

include/nana/gui/widgets/tabbar.hpp

@@ -334,4 +334,51 @@ namespace nana
 		std::unique_ptr<drawerbase::tabbar::event_agent<value_type, drawerbase::tabbar::trigger> > evt_agent_;
 	};
 }//end namespace nana
+
+
+namespace nana
+{
+	namespace ng
+	{
+		namespace drawerbase
+		{
+			namespace tabbar_lite
+			{
+				class model;
+
+				class driver
+					: public drawer_trigger
+				{
+				public:
+					driver();
+					~driver();
+
+					model* get_model();
+				private:
+					//Overrides drawer_trigger's method
+					void attached(widget_reference, graph_reference)	override;
+					void refresh(graph_reference) override;
+					void mouse_move(graph_reference, const arg_mouse&) override;
+					void mouse_leave(graph_reference, const arg_mouse&) override;
+					void mouse_down(graph_reference, const arg_mouse&) override;
+				private:
+					model* const model_;
+				};
+			}
+		}//end namespace drawerbase
+
+		class tabbar_lite
+			: public widget_object<category::widget_tag, drawerbase::tabbar_lite::driver>
+		{
+		public:
+			tabbar_lite() = default;
+			tabbar_lite(window, bool visible = true, const::nana::rectangle& = {});
+
+
+			void push_back(std::string text, ::nana::any par = {});
+			void push_front(std::string text, ::nana::any par = {});
+		};
+	}
+}
+
 #endif

include/nana/gui/widgets/widget.hpp

@@ -31,7 +31,7 @@ namespace nana
 		: nana::noncopyable, nana::nonmovable
 	{
 		friend class detail::widget_notifier_interface;
-		class notifier;
+		class inner_widget_notifier;
 		typedef void(*dummy_bool_type)(widget* (*)(const widget&));
 	public:
 		virtual ~widget() = default;

include/nana/paint/graphics.hpp

@@ -96,7 +96,8 @@ namespace nana
 			::nana::size	glyph_extent_size(const char_t*, std::size_t length, std::size_t begin, std::size_t end) const;
 			::nana::size	glyph_extent_size(const string&, std::size_t length, std::size_t begin, std::size_t end) const;
 			bool glyph_pixels(const char_t *, std::size_t length, unsigned* pxbuf) const;
-			::nana::size	bidi_extent_size(const string&) const;
+			::nana::size	bidi_extent_size(const std::wstring&) const;
+			::nana::size	bidi_extent_size(const std::string&) const;
 
 			bool text_metrics(unsigned & ascent, unsigned& descent, unsigned& internal_leading) const;
 
@@ -139,6 +140,7 @@ namespace nana
 			void set_text_color(const ::nana::color&);
 
 			unsigned bidi_string(const nana::point&, const char_t *, std::size_t len);
+			unsigned bidi_string(const point& pos, const char*, std::size_t len);
 
 			void blend(const ::nana::rectangle& r, const ::nana::color&, double fade_rate);
 

source/gui/detail/bedrock_pi.cpp

@@ -189,8 +189,6 @@ namespace nana
 			auto retain = wd->together.events_ptr;
 			auto evts_ptr = retain.get();
 
-			//enable refreshing flag, this is a RAII class for exception-safe
-			flag_guard fguard(this, wd);
 
 			switch (evt_code)
 			{
@@ -199,8 +197,11 @@ namespace nana
 					auto arg = dynamic_cast<const arg_click*>(&event_arg);
 					if (nullptr == arg)
 						return;
-
-					wd->drawer.click(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.click(*arg);
+					}
 					if (!draw_only)
 						evts_ptr->click.emit(*arg);
 				}
@@ -249,7 +250,11 @@ namespace nana
 					throw std::runtime_error("Invalid mouse event code");
 				}
 
-				(wd->drawer.*drawer_event_fn)(*arg);
+				{
+					//enable refreshing flag, this is a RAII class for exception-safe
+					flag_guard fguard(this, wd);
+					(wd->drawer.*drawer_event_fn)(*arg);
+				}
 
 				if (!draw_only)
 					evt_addr->emit(*arg);
@@ -260,7 +265,12 @@ namespace nana
 				auto arg = dynamic_cast<const arg_wheel*>(&event_arg);
 				if (arg)
 				{
-					wd->drawer.mouse_wheel(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.mouse_wheel(*arg);
+					}
+
 					if (!draw_only)
 						evts_ptr->mouse_wheel.emit(*arg);
 				}
@@ -299,7 +309,12 @@ namespace nana
 				default:
 					throw std::runtime_error("Invalid keyboard event code");
 				}
-				(wd->drawer.*drawer_event_fn)(*arg);
+				{
+					//enable refreshing flag, this is a RAII class for exception-safe
+					flag_guard fguard(this, wd);
+					(wd->drawer.*drawer_event_fn)(*arg);
+				}
+
 				if (!draw_only)
 					evt_addr->emit(*arg);
 				break;
@@ -317,7 +332,11 @@ namespace nana
 				auto arg = dynamic_cast<const arg_focus*>(&event_arg);
 				if (arg)
 				{
-					wd->drawer.focus(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.focus(*arg);
+					}
 					if (!draw_only)
 						evts_ptr->focus.emit(*arg);
 				}
@@ -328,7 +347,11 @@ namespace nana
 				auto arg = dynamic_cast<const arg_move*>(&event_arg);
 				if (arg)
 				{
-					wd->drawer.move(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.move(*arg);
+					}
 					if (!draw_only)
 						evts_ptr->move.emit(*arg);
 				}
@@ -339,7 +362,11 @@ namespace nana
 				auto arg = dynamic_cast<const arg_resizing*>(&event_arg);
 				if (arg)
 				{
-					wd->drawer.resizing(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.resizing(*arg);
+					}
 					if (!draw_only)
 						evts_ptr->resizing.emit(*arg);
 				}
@@ -350,7 +377,11 @@ namespace nana
 				auto arg = dynamic_cast<const arg_resized*>(&event_arg);
 				if (arg)
 				{
-					wd->drawer.resized(*arg);
+					{
+						//enable refreshing flag, this is a RAII class for exception-safe
+						flag_guard fguard(this, wd);
+						wd->drawer.resized(*arg);
+					}
 					if (!draw_only)
 						evts_ptr->resized.emit(*arg);
 				}

source/gui/detail/window_manager.cpp

@@ -326,6 +326,9 @@ namespace detail
 			std::lock_guard<decltype(mutex_)> lock(mutex_);
 			if (impl_->wd_register.available(wd) == false)	return;
 
+			if (wd->flags.destroying)
+				return;
+
 			if(wd->other.category == category::root_tag::value)
 			{
 				auto &brock = bedrock::instance();
@@ -340,13 +343,15 @@ namespace detail
 					if(wd->flags.modal || (wd->owner == nullptr) || wd->owner->flags.take_active)
 						native_interface::activate_owner(wd->root);
 
-					//Close should detach the drawer and send destroy signal to widget object.
-					//Otherwise, when a widget object is been deleting in other thread by delete operator, the object will be destroyed
-					//before the window_manager destroyes the window, and then, window_manager detaches the
-					//non-existing drawer_trigger which is destroyed by destruction of widget. Crash!
-					wd->drawer.detached();
-
-					wd->widget_notifier->destroy();
+					if (!wd->flags.destroying)
+					{
+						//Close should detach the drawer and send destroy signal to widget object.
+						//Otherwise, when a widget object is been deleting in other thread by delete operator, the object will be destroyed
+						//before the window_manager destroyes the window, and then, window_manager detaches the
+						//non-existing drawer_trigger which is destroyed by destruction of widget. Crash!
+						wd->drawer.detached();
+						wd->widget_notifier->destroy();
+					}
 
 					native_interface::close_window(wd->root);
 				}