From e158fcb47ea6a7bd9172d0751e38265b61d6c88c Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 13 Nov 2018 01:01:27 +0800 Subject: Dev code gen. --- src/ui/controls/text_box.cpp | 6 ------ src/ui/controls/text_control.cpp | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src') diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/text_box.cpp index fd357fdb..6eeb7abb 100644 --- a/src/ui/controls/text_box.cpp +++ b/src/ui/controls/text_box.cpp @@ -5,16 +5,10 @@ #include "graph/graph.hpp" #include "exception.hpp" -#include "application.hpp" #include "ui/ui_manager.hpp" namespace cru::ui::controls { - inline Microsoft::WRL::ComPtr GetDWriteFactory() - { - return graph::GraphManager::GetInstance()->GetDWriteFactory(); - } - TextBox::TextBox() : TextControl( UiManager::GetInstance()->GetPredefineResources()->text_box_text_format, UiManager::GetInstance()->GetPredefineResources()->text_box_text_brush diff --git a/src/ui/controls/text_control.cpp b/src/ui/controls/text_control.cpp index 974001b3..ff8346ee 100644 --- a/src/ui/controls/text_control.cpp +++ b/src/ui/controls/text_control.cpp @@ -9,11 +9,6 @@ namespace cru::ui::controls { - inline Microsoft::WRL::ComPtr GetDWriteFactory() - { - return graph::GraphManager::GetInstance()->GetDWriteFactory(); - } - TextControl::TextControl(const Microsoft::WRL::ComPtr& init_text_format, const Microsoft::WRL::ComPtr& init_brush) : Control(false) { @@ -216,7 +211,7 @@ namespace cru::ui::controls text_layout_ = nullptr; - const auto dwrite_factory = GetDWriteFactory(); + const auto dwrite_factory = graph::GraphManager::GetInstance()->GetDWriteFactory(); const auto&& size = GetSize(); -- cgit v1.2.3