Merge branch 'hotfix-1.5.5' into feature-listbox

2017-11-22 03:54:49 +08:00
parent bbc2dc2aea 14cc7cdaa1
commit dddd704786
29 changed files with 529 additions and 333 deletions
--- a/source/gui/programming_interface.cpp
+++ b/source/gui/programming_interface.cpp
@@ -1185,6 +1185,13 @@ namespace API
 			auto caret = _m_caret();
 			return (caret && caret->visible());
 		}
+
+		bool activated() const override
+		{
+			internal_scope_guard lock;
+			auto caret = _m_caret();
+			return (caret && caret->activated());
+		}
 	private:
 		caret_interface* _m_caret() const
 		{