From b417df720584c101f3799874a0c836a543a8d0a8 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sun, 12 Oct 2008 14:55:10 +0000
Subject: user interface updates, work-in-progress

---
 src/ui/font.h | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'src/ui/font.h')

diff --git a/src/ui/font.h b/src/ui/font.h
index a68dec8..1261427 100644
--- a/src/ui/font.h
+++ b/src/ui/font.h
@@ -10,38 +10,47 @@
 #include <string>
 #include "math/vector2f.h"
 
-namespace ui {
+namespace ui
+{
 
 class Font
 {
 public:
 	Font(const char *name, const float width, const float height);
 	~Font();
-
-	inline std::string const & name() const { return font_name; }
-
-	inline math::Vector2f const & size() const { return font_size; }
-
-	inline float const width() const { return font_size.x; }
-
-	inline float const height() const { return font_size.y; }
-
+	
+	inline const std::string & name() const {
+		return font_name;
+	}
+	
+	inline const math::Vector2f & size() const {
+		return font_size;
+	}
+	
+	inline float width() const {
+		return font_size.x;
+	}
+	
+	inline float height() const {
+		return font_size.y;
+	}
+	
 	void set_size(const float width, const float height);
-
-	void set_size(math::Vector2f const &size);
-
-	void set_width(float width);
-
-	void set_height(float height);
-
+	
+	void set_size(const math::Vector2f &size);
+	
+	void set_width(const float width);
+	
+	void set_height(const float height);
+	
 	void set_name(const char *name);
-
-	void set_name(std::string const & name);
-
+	
+	void set_name(const std::string & name);
+	
 private:
 
 	std::string	font_name;
-
+	
 	math::Vector2f	font_size;
 };
 
-- 
cgit v1.2.3