mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add graph_reference to measure interface

Browse Source
This commit is contained in:
Jinhao 2017-02-24 21:15:02 +08:00
parent 4f252ddf20
commit 4820aba1e2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/gui/detail/widget_content_measurer_interface.hpp
View File

@ -14,8 +14,8 @@
#define NANA_WIDGET_CONTENT_MEASURER_INTERFACE_HEADER_INCLUDED #define NANA_WIDGET_CONTENT_MEASURER_INTERFACE_HEADER_INCLUDED
#include <nana/basic_types.hpp> #include <nana/basic_types.hpp>
#include <nana/optional.hpp> #include <nana/optional.hpp>
#include <nana/paint/graphics.hpp>
namespace nana namespace nana
{ {
@ -25,6 +25,7 @@ namespace nana
class widget_content_measurer_interface class widget_content_measurer_interface
{ {
public: public:
using graph_reference = paint::graphics&;
virtual ~widget_content_measurer_interface() = default; virtual ~widget_content_measurer_interface() = default;
/// Measures content /// Measures content
@ -33,7 +34,7 @@ namespace nana
* @param limit_pixels the number of pixels of the limited edge. If this parameter is zero, it is ignored * @param limit_pixels the number of pixels of the limited edge. If this parameter is zero, it is ignored
* @return the size of content * @return the size of content
*/ */
virtual optional<size> measure(bool limit_width, unsigned limit_pixels) const = 0; virtual optional<size> measure(graph_reference, bool limit_width, unsigned limit_pixels) const = 0;
}; };
} }
} }

1
include/nana/gui/widgets/button.hpp
View File

@ -25,6 +25,7 @@ namespace nana{
/// Draw the button /// Draw the button
class trigger: public drawer_trigger class trigger: public drawer_trigger
{ {
class measurer;
public: public:
trigger(); trigger();
~trigger(); ~trigger();