Merge branch 'hotfix-1.5.6' into develop-c++17

2018-01-29 17:19:13 +08:00
parent be836b5b48 9bd3dc7e58
commit 211433afdd
10 changed files with 87 additions and 45 deletions
--- a/source/gui/programming_interface.cpp
+++ b/source/gui/programming_interface.cpp
@@ -821,6 +821,15 @@ namespace API
 		}
 	}

+	nana::optional<rectangle> window_rectangle(window wd)
+	{
+		auto iwd = reinterpret_cast<basic_window*>(wd);
+		internal_scope_guard lock;
+		if (restrict::wd_manager().available(iwd))
+			return rectangle(iwd->pos_owner, iwd->dimension);
+		return{};
+	}
+
 	bool get_window_rectangle(window wd, rectangle& r)
 	{
 		auto iwd = reinterpret_cast<basic_window*>(wd);