diff options
Diffstat (limited to 'include/cru/ui/render')
| -rw-r--r-- | include/cru/ui/render/RenderObject.h | 2 | ||||
| -rw-r--r-- | include/cru/ui/render/ScrollBar.h | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h index 34761b51..c299ea24 100644 --- a/include/cru/ui/render/RenderObject.h +++ b/include/cru/ui/render/RenderObject.h @@ -137,7 +137,7 @@ class CRU_UI_API RenderObject : public Object { virtual RenderObject* HitTest(const Point& point) = 0; public: - host::WindowHost* GetWindowHost(); + controls::Window* GetWindow(); void InvalidateLayout(); void InvalidatePaint(); diff --git a/include/cru/ui/render/ScrollBar.h b/include/cru/ui/render/ScrollBar.h index 13c7d8b0..2325acd1 100644 --- a/include/cru/ui/render/ScrollBar.h +++ b/include/cru/ui/render/ScrollBar.h @@ -5,11 +5,9 @@ #include "cru/platform/graphics/Brush.h" #include "cru/platform/graphics/Geometry.h" #include "cru/platform/graphics/Painter.h" -#include "cru/platform/gui/Cursor.h" #include "cru/platform/gui/UiApplication.h" #include "cru/ui/Base.h" #include "cru/ui/controls/Control.h" -#include "cru/ui/helper/ClickDetector.h" #include <memory> #include <optional> @@ -38,8 +36,8 @@ enum class ScrollBarAreaKind { enum class ScrollBarBrushUsageKind { Arrow, ArrowBackground, Slot, Thumb }; enum class ScrollBarBrushStateKind { Normal, Hover, Press, Disable }; -std::string CRU_UI_API GenerateScrollBarThemeColorKey(ScrollBarBrushUsageKind usage, - ScrollBarBrushStateKind state); +std::string CRU_UI_API GenerateScrollBarThemeColorKey( + ScrollBarBrushUsageKind usage, ScrollBarBrushStateKind state); class CRU_UI_API ScrollBar : public Object { public: @@ -139,7 +137,7 @@ class CRU_UI_API ScrollBar : public Object { Event<Scroll> scroll_attempt_event_; - bool cursor_overrided_ = false; + bool cursor_overridden_ = false; platform::gui::TimerAutoCanceler auto_collapse_timer_canceler_; }; |