diff options
author | crupest <crupest@outlook.com> | 2019-04-04 17:52:15 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2019-04-04 17:52:15 +0800 |
commit | 4d650160a388b0192e04c454ba1a3de21b0d4cc3 (patch) | |
tree | f9c416767e039eeb7c5a37f93b70443f37c49f1d /include/cru/platform/win | |
parent | a410e2048db6f5ef6fb50e401a59b4b98b979050 (diff) | |
download | cru-4d650160a388b0192e04c454ba1a3de21b0d4cc3.tar.gz cru-4d650160a388b0192e04c454ba1a3de21b0d4cc3.tar.bz2 cru-4d650160a388b0192e04c454ba1a3de21b0d4cc3.zip |
...
Diffstat (limited to 'include/cru/platform/win')
-rw-r--r-- | include/cru/platform/win/win_native_window.hpp | 16 | ||||
-rw-r--r-- | include/cru/platform/win/win_painter.hpp | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/cru/platform/win/win_native_window.hpp b/include/cru/platform/win/win_native_window.hpp index ae19c9f3..7b93fd5c 100644 --- a/include/cru/platform/win/win_native_window.hpp +++ b/include/cru/platform/win/win_native_window.hpp @@ -47,17 +47,17 @@ class WinNativeWindow : public Object, public virtual NativeWindow { Painter* BeginPaint() override; Event<>* DestroyEvent() override { return &destroy_event_; } - Event<ui::Size>* ResizeEvent() override { return &resize_event_; } + Event<const ui::Size&>* ResizeEvent() override { return &resize_event_; } Event<>* PaintEvent() override { return &paint_event_; } Event<bool>* FocusEvent() override { return &focus_event_; } Event<bool>* MouseEnterLeaveEvent() override { return &mouse_enter_leave_event_; } - Event<ui::Point>* MouseMoveEvent() override { return &mouse_move_event_; } - Event<MouseButton, ui::Point>* MouseDownEvent() override { + Event<const ui::Point&>* MouseMoveEvent() override { return &mouse_move_event_; } + Event<MouseButton, const ui::Point&>* MouseDownEvent() override { return &mouse_down_event_; } - Event<MouseButton, ui::Point>* MouseUpEvent() override { + Event<MouseButton, const ui::Point&>* MouseUpEvent() override { return &mouse_up_event_; } Event<int>* KeyDownEvent() override { return &key_down_event_; } @@ -117,13 +117,13 @@ class WinNativeWindow : public Object, public virtual NativeWindow { std::shared_ptr<WindowRenderTarget> window_render_target_; Event<> destroy_event_; - Event<ui::Size> resize_event_; + Event<const ui::Size&> resize_event_; Event<> paint_event_; Event<bool> focus_event_; Event<bool> mouse_enter_leave_event_; - Event<ui::Point> mouse_move_event_; - Event<MouseButton, ui::Point> mouse_down_event_; - Event<MouseButton, ui::Point> mouse_up_event_; + Event<const ui::Point&> mouse_move_event_; + Event<MouseButton, const ui::Point&> mouse_down_event_; + Event<MouseButton, const ui::Point&> mouse_up_event_; Event<int> key_down_event_; Event<int> key_up_event_; diff --git a/include/cru/platform/win/win_painter.hpp b/include/cru/platform/win/win_painter.hpp index dfb981d5..3c37ccb2 100644 --- a/include/cru/platform/win/win_painter.hpp +++ b/include/cru/platform/win/win_painter.hpp @@ -17,6 +17,7 @@ class WinPainter : public Object, public virtual Painter { Matrix GetTransform() override; void SetTransform(const Matrix& matrix) override; + void Clear(const ui::Color& color) override; void StrokeRectangle(const ui::Rect& rectangle, Brush* brush, float width) override; void FillRectangle(const ui::Rect& rectangle, Brush* brush) override; |