From 4d650160a388b0192e04c454ba1a3de21b0d4cc3 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 4 Apr 2019 17:52:15 +0800 Subject: ... --- include/cru/platform/win/win_native_window.hpp | 16 ++++++++-------- include/cru/platform/win/win_painter.hpp | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'include/cru/platform/win') 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* ResizeEvent() override { return &resize_event_; } + Event* ResizeEvent() override { return &resize_event_; } Event<>* PaintEvent() override { return &paint_event_; } Event* FocusEvent() override { return &focus_event_; } Event* MouseEnterLeaveEvent() override { return &mouse_enter_leave_event_; } - Event* MouseMoveEvent() override { return &mouse_move_event_; } - Event* MouseDownEvent() override { + Event* MouseMoveEvent() override { return &mouse_move_event_; } + Event* MouseDownEvent() override { return &mouse_down_event_; } - Event* MouseUpEvent() override { + Event* MouseUpEvent() override { return &mouse_up_event_; } Event* KeyDownEvent() override { return &key_down_event_; } @@ -117,13 +117,13 @@ class WinNativeWindow : public Object, public virtual NativeWindow { std::shared_ptr window_render_target_; Event<> destroy_event_; - Event resize_event_; + Event resize_event_; Event<> paint_event_; Event focus_event_; Event mouse_enter_leave_event_; - Event mouse_move_event_; - Event mouse_down_event_; - Event mouse_up_event_; + Event mouse_move_event_; + Event mouse_down_event_; + Event mouse_up_event_; Event key_down_event_; Event 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; -- cgit v1.2.3