finish basic work of fit-content

2017-02-25 02:49:57 +08:00
parent 4820aba1e2
commit 3e5c4133ce
9 changed files with 360 additions and 326 deletions
--- a/source/gui/widgets/label.cpp
+++ b/source/gui/widgets/label.cpp
@@ -655,14 +655,19 @@ namespace nana
 						: impl_{ impl }
 					{}

-					optional<size> measure(bool limit_width, unsigned limit_pixels) const override
+					optional<size> measure(graph_reference graph, unsigned limit_pixels, bool limit_width) const override
 					{
-						if (impl_->graph)
+						if (graph)
 						{

 						}
 						return{};
 					}
+
+					size extension() const override
+					{
+						return{ 2, 2 };
+					}
 				private:
 					implement * const impl_;
 				};