From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 18 Aug 2009 09:24:15 +0000 Subject: astyle cleanup, corrects not loading of material textures --- src/client/chat.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/client/chat.h') diff --git a/src/client/chat.h b/src/client/chat.h index b7e1691..41837c5 100644 --- a/src/client/chat.h +++ b/src/client/chat.h @@ -1,7 +1,7 @@ /* client/chat.h - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #ifndef __INCLUDED_CLIENT_CHAT_H__ @@ -14,7 +14,8 @@ #include "ui/scrollpane.h" #include "ui/window.h" -namespace client { +namespace client +{ class Chat : public ui::Window { @@ -26,19 +27,21 @@ public: void toggle(); void event_text(const std::string & text); - - inline bool small_view() const { return chat_small; } - - void set_small_view(bool small_view=true); + + inline bool small_view() const { + return chat_small; + } + + void set_small_view(bool small_view = true); void clear(); protected: virtual void event_draw(); virtual void resize(); - + virtual bool on_keypress(const int key, const unsigned int modifier); - + private: bool chat_small; @@ -46,9 +49,9 @@ private: ui::Text chat_log; ui::ScrollPane *chat_scrollpane; ui::InputBox *chat_input; - + typedef std::deque History; - + History history; History::reverse_iterator history_pos; }; -- cgit v1.2.3