diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/cru/common/String.hpp | 2 | ||||
-rw-r--r-- | include/cru/osx/graphics/quartz/Brush.hpp | 2 | ||||
-rw-r--r-- | include/cru/osx/graphics/quartz/TextLayout.hpp | 2 | ||||
-rw-r--r-- | include/cru/platform/Resource.hpp | 2 | ||||
-rw-r--r-- | include/cru/ui/DebugFlags.hpp | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/include/cru/common/String.hpp b/include/cru/common/String.hpp index 5d09d380..c05ab6e0 100644 --- a/include/cru/common/String.hpp +++ b/include/cru/common/String.hpp @@ -80,7 +80,7 @@ class CRU_BASE_API String { } } - String(std::initializer_list<value_type> l) : String(l.begin(), l.end()) {} + String(std::initializer_list<value_type> l); #ifdef CRU_PLATFORM_WINDOWS String(const wchar_t* str); diff --git a/include/cru/osx/graphics/quartz/Brush.hpp b/include/cru/osx/graphics/quartz/Brush.hpp index 11f05292..1fa26794 100644 --- a/include/cru/osx/graphics/quartz/Brush.hpp +++ b/include/cru/osx/graphics/quartz/Brush.hpp @@ -38,6 +38,8 @@ class QuartzSolidColorBrush : public QuartzBrush, void Select(CGContextRef context) override; + String GetDebugString() override; + private: Color color_; CGColorRef cg_color_; diff --git a/include/cru/osx/graphics/quartz/TextLayout.hpp b/include/cru/osx/graphics/quartz/TextLayout.hpp index 03b1b1cb..95e3d1be 100644 --- a/include/cru/osx/graphics/quartz/TextLayout.hpp +++ b/include/cru/osx/graphics/quartz/TextLayout.hpp @@ -37,6 +37,8 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout { CTFrameRef CreateFrameWithColor(const Color& color); + String GetDebugString() override; + private: void ReleaseResource(); void RecreateFrame(); diff --git a/include/cru/platform/Resource.hpp b/include/cru/platform/Resource.hpp index b55da43a..c89068fa 100644 --- a/include/cru/platform/Resource.hpp +++ b/include/cru/platform/Resource.hpp @@ -11,5 +11,7 @@ struct CRU_PLATFORM_API IPlatformResource : virtual Interface { CRU_DEFAULT_CONSTRUCTOR_DESTRUCTOR(IPlatformResource) virtual String GetPlatformId() const = 0; + + virtual String GetDebugString() { return String(); } }; } // namespace cru::platform diff --git a/include/cru/ui/DebugFlags.hpp b/include/cru/ui/DebugFlags.hpp index 51482135..c25c10fa 100644 --- a/include/cru/ui/DebugFlags.hpp +++ b/include/cru/ui/DebugFlags.hpp @@ -6,4 +6,5 @@ constexpr bool layout = false; constexpr bool shortcut = false; constexpr bool text_service = false; constexpr int click_detector = 0; +constexpr int draw = 1; } // namespace cru::ui::debug_flags |