From f246877698e5b9aa98e99f3fd3d2247998008695 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 29 Sep 2021 20:45:36 +0800 Subject: ... --- include/cru/osx/gui/Window.hpp | 7 ++++++- include/cru/platform/GraphicsBase.hpp | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/cru/osx/gui/Window.hpp b/include/cru/osx/gui/Window.hpp index 1e790a65..6bb6b747 100644 --- a/include/cru/osx/gui/Window.hpp +++ b/include/cru/osx/gui/Window.hpp @@ -1,5 +1,6 @@ #pragma once #include "Resource.hpp" +#include "cru/platform/gui/Base.hpp" #include "cru/platform/gui/Window.hpp" #include @@ -15,7 +16,8 @@ class OsxWindow : public OsxGuiResource, public INativeWindow { friend details::OsxWindowPrivate; public: - explicit OsxWindow(OsxUiApplication* ui_application); + OsxWindow(OsxUiApplication* ui_application, INativeWindow* parent, + bool frame); CRU_DELETE_COPY(OsxWindow) CRU_DELETE_MOVE(OsxWindow) @@ -61,6 +63,9 @@ class OsxWindow : public OsxGuiResource, public INativeWindow { IInputMethodContext* GetInputMethodContext() override; + private: + void CreateWindow(); + private: std::unique_ptr p_; }; diff --git a/include/cru/platform/GraphicsBase.hpp b/include/cru/platform/GraphicsBase.hpp index e7201ec0..aee718a1 100644 --- a/include/cru/platform/GraphicsBase.hpp +++ b/include/cru/platform/GraphicsBase.hpp @@ -182,6 +182,11 @@ struct Rect final { return Point(left + width / 2.0f, top + height / 2.0f); } + constexpr void SetSize(const Size& size) { + width = size.width; + height = size.height; + } + constexpr Size GetSize() const { return Size(width, height); } constexpr Rect Expand(const Thickness& thickness) const { -- cgit v1.2.3