Browse Source

SystemUI namespace

Josh Engebretson 10 years ago
parent
commit
8979523802
46 changed files with 259 additions and 7 deletions
  1. 5 0
      Source/Atomic/UI/SystemUI/BorderImage.cpp
  2. 5 0
      Source/Atomic/UI/SystemUI/BorderImage.h
  3. 6 0
      Source/Atomic/UI/SystemUI/Button.cpp
  4. 5 0
      Source/Atomic/UI/SystemUI/Button.h
  5. 5 0
      Source/Atomic/UI/SystemUI/CheckBox.cpp
  6. 6 0
      Source/Atomic/UI/SystemUI/CheckBox.h
  7. 5 0
      Source/Atomic/UI/SystemUI/Cursor.cpp
  8. 6 0
      Source/Atomic/UI/SystemUI/Cursor.h
  9. 5 0
      Source/Atomic/UI/SystemUI/DropDownList.cpp
  10. 5 0
      Source/Atomic/UI/SystemUI/DropDownList.h
  11. 6 0
      Source/Atomic/UI/SystemUI/Font.cpp
  12. 5 0
      Source/Atomic/UI/SystemUI/Font.h
  13. 6 0
      Source/Atomic/UI/SystemUI/FontFace.cpp
  14. 7 1
      Source/Atomic/UI/SystemUI/FontFace.h
  15. 6 0
      Source/Atomic/UI/SystemUI/FontFaceBitmap.cpp
  16. 6 0
      Source/Atomic/UI/SystemUI/FontFaceBitmap.h
  17. 6 0
      Source/Atomic/UI/SystemUI/FontFaceFreeType.cpp
  18. 7 1
      Source/Atomic/UI/SystemUI/FontFaceFreeType.h
  19. 6 0
      Source/Atomic/UI/SystemUI/LineEdit.cpp
  20. 5 0
      Source/Atomic/UI/SystemUI/LineEdit.h
  21. 6 0
      Source/Atomic/UI/SystemUI/ListView.cpp
  22. 6 0
      Source/Atomic/UI/SystemUI/ListView.h
  23. 5 0
      Source/Atomic/UI/SystemUI/Menu.cpp
  24. 6 0
      Source/Atomic/UI/SystemUI/Menu.h
  25. 6 0
      Source/Atomic/UI/SystemUI/MessageBox.cpp
  26. 7 1
      Source/Atomic/UI/SystemUI/MessageBox.h
  27. 6 0
      Source/Atomic/UI/SystemUI/ScrollBar.cpp
  28. 6 0
      Source/Atomic/UI/SystemUI/ScrollBar.h
  29. 5 0
      Source/Atomic/UI/SystemUI/ScrollView.cpp
  30. 6 0
      Source/Atomic/UI/SystemUI/ScrollView.h
  31. 5 0
      Source/Atomic/UI/SystemUI/Slider.cpp
  32. 5 0
      Source/Atomic/UI/SystemUI/Slider.h
  33. 5 0
      Source/Atomic/UI/SystemUI/Sprite.cpp
  34. 5 0
      Source/Atomic/UI/SystemUI/Sprite.h
  35. 5 0
      Source/Atomic/UI/SystemUI/Text.cpp
  36. 5 0
      Source/Atomic/UI/SystemUI/Text.h
  37. 5 0
      Source/Atomic/UI/SystemUI/ToolTip.cpp
  38. 5 0
      Source/Atomic/UI/SystemUI/ToolTip.h
  39. 5 0
      Source/Atomic/UI/SystemUI/UI.cpp
  40. 9 3
      Source/Atomic/UI/SystemUI/UI.h
  41. 5 0
      Source/Atomic/UI/SystemUI/UIBatch.cpp
  42. 6 0
      Source/Atomic/UI/SystemUI/UIBatch.h
  43. 5 0
      Source/Atomic/UI/SystemUI/UIElement.cpp
  44. 7 1
      Source/Atomic/UI/SystemUI/UIElement.h
  45. 5 0
      Source/Atomic/UI/SystemUI/Window.cpp
  46. 5 0
      Source/Atomic/UI/SystemUI/Window.h

+ 5 - 0
Source/Atomic/UI/SystemUI/BorderImage.cpp

@@ -30,6 +30,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 extern const char* blendModeNames[];
 extern const char* blendModeNames[];
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
 
 
@@ -209,3 +212,5 @@ ResourceRef BorderImage::GetTextureAttr() const
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/BorderImage.h

@@ -31,6 +31,9 @@ namespace Atomic
 class Texture;
 class Texture;
 class Texture2D;
 class Texture2D;
 
 
+namespace SystemUI
+{
+
 /// %Image %UI element with optional border.
 /// %Image %UI element with optional border.
 class ATOMIC_API BorderImage : public UIElement
 class ATOMIC_API BorderImage : public UIElement
 {
 {
@@ -114,3 +117,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/Button.cpp

@@ -31,6 +31,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+
+namespace SystemUI
+{
+
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
 
 
 Button::Button(Context* context) :
 Button::Button(Context* context) :
@@ -187,3 +191,5 @@ void Button::SetPressed(bool enable)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Button.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 /// Push button %UI element.
 /// Push button %UI element.
 class ATOMIC_API Button : public BorderImage
 class ATOMIC_API Button : public BorderImage
 {
 {
@@ -107,3 +110,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/CheckBox.cpp

@@ -31,6 +31,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
 
 
 CheckBox::CheckBox(Context* context) :
 CheckBox::CheckBox(Context* context) :
@@ -110,3 +113,5 @@ void CheckBox::SetCheckedOffset(int x, int y)
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/CheckBox.h

@@ -27,6 +27,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 /// %UI element that can be toggled between unchecked and checked state.
 /// %UI element that can be toggled between unchecked and checked state.
 class ATOMIC_API CheckBox : public BorderImage
 class ATOMIC_API CheckBox : public BorderImage
 {
 {
@@ -69,3 +73,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Cursor.cpp

@@ -32,6 +32,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 static const char* shapeNames[] =
 static const char* shapeNames[] =
 {
 {
     "Normal",
     "Normal",
@@ -305,3 +308,5 @@ void Cursor::HandleMouseVisibleChanged(StringHash eventType, VariantMap& eventDa
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/Cursor.h

@@ -31,6 +31,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 /// %Cursor shapes recognized by the UI subsystem.
 /// %Cursor shapes recognized by the UI subsystem.
 enum CursorShape
 enum CursorShape
 {
 {
@@ -143,3 +147,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/DropDownList.cpp

@@ -35,6 +35,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
 
 
 DropDownList::DropDownList(Context* context) :
 DropDownList::DropDownList(Context* context) :
@@ -339,3 +342,5 @@ void DropDownList::HandleListViewKey(StringHash eventType, VariantMap& eventData
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/DropDownList.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 class ListView;
 class ListView;
 
 
 /// %Menu %UI element that displays a popup list view.
 /// %Menu %UI element that displays a popup list view.
@@ -120,3 +123,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/Font.cpp

@@ -37,6 +37,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+
+namespace SystemUI
+{
+
 static const int MIN_POINT_SIZE = 1;
 static const int MIN_POINT_SIZE = 1;
 static const int MAX_POINT_SIZE = 96;
 static const int MAX_POINT_SIZE = 96;
 
 
@@ -228,3 +232,5 @@ FontFace* Font::GetFaceBitmap(int pointSize)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Font.h

@@ -28,6 +28,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 class FontFace;
 class FontFace;
 
 
 static const int FONT_TEXTURE_MIN_SIZE = 128;
 static const int FONT_TEXTURE_MIN_SIZE = 128;
@@ -107,3 +110,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/FontFace.cpp

@@ -32,6 +32,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 FontGlyph::FontGlyph() :
 FontGlyph::FontGlyph() :
     page_(M_MAX_UNSIGNED),
     page_(M_MAX_UNSIGNED),
     used_(false)
     used_(false)
@@ -122,3 +126,5 @@ SharedPtr<Texture2D> FontFace::LoadFaceTexture(SharedPtr<Image> image)
 }
 }
 
 
 }
 }
+
+}

+ 7 - 1
Source/Atomic/UI/SystemUI/FontFace.h

@@ -29,10 +29,14 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
-class Font;
 class Image;
 class Image;
 class Texture2D;
 class Texture2D;
 
 
+namespace SystemUI
+{
+
+class Font;
+
 /// %Font glyph description.
 /// %Font glyph description.
 struct FontGlyph
 struct FontGlyph
 {
 {
@@ -116,3 +120,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/FontFaceBitmap.cpp

@@ -37,6 +37,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 FontFaceBitmap::FontFaceBitmap(Font* font) :
 FontFaceBitmap::FontFaceBitmap(Font* font) :
     FontFace(font)
     FontFace(font)
 {
 {
@@ -383,3 +387,5 @@ void FontFaceBitmap::Blit(Image* dest, int x, int y, int width, int height, Imag
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/FontFaceBitmap.h

@@ -30,6 +30,10 @@ namespace Atomic
 class Image;
 class Image;
 class Serializer;
 class Serializer;
 
 
+namespace SystemUI
+{
+
+
 /// Bitmap font face description.
 /// Bitmap font face description.
 class ATOMIC_API FontFaceBitmap : public FontFace
 class ATOMIC_API FontFaceBitmap : public FontFace
 {
 {
@@ -60,3 +64,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/FontFaceFreeType.cpp

@@ -39,6 +39,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 /// FreeType library subsystem.
 /// FreeType library subsystem.
 class FreeTypeLibrary : public Object
 class FreeTypeLibrary : public Object
 {
 {
@@ -451,3 +455,5 @@ bool FontFaceFreeType::LoadCharGlyph(unsigned charCode, Image* image)
 }
 }
 
 
 }
 }
+
+}

+ 7 - 1
Source/Atomic/UI/SystemUI/FontFaceFreeType.h

@@ -27,9 +27,13 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
-class FreeTypeLibrary;
 class Texture2D;
 class Texture2D;
 
 
+namespace SystemUI
+{
+
+class FreeTypeLibrary;
+
 /// Free type font face description.
 /// Free type font face description.
 class ATOMIC_API FontFaceFreeType : public FontFace
 class ATOMIC_API FontFaceFreeType : public FontFace
 {
 {
@@ -70,3 +74,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/LineEdit.cpp

@@ -32,6 +32,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 StringHash VAR_DRAGDROPCONTENT("DragDropContent");
 StringHash VAR_DRAGDROPCONTENT("DragDropContent");
 
 
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
@@ -661,3 +665,5 @@ void LineEdit::HandleLayoutUpdated(StringHash eventType, VariantMap& eventData)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/LineEdit.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 class Font;
 class Font;
 class Text;
 class Text;
 
 
@@ -165,3 +168,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/ListView.cpp

@@ -34,6 +34,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 static const char* highlightModes[] =
 static const char* highlightModes[] =
 {
 {
     "Never",
     "Never",
@@ -1136,3 +1140,5 @@ void ListView::UpdateUIClickSubscription()
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/ListView.h

@@ -27,6 +27,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 /// %ListView selection highlight mode.
 /// %ListView selection highlight mode.
 enum HighlightMode
 enum HighlightMode
 {
 {
@@ -187,3 +191,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Menu.cpp

@@ -33,6 +33,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 const StringHash VAR_SHOW_POPUP("ShowPopup");
 const StringHash VAR_SHOW_POPUP("ShowPopup");
 extern StringHash VAR_ORIGIN;
 extern StringHash VAR_ORIGIN;
 
 
@@ -437,3 +440,5 @@ void Menu::HandleKeyDown(StringHash eventType, VariantMap& eventData)
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/Menu.h

@@ -27,6 +27,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 /// %Menu %UI element that optionally shows a popup.
 /// %Menu %UI element that optionally shows a popup.
 class ATOMIC_API Menu : public Button
 class ATOMIC_API Menu : public Button
 {
 {
@@ -109,3 +113,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/MessageBox.cpp

@@ -35,6 +35,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 MessageBox::MessageBox(Context* context, const String& messageString, const String& titleString, XMLFile* layoutFile,
 MessageBox::MessageBox(Context* context, const String& messageString, const String& titleString, XMLFile* layoutFile,
     XMLFile* styleFile) :
     XMLFile* styleFile) :
     Object(context),
     Object(context),
@@ -142,3 +146,5 @@ void MessageBox::HandleMessageAcknowledged(StringHash eventType, VariantMap& eve
 }
 }
 
 
 }
 }
+
+}

+ 7 - 1
Source/Atomic/UI/SystemUI/MessageBox.h

@@ -27,10 +27,14 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+class XMLFile;
+
+namespace SystemUI
+{
+
 class Button;
 class Button;
 class Text;
 class Text;
 class UIElement;
 class UIElement;
-class XMLFile;
 
 
 /// Message box dialog.
 /// Message box dialog.
 class ATOMIC_API MessageBox : public Object
 class ATOMIC_API MessageBox : public Object
@@ -74,3 +78,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/ScrollBar.cpp

@@ -30,6 +30,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
+
 static const float DEFAULT_SCROLL_STEP = 0.1f;
 static const float DEFAULT_SCROLL_STEP = 0.1f;
 static const float DEFAULT_REPEAT_DELAY = 0.4f;
 static const float DEFAULT_REPEAT_DELAY = 0.4f;
 static const float DEFAULT_REPEAT_RATE = 20.0f;
 static const float DEFAULT_REPEAT_RATE = 20.0f;
@@ -321,3 +325,5 @@ void ScrollBar::HandleSliderPaged(StringHash eventType, VariantMap& eventData)
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/ScrollBar.h

@@ -27,6 +27,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+
+namespace SystemUI
+{
+
 class Button;
 class Button;
 class Slider;
 class Slider;
 
 
@@ -129,3 +133,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/ScrollView.cpp

@@ -34,6 +34,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 static const float STEP_FACTOR = 300.0f;
 static const float STEP_FACTOR = 300.0f;
 
 
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
@@ -702,3 +705,5 @@ void ScrollView::ScrollSmooth(float timeStep)
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/ScrollView.h

@@ -27,6 +27,10 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+
+namespace SystemUI
+{
+
 class BorderImage;
 class BorderImage;
 class ScrollBar;
 class ScrollBar;
 
 
@@ -191,3 +195,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Slider.cpp

@@ -31,6 +31,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 const char* orientations[] =
 const char* orientations[] =
 {
 {
     "Horizontal",
     "Horizontal",
@@ -280,3 +283,5 @@ void Slider::Page(const IntVector2& position, bool pressed)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Slider.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 /// %Slider bar %UI element.
 /// %Slider bar %UI element.
 class ATOMIC_API Slider : public BorderImage
 class ATOMIC_API Slider : public BorderImage
 {
 {
@@ -119,3 +122,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Sprite.cpp

@@ -30,6 +30,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 extern const char* blendModeNames[];
 extern const char* blendModeNames[];
 extern const char* horizontalAlignments[];
 extern const char* horizontalAlignments[];
 extern const char* verticalAlignments[];
 extern const char* verticalAlignments[];
@@ -279,3 +282,5 @@ ResourceRef Sprite::GetTextureAttr() const
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Sprite.h

@@ -28,6 +28,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 /// %UI element which allows sub-pixel positioning and size, as well as rotation. Only other Sprites should be added as child elements.
 /// %UI element which allows sub-pixel positioning and size, as well as rotation. Only other Sprites should be added as child elements.
 class ATOMIC_API Sprite : public UIElement
 class ATOMIC_API Sprite : public UIElement
 {
 {
@@ -123,3 +126,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Text.cpp

@@ -36,6 +36,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 const char* textEffects[] =
 const char* textEffects[] =
 {
 {
     "None",
     "None",
@@ -763,3 +766,5 @@ void Text::ConstructBatch(UIBatch& pageBatch, const PODVector<GlyphLocation>& pa
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Text.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 static const int DEFAULT_FONT_SIZE = 12;
 static const int DEFAULT_FONT_SIZE = 12;
 
 
 class Font;
 class Font;
@@ -261,3 +264,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/ToolTip.cpp

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
 
 
 ToolTip::ToolTip(Context* context) :
 ToolTip::ToolTip(Context* context) :
@@ -106,3 +109,5 @@ void ToolTip::SetDelay(float delay)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/ToolTip.h

@@ -28,6 +28,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 /// Tooltip %UI element.
 /// Tooltip %UI element.
 class ATOMIC_API ToolTip : public UIElement
 class ATOMIC_API ToolTip : public UIElement
 {
 {
@@ -64,3 +67,5 @@ private:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/UI.cpp

@@ -60,6 +60,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 StringHash VAR_ORIGIN("Origin");
 StringHash VAR_ORIGIN("Origin");
 const StringHash VAR_ORIGINAL_PARENT("OriginalParent");
 const StringHash VAR_ORIGINAL_PARENT("OriginalParent");
 const StringHash VAR_ORIGINAL_CHILD_INDEX("OriginalChildIndex");
 const StringHash VAR_ORIGINAL_CHILD_INDEX("OriginalChildIndex");
@@ -1786,3 +1789,5 @@ void RegisterUILibrary(Context* context)
 }
 }
 
 
 }
 }
+
+}

+ 9 - 3
Source/Atomic/UI/SystemUI/UI.h

@@ -29,16 +29,20 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
-class Cursor;
 class Graphics;
 class Graphics;
 class ResourceCache;
 class ResourceCache;
 class Timer;
 class Timer;
-class UIBatch;
-class UIElement;
 class VertexBuffer;
 class VertexBuffer;
 class XMLElement;
 class XMLElement;
 class XMLFile;
 class XMLFile;
 
 
+namespace SystemUI
+{
+
+class Cursor;
+class UIBatch;
+class UIElement;
+
 /// %UI subsystem. Manages the graphical user interface.
 /// %UI subsystem. Manages the graphical user interface.
 class ATOMIC_API UI : public Object
 class ATOMIC_API UI : public Object
 {
 {
@@ -337,3 +341,5 @@ private:
 void ATOMIC_API RegisterUILibrary(Context* context);
 void ATOMIC_API RegisterUILibrary(Context* context);
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/UIBatch.cpp

@@ -29,6 +29,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 Vector3 UIBatch::posAdjust(0.0f, 0.0f, 0.0f);
 Vector3 UIBatch::posAdjust(0.0f, 0.0f, 0.0f);
 
 
 UIBatch::UIBatch() :
 UIBatch::UIBatch() :
@@ -327,3 +330,5 @@ void UIBatch::AddOrMerge(const UIBatch& batch, PODVector<UIBatch>& batches)
 }
 }
 
 
 }
 }
+
+}

+ 6 - 0
Source/Atomic/UI/SystemUI/UIBatch.h

@@ -33,6 +33,10 @@ class PixelShader;
 class Graphics;
 class Graphics;
 class Matrix3x4;
 class Matrix3x4;
 class Texture;
 class Texture;
+
+namespace SystemUI
+{
+
 class UIElement;
 class UIElement;
 
 
 static const unsigned UI_VERTEX_SIZE = 6;
 static const unsigned UI_VERTEX_SIZE = 6;
@@ -91,3 +95,5 @@ public:
 };
 };
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/UIElement.cpp

@@ -37,6 +37,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 const char* horizontalAlignments[] =
 const char* horizontalAlignments[] =
 {
 {
     "Left",
     "Left",
@@ -2027,3 +2030,5 @@ void UIElement::HandlePostUpdate(StringHash eventType, VariantMap& eventData)
 }
 }
 
 
 }
 }
+
+}

+ 7 - 1
Source/Atomic/UI/SystemUI/UIElement.h

@@ -30,6 +30,11 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+class ResourceCache;
+
+namespace SystemUI
+{
+
 /// %UI element horizontal alignment.
 /// %UI element horizontal alignment.
 enum HorizontalAlignment
 enum HorizontalAlignment
 {
 {
@@ -106,7 +111,6 @@ static const unsigned DD_TARGET = 0x2;
 static const unsigned DD_SOURCE_AND_TARGET = 0x3;
 static const unsigned DD_SOURCE_AND_TARGET = 0x3;
 
 
 class Cursor;
 class Cursor;
-class ResourceCache;
 
 
 /// Base class for %UI elements.
 /// Base class for %UI elements.
 class ATOMIC_API UIElement : public Animatable
 class ATOMIC_API UIElement : public Animatable
@@ -714,3 +718,5 @@ template <class T> T* UIElement::CreateChild(const String& name, unsigned index)
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Window.cpp

@@ -32,6 +32,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 static const int DEFAULT_RESIZE_BORDER = 4;
 static const int DEFAULT_RESIZE_BORDER = 4;
 
 
 extern const char* UI_CATEGORY;
 extern const char* UI_CATEGORY;
@@ -420,3 +423,5 @@ bool Window::CheckAlignment() const
 }
 }
 
 
 }
 }
+
+}

+ 5 - 0
Source/Atomic/UI/SystemUI/Window.h

@@ -27,6 +27,9 @@
 namespace Atomic
 namespace Atomic
 {
 {
 
 
+namespace SystemUI
+{
+
 /// %Window movement and resizing modes.
 /// %Window movement and resizing modes.
 enum WindowDragMode
 enum WindowDragMode
 {
 {
@@ -166,3 +169,5 @@ protected:
 };
 };
 
 
 }
 }
+
+}