Merge branch 'hotfix-1.4.1' into develop

2016-10-31 06:21:41 +08:00
parent 7ffad3c877 a3de89aab5
commit b1ce0eaff2
26 changed files with 428 additions and 342 deletions
--- a/source/paint/graphics.cpp
+++ b/source/paint/graphics.cpp
@@ -156,6 +156,18 @@ namespace paint
 			return (impl_->font_ptr->italic);
 		}

+		bool font::underline() const
+		{
+			if(empty()) return false;
+			return (impl_->font_ptr->underline);
+		}
+
+		bool font::strikeout() const
+		{
+			if(empty()) return false;
+			return (impl_->font_ptr->strikeout);
+		}
+
 		native_font_type font::handle() const
 		{
 			if(empty())	return nullptr;