aboutsummaryrefslogtreecommitdiff
path: root/src/ui/controls
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2018-11-13 01:01:27 +0800
committercrupest <crupest@outlook.com>2018-11-13 01:01:27 +0800
commite158fcb47ea6a7bd9172d0751e38265b61d6c88c (patch)
tree1e142ae77ad824eeb87b634554d3f7159de442c9 /src/ui/controls
parent828a48aa387796ce89706ade69d0a6a3bf1e35a9 (diff)
downloadcru-e158fcb47ea6a7bd9172d0751e38265b61d6c88c.tar.gz
cru-e158fcb47ea6a7bd9172d0751e38265b61d6c88c.tar.bz2
cru-e158fcb47ea6a7bd9172d0751e38265b61d6c88c.zip
Dev code gen.
Diffstat (limited to 'src/ui/controls')
-rw-r--r--src/ui/controls/text_box.cpp6
-rw-r--r--src/ui/controls/text_control.cpp7
2 files changed, 1 insertions, 12 deletions
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<IDWriteFactory> 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<IDWriteFactory> GetDWriteFactory()
- {
- return graph::GraphManager::GetInstance()->GetDWriteFactory();
- }
-
TextControl::TextControl(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format,
const Microsoft::WRL::ComPtr<ID2D1Brush>& 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();