aboutsummaryrefslogtreecommitdiff
path: root/src/ui/layout_base.cpp
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2018-11-09 21:03:45 +0800
committercrupest <crupest@outlook.com>2018-11-09 21:03:45 +0800
commit4b219b569c16db6027dd36e4656152f261321c60 (patch)
tree2f40c6aeb74382c5a958f153e4598950dffae94c /src/ui/layout_base.cpp
parent6515948e3f5b97f90446536f72e99d71e96f9de7 (diff)
parent9ef75fe91837394620edb91f332065a4f34a0281 (diff)
downloadcru-4b219b569c16db6027dd36e4656152f261321c60.tar.gz
cru-4b219b569c16db6027dd36e4656152f261321c60.tar.bz2
cru-4b219b569c16db6027dd36e4656152f261321c60.zip
Merge branch 'master' into theme-resource
Diffstat (limited to 'src/ui/layout_base.cpp')
-rw-r--r--src/ui/layout_base.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/layout_base.cpp b/src/ui/layout_base.cpp
index a384500a..5363c52b 100644
--- a/src/ui/layout_base.cpp
+++ b/src/ui/layout_base.cpp
@@ -8,8 +8,10 @@ namespace cru::ui
{
LayoutManager* LayoutManager::GetInstance()
{
- static LayoutManager layout_manager;
- return &layout_manager;
+ return Application::GetInstance()->ResolveSingleton<LayoutManager>([](auto)
+ {
+ return new LayoutManager{};
+ });
}
void LayoutManager::InvalidateControlPositionCache(Control * control)