Merge branch 'hotfix-1.4' into develop

2016-09-24 09:58:44 +08:00
parent 422f2c768b 0e6ea35858
commit 340c350fcb
16 changed files with 349 additions and 145 deletions
--- a/source/gui/detail/window_manager.cpp
+++ b/source/gui/detail/window_manager.cpp
@@ -1714,6 +1714,11 @@ namespace detail
 				wd->annex.caret_ptr = nullptr;
 			}

+			using effect_renderer = detail::edge_nimbus_renderer<basic_window>;
+
+			//remove the window from edge nimbus effect when it is destroying
+			effect_renderer::instance().erase(wd);
+
 			arg_destroy arg;
 			arg.window_handle = reinterpret_cast<window>(wd);
 			brock.emit(event_code::destroy, wd, arg, true, brock.get_thread_context());