From d86a71f79afe0e4dac768f61d6bff690567aca5b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 24 May 2020 01:40:02 +0800
Subject: ...

---
 include/cru/platform/graph/TextLayout.hpp   | 23 +++++++++++++++++++++++
 include/cru/platform/graph/base.hpp         |  6 +++---
 include/cru/platform/graph/brush.hpp        |  2 +-
 include/cru/platform/graph/factory.hpp      | 10 +++++-----
 include/cru/platform/graph/font.hpp         |  2 +-
 include/cru/platform/graph/geometry.hpp     |  2 +-
 include/cru/platform/graph/painter.hpp      |  2 +-
 include/cru/platform/graph/resource.hpp     |  2 +-
 include/cru/platform/graph/text_layout.hpp  | 23 -----------------------
 include/cru/platform/graph/util/painter.hpp |  2 +-
 10 files changed, 37 insertions(+), 37 deletions(-)
 create mode 100644 include/cru/platform/graph/TextLayout.hpp
 delete mode 100644 include/cru/platform/graph/text_layout.hpp

(limited to 'include/cru/platform/graph')

diff --git a/include/cru/platform/graph/TextLayout.hpp b/include/cru/platform/graph/TextLayout.hpp
new file mode 100644
index 00000000..4086ac56
--- /dev/null
+++ b/include/cru/platform/graph/TextLayout.hpp
@@ -0,0 +1,23 @@
+#pragma once
+#include "Resource.hpp"
+
+#include <string>
+#include <vector>
+
+namespace cru::platform::graph {
+struct ITextLayout : virtual IGraphResource {
+  virtual std::string GetText() = 0;
+  virtual void SetText(std::string new_text) = 0;
+
+  virtual std::shared_ptr<IFont> GetFont() = 0;
+  virtual void SetFont(std::shared_ptr<IFont> font) = 0;
+
+  virtual void SetMaxWidth(float max_width) = 0;
+  virtual void SetMaxHeight(float max_height) = 0;
+
+  virtual Rect GetTextBounds() = 0;
+  virtual std::vector<Rect> TextRangeRect(const TextRange& text_range) = 0;
+  virtual Point TextSinglePoint(gsl::index position, bool trailing) = 0;
+  virtual TextHitTestResult HitTest(const Point& point) = 0;
+};
+}  // namespace cru::platform::graph
diff --git a/include/cru/platform/graph/base.hpp b/include/cru/platform/graph/base.hpp
index 002c2f51..61cfc5ef 100644
--- a/include/cru/platform/graph/base.hpp
+++ b/include/cru/platform/graph/base.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../graph_base.hpp"
-#include "../matrix.hpp"
-#include "../resource.hpp"
+#include "../GraphBase.hpp"
+#include "../Matrix.hpp"
+#include "../Resource.hpp"
 
 #include <memory>
 
diff --git a/include/cru/platform/graph/brush.hpp b/include/cru/platform/graph/brush.hpp
index af7a1dec..e67384de 100644
--- a/include/cru/platform/graph/brush.hpp
+++ b/include/cru/platform/graph/brush.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "resource.hpp"
+#include "Resource.hpp"
 
 namespace cru::platform::graph {
 struct IBrush : virtual IGraphResource {};
diff --git a/include/cru/platform/graph/factory.hpp b/include/cru/platform/graph/factory.hpp
index 0ed45161..0a425d15 100644
--- a/include/cru/platform/graph/factory.hpp
+++ b/include/cru/platform/graph/factory.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "resource.hpp"
+#include "Resource.hpp"
 
-#include "brush.hpp"
-#include "font.hpp"
-#include "geometry.hpp"
-#include "text_layout.hpp"
+#include "Brush.hpp"
+#include "Font.hpp"
+#include "Geometry.hpp"
+#include "TextLayout.hpp"
 
 #include <string>
 #include <string_view>
diff --git a/include/cru/platform/graph/font.hpp b/include/cru/platform/graph/font.hpp
index d0aa2d28..182cc15b 100644
--- a/include/cru/platform/graph/font.hpp
+++ b/include/cru/platform/graph/font.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "resource.hpp"
+#include "Resource.hpp"
 
 namespace cru::platform::graph {
 struct IFont : virtual IGraphResource {
diff --git a/include/cru/platform/graph/geometry.hpp b/include/cru/platform/graph/geometry.hpp
index 85ffd3f6..354efd97 100644
--- a/include/cru/platform/graph/geometry.hpp
+++ b/include/cru/platform/graph/geometry.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "resource.hpp"
+#include "Resource.hpp"
 
 namespace cru::platform::graph {
 struct IGeometry : virtual IGraphResource {
diff --git a/include/cru/platform/graph/painter.hpp b/include/cru/platform/graph/painter.hpp
index b6eb5452..27ae420b 100644
--- a/include/cru/platform/graph/painter.hpp
+++ b/include/cru/platform/graph/painter.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "resource.hpp"
+#include "Resource.hpp"
 
 namespace cru::platform::graph {
 
diff --git a/include/cru/platform/graph/resource.hpp b/include/cru/platform/graph/resource.hpp
index 255865eb..8859360c 100644
--- a/include/cru/platform/graph/resource.hpp
+++ b/include/cru/platform/graph/resource.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "base.hpp"
+#include "Base.hpp"
 
 namespace cru::platform::graph {
 struct IGraphFactory;
diff --git a/include/cru/platform/graph/text_layout.hpp b/include/cru/platform/graph/text_layout.hpp
deleted file mode 100644
index d91834c0..00000000
--- a/include/cru/platform/graph/text_layout.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-#include "resource.hpp"
-
-#include <string>
-#include <vector>
-
-namespace cru::platform::graph {
-struct ITextLayout : virtual IGraphResource {
-  virtual std::string GetText() = 0;
-  virtual void SetText(std::string new_text) = 0;
-
-  virtual std::shared_ptr<IFont> GetFont() = 0;
-  virtual void SetFont(std::shared_ptr<IFont> font) = 0;
-
-  virtual void SetMaxWidth(float max_width) = 0;
-  virtual void SetMaxHeight(float max_height) = 0;
-
-  virtual Rect GetTextBounds() = 0;
-  virtual std::vector<Rect> TextRangeRect(const TextRange& text_range) = 0;
-  virtual Point TextSinglePoint(gsl::index position, bool trailing) = 0;
-  virtual TextHitTestResult HitTest(const Point& point) = 0;
-};
-}  // namespace cru::platform::graph
diff --git a/include/cru/platform/graph/util/painter.hpp b/include/cru/platform/graph/util/painter.hpp
index 72d96bc1..f9aec027 100644
--- a/include/cru/platform/graph/util/painter.hpp
+++ b/include/cru/platform/graph/util/painter.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../painter.hpp"
+#include "../Painter.hpp"
 
 #include <functional>
 #include <type_traits>
-- 
cgit v1.2.3