diff options
| -rw-r--r-- | include/cru/platform/GraphicsBase.h | 6 | ||||
| -rw-r--r-- | include/cru/ui/host/WindowHost.h | 2 | ||||
| -rw-r--r-- | src/ui/components/Menu.cpp | 2 | ||||
| -rw-r--r-- | src/ui/host/WindowHost.cpp | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/include/cru/platform/GraphicsBase.h b/include/cru/platform/GraphicsBase.h index f134e74d..676d3924 100644 --- a/include/cru/platform/GraphicsBase.h +++ b/include/cru/platform/GraphicsBase.h @@ -5,11 +5,7 @@ #include "cru/common/Range.h" #include "cru/common/String.h" -#include <cstdint> #include <limits> -#include <optional> -#include <string> -#include <utility> namespace cru::platform { struct Size; @@ -61,7 +57,7 @@ struct CRU_PLATFORM_API Size final { explicit constexpr Size(const Point& point) : width(point.x), height(point.y) {} - constexpr static Size Infinate() { + constexpr static Size Infinite() { return Size{std::numeric_limits<float>::max(), std::numeric_limits<float>::max()}; } diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h index 0d2e0341..17f69d89 100644 --- a/include/cru/ui/host/WindowHost.h +++ b/include/cru/ui/host/WindowHost.h @@ -57,7 +57,7 @@ class CRU_UI_API WindowHost : public Object, public SelfResolvable<WindowHost> { } void Relayout(); - void RelayoutWithSize(const Size& available_size = Size::Infinate(), + void RelayoutWithSize(const Size& available_size = Size::Infinite(), bool set_window_size_to_fit_content = false); void Repaint(); diff --git a/src/ui/components/Menu.cpp b/src/ui/components/Menu.cpp index 471654ec..005147a1 100644 --- a/src/ui/components/Menu.cpp +++ b/src/ui/components/Menu.cpp @@ -95,7 +95,7 @@ void PopupMenu::SetPosition(const Point& position) { } void PopupMenu::Show() { - popup_.GetWindowHost()->RelayoutWithSize(Size::Infinate(), true); + popup_.GetWindowHost()->RelayoutWithSize(Size::Infinite(), true); auto native_window = popup_.GetWindowHost()->GetNativeWindow(); native_window->SetVisibility(platform::gui::WindowVisibilityType::Show); native_window->RequestFocus(); diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp index 737a7594..283224b1 100644 --- a/src/ui/host/WindowHost.cpp +++ b/src/ui/host/WindowHost.cpp @@ -180,7 +180,7 @@ void WindowHost::SetLayoutPreferToFillWindow(bool value) { void WindowHost::Relayout() { const auto available_size = - native_window_ ? native_window_->GetClientSize() : Size::Infinate(); + native_window_ ? native_window_->GetClientSize() : Size::Infinite(); RelayoutWithSize(available_size); } |