diff --git a/include/eepp/ui/tools/textureatlaseditor.hpp b/include/eepp/ui/tools/textureatlaseditor.hpp index dd59b54c2..e98b91dc6 100644 --- a/include/eepp/ui/tools/textureatlaseditor.hpp +++ b/include/eepp/ui/tools/textureatlaseditor.hpp @@ -22,15 +22,15 @@ class EE_API TextureAtlasEditor { virtual ~TextureAtlasEditor(); - UISpinBox * SpinOffX() const { return mSpinOffX; } + UISpinBox * spinOffX() const { return mSpinOffX; } - UISpinBox * SpinOffY() const { return mSpinOffY; } + UISpinBox * spinOffY() const { return mSpinOffY; } protected: class UITGEUpdater : public UIControl { public: UITGEUpdater( const CreateParams& Params, TextureAtlasEditor * TGEditor ) : UIControl( Params ), mTGEditor( TGEditor ) {} - virtual void Update() { mTGEditor->Update(); } + virtual void update() { mTGEditor->update(); } protected: TextureAtlasEditor * mTGEditor; }; @@ -52,49 +52,49 @@ class EE_API TextureAtlasEditor { TextureAtlasSubTextureEditor * mSubTextureEditor; UITGEUpdater * mTGEU; - void WindowClose( const UIEvent * Event ); + void windowClose( const UIEvent * Event ); - void CreateTGEditor(); + void createTGEditor(); - void CreateWinMenu(); + void createWinMenu(); - void FileMenuClick( const UIEvent * Event ); + void fileMenuClick( const UIEvent * Event ); - void OnTextureAtlasCreate( TexturePacker * TexPacker ); + void onTextureAtlasCreate( TexturePacker * TexPacker ); - void OpenTextureAtlas( const UIEvent * Event ); + void openTextureAtlas( const UIEvent * Event ); - void SaveTextureAtlas( const UIEvent * Event ); + void saveTextureAtlas( const UIEvent * Event ); - void OnTextureAtlasClose( const UIEvent * Event ); + void onTextureAtlasClose( const UIEvent * Event ); - void OnSubTextureChange( const UIEvent * Event ); + void onSubTextureChange( const UIEvent * Event ); - UITextBox * CreateTxtBox( Vector2i Pos, const String& Text ); + UITextBox * createTextBox( Vector2i Pos, const String& Text ); - void UpdateControls(); + void updateControls(); - void FillSubTextureList(); + void fillSubTextureList(); - void OnOffXChange( const UIEvent * Event ); + void onOffXChange( const UIEvent * Event ); - void OnOffYChange( const UIEvent * Event ); + void onOffYChange( const UIEvent * Event ); - void OnDestWChange( const UIEvent * Event ); + void onDestWChange( const UIEvent * Event ); - void OnDestHChange( const UIEvent * Event ); + void onDestHChange( const UIEvent * Event ); - void OnResetDestSize( const UIEvent * Event ); + void onResetDestSize( const UIEvent * Event ); - void OnResetOffset( const UIEvent * Event ); + void onResetOffset( const UIEvent * Event ); - void OnCenterOffset( const UIEvent * Event ); + void onCenterOffset( const UIEvent * Event ); - void OnHBOffset( const UIEvent * Event ); + void onHBOffset( const UIEvent * Event ); - void OnTextureAtlasLoaded( TextureAtlasLoader * TGLoader ); + void onTextureAtlasLoaded( TextureAtlasLoader * TGLoader ); - void Update(); + void update(); }; }}} diff --git a/include/eepp/ui/uibackground.hpp b/include/eepp/ui/uibackground.hpp index 245c75e48..d42506e2a 100644 --- a/include/eepp/ui/uibackground.hpp +++ b/include/eepp/ui/uibackground.hpp @@ -8,25 +8,26 @@ namespace EE { namespace UI { class EE_API UIBackground { public: UIBackground(); - UIBackground( const ColorA& Color, const unsigned int& Corners = 0, const EE_BLEND_MODE& BlendMode = ALPHA_NORMAL ); + UIBackground( const ColorA& color, const unsigned int& corners = 0, const EE_BLEND_MODE& BlendMode = ALPHA_NORMAL ); UIBackground( const UIBackground& Back ); - UIBackground( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor, const unsigned int& Corners, const EE_BLEND_MODE& BlendMode ); + UIBackground( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor, const unsigned int& corners, const EE_BLEND_MODE& BlendMode ); - ColorA& Color( const unsigned int& index = 0 ); + ColorA& color( const unsigned int& index = 0 ); - void Color( const ColorA& Col ); + void color( const ColorA& Col ); - const std::vector& Colors(); + const std::vector& colors(); - void Colors( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor ); + void colors( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor ); - void ColorsTo( const ColorA& Color ); + void colorsTo( const ColorA& color ); - const EE_BLEND_MODE& Blend() const; - void Blend( const EE_BLEND_MODE& blend ); + const EE_BLEND_MODE& blend() const; - const unsigned int& Corners() const; - void Corners( const unsigned int& corners ); + void blend( const EE_BLEND_MODE& blend ); + + const unsigned int& corners() const; + void corners( const unsigned int& corners ); protected: std::vector mColor; diff --git a/include/eepp/ui/uiborder.hpp b/include/eepp/ui/uiborder.hpp index caa6b3d47..52cd10cfd 100644 --- a/include/eepp/ui/uiborder.hpp +++ b/include/eepp/ui/uiborder.hpp @@ -10,11 +10,11 @@ class EE_API UIBorder { UIBorder(); UIBorder( const UIBorder& border ); - const ColorA& Color() const; - void Color( const ColorA& Col ); + const ColorA& color() const; + void color( const ColorA& Col ); - const unsigned int& Width() const; - void Width( const unsigned int& width ); + const unsigned int& width() const; + void width( const unsigned int& width ); protected: ColorA mColor; unsigned int mWidth; diff --git a/include/eepp/ui/uicheckbox.hpp b/include/eepp/ui/uicheckbox.hpp index d84e885eb..b02ad408e 100644 --- a/include/eepp/ui/uicheckbox.hpp +++ b/include/eepp/ui/uicheckbox.hpp @@ -12,42 +12,42 @@ class EE_API UICheckBox : public UITextBox { virtual ~UICheckBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - const bool& IsActive() const; + const bool& isActive() const; - void Active( const bool& active ); + void active( const bool& active ); - const bool& Active() const; + const bool& active() const; - virtual void Padding( const Recti& padding ); + virtual void padding( const Recti& padding ); - UIControlAnim * ActiveButton() const; + UIControlAnim * activeButton() const; - UIControlAnim * InactiveButton() const; + UIControlAnim * inactiveButton() const; protected: UIControlAnim * mActiveButton; UIControlAnim * mInactiveButton; bool mActive; Uint32 mLastTick; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void SwitchState(); + void switchState(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnKeyDown( const UIEventKey& Event ); + virtual Uint32 onKeyDown( const UIEventKey& Event ); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - void DoAfterSetTheme(); + void doAftersetTheme(); - virtual void AutoSize(); + virtual void autoSize(); }; }} diff --git a/include/eepp/ui/uicombobox.hpp b/include/eepp/ui/uicombobox.hpp index a1d7fd8f9..0205b2c24 100644 --- a/include/eepp/ui/uicombobox.hpp +++ b/include/eepp/ui/uicombobox.hpp @@ -11,25 +11,25 @@ class EE_API UIComboBox : public UIDropDownList { virtual ~UIComboBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); protected: UIControl * mButton; - void OnButtonClick( const UIEvent * Event ); + void onButtonClick( const UIEvent * Event ); - void OnButtonEnter( const UIEvent * Event ); + void onButtonEnter( const UIEvent * Event ); - void OnButtonExit( const UIEvent * Event ); + void onButtonExit( const UIEvent * Event ); - Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - void CreateButton(); + void createButton(); - virtual void OnControlClear( const UIEvent *Event ); + virtual void onControlClear( const UIEvent *Event ); }; }} diff --git a/include/eepp/ui/uicommondialog.hpp b/include/eepp/ui/uicommondialog.hpp index 76504a6cf..f4e761562 100644 --- a/include/eepp/ui/uicommondialog.hpp +++ b/include/eepp/ui/uicommondialog.hpp @@ -34,55 +34,55 @@ class EE_API UICommonDialog : public UIWindow { virtual ~UICommonDialog(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void RefreshFolder(); + void refreshFolder(); - virtual Uint32 OnMessage( const UIMessage *Msg ); + virtual Uint32 onMessage( const UIMessage *Msg ); - virtual void Open(); + virtual void open(); - virtual void Save(); + virtual void save(); - std::string GetCurPath() const; + std::string getCurPath() const; - std::string GetCurFile() const; + std::string getCurFile() const; - std::string GetFullPath(); + std::string getFullPath(); - UIPushButton * GetButtonOpen() const; + UIPushButton * getButtonOpen() const; - UIPushButton * GetButtonCancel() const; + UIPushButton * getButtonCancel() const; - UIPushButton * GetButtonUp() const; + UIPushButton * getButtonUp() const; - UIListBox * GetList() const; + UIListBox * getList() const; - UITextInput * GetPathInput() const; + UITextInput * getPathInput() const; - UITextInput * GetFileInput() const; + UITextInput * getFileInput() const; - UIDropDownList * GetFiletypeList() const; + UIDropDownList * getFiletypeList() const; - void AddFilePattern( std::string pattern, bool select = false ); + void addFilePattern( std::string pattern, bool select = false ); - bool IsSaveDialog(); + bool isSaveDialog(); - bool SortAlphabetically(); + bool sortAlphabetically(); - bool FoldersFirst(); + bool foldersFirst(); - bool AllowFolderSelect(); + bool allowFolderSelect(); - void SortAlphabetically( const bool& sortAlphabetically ); + void sortAlphabetically( const bool& sortAlphabetically ); - void FoldersFirst( const bool& foldersFirst ); + void foldersFirst( const bool& foldersFirst ); - void AllowFolderSelect( const bool& allowFolderSelect ); + void allowFolderSelect( const bool& allowFolderSelect ); protected: std::string mCurPath; UIPushButton * mButtonOpen; @@ -94,15 +94,15 @@ class EE_API UICommonDialog : public UIWindow { UIDropDownList * mFiletype; Uint32 mCDLFlags; - void OnPressEnter( const UIEvent * Event ); + void onPressEnter( const UIEvent * Event ); - void OnPressFileEnter( const UIEvent * Event ); + void onPressFileEnter( const UIEvent * Event ); - void OpenSaveClick(); + void openSaveClick(); - std::string GetTempFullPath(); + std::string getTempFullPath(); - void DisableButtons(); + void disableButtons(); }; }} diff --git a/include/eepp/ui/uicomplexcontrol.hpp b/include/eepp/ui/uicomplexcontrol.hpp index 701b19dcc..27bf76496 100644 --- a/include/eepp/ui/uicomplexcontrol.hpp +++ b/include/eepp/ui/uicomplexcontrol.hpp @@ -41,35 +41,35 @@ class EE_API UIComplexControl : public UIControlAnim { virtual ~UIComplexControl(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Update(); + virtual void update(); - virtual void Size( const Sizei &Size ); + virtual void size( const Sizei &size ); - void Size( const Int32& Width, const Int32& Height ); + void size( const Int32& Width, const Int32& Height ); - const Sizei& Size(); + const Sizei& size(); - UITooltip * Tooltip(); + UITooltip * getTooltip(); - void TooltipRemove(); + void tooltipRemove(); - void TooltipText( const String& Text ); + void tooltipText( const String& Text ); - String TooltipText(); + String tooltipText(); - void UpdateAnchorsDistances(); + void updateAnchorsDistances(); protected: UITooltip * mTooltip; Sizei mMinControlSize; Recti mDistToBorder; - void CreateTooltip(); + void createTooltip(); - virtual void OnParentSizeChange( const Vector2i& SizeChange ); + virtual void onParentSizeChange( const Vector2i& SizeChange ); }; }} diff --git a/include/eepp/ui/uicontrol.hpp b/include/eepp/ui/uicontrol.hpp index 373ec9712..19d58bf79 100644 --- a/include/eepp/ui/uicontrol.hpp +++ b/include/eepp/ui/uicontrol.hpp @@ -74,172 +74,172 @@ class EE_API UIControl { virtual ~UIControl(); - void ScreenToControl( Vector2i& Pos ) const; + void screenToControl( Vector2i& position ) const; - void ControlToScreen( Vector2i& Pos ) const; + void controlToScreen( Vector2i& position ) const; - void WorldToControl( Vector2i& pos ) const; + void worldToControl( Vector2i& pos ) const; - void ControlToWorld( Vector2i& pos ) const; + void controlToWorld( Vector2i& pos ) const; - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void MessagePost( const UIMessage * Msg ); + virtual void messagePost( const UIMessage * Msg ); - bool IsInside( const Vector2i& Pos ) const; + bool isInside( const Vector2i& position ) const; - void Pos( const Vector2i& Pos ); + void position( const Vector2i& position ); - void Pos( const Int32& x, const Int32& y ); + void position( const Int32& x, const Int32& y ); - const Vector2i& Pos() const; + const Vector2i& position() const; - virtual void Size( const Sizei& Size ); + virtual void size( const Sizei& size ); - void Size( const Int32& Width, const Int32& Height ); + void size( const Int32& Width, const Int32& Height ); - const Sizei& Size(); + const Sizei& size(); - Recti Rect() const; + Recti getRect() const; - void Visible( const bool& visible ); + void visible( const bool& visible ); - bool Visible() const; + bool visible() const; - bool Hided() const; + bool isHided() const; - void Enabled( const bool& enabled ); + void enabled( const bool& enabled ); - bool Enabled() const; + bool enabled() const; - bool Disabled() const; + bool isDisabled() const; - UIControl * Parent() const; + UIControl * parent() const; - void Parent( UIControl * parent ); + void parent( UIControl * parent ); - void CenterHorizontal(); + void centerHorizontal(); - void CenterVertical(); + void centerVertical(); - void Center(); + void center(); - virtual void Close(); + virtual void close(); - virtual void Draw(); + virtual void draw(); - virtual void Update(); + virtual void update(); - Uint32 HAlign() const; + Uint32 hAlign() const; - void HAlign( Uint32 halign ); + void hAlign( Uint32 halign ); - Uint32 VAlign() const; + Uint32 vAlign() const; - void VAlign( Uint32 valign ); + void vAlign( Uint32 valign ); - void FillBackground( bool enabled ); + void fillBackground( bool enabled ); - void Border( bool enabled ); + void border( bool enabled ); - UIControl * NextGet() const; + UIControl * nextGet() const; - UIControl * PrevGet() const; + UIControl * prevGet() const; - UIControl * NextGetLoop() const; + UIControl * nextGetLoop() const; - void Data( const UintPtr& data ); + void data( const UintPtr& data ); - const UintPtr& Data() const; + const UintPtr& data() const; - UIControl * ChildGetAt( Vector2i CtrlPos, unsigned int RecursiveLevel = 0 ); + UIControl * childGetAt( Vector2i CtrlPos, unsigned int RecursiveLevel = 0 ); - const Uint32& Flags() const; + const Uint32& flags() const; - void Flags( const Uint32& flags ); + void flags( const Uint32& flags ); - void Blend( const EE_BLEND_MODE& blend ); + void blend( const EE_BLEND_MODE& blend ); - EE_BLEND_MODE Blend(); + EE_BLEND_MODE blend(); - void ToFront(); + void toFront(); - void ToBack(); + void toBack(); - void ToPos( const Uint32& Pos ); + void toPos( const Uint32& position ); - const Uint32& ControlFlags() const; + const Uint32& controlFlags() const; /** Use it at your own risk */ - void ControlFlags( const Uint32& Flags ); + void controlFlags( const Uint32& flags ); - Uint32 IsAnimated(); + Uint32 isAnimated(); - Uint32 IsDragable(); + Uint32 isDragable(); - Uint32 IsComplex(); + Uint32 isComplex(); - Uint32 IsClipped(); + Uint32 isClipped(); - Uint32 AddEventListener( const Uint32& EventType, const UIEventCallback& Callback ); + Uint32 addEventListener( const Uint32& EventType, const UIEventCallback& Callback ); - void RemoveEventListener( const Uint32& CallbackId ); + void removeEventListener( const Uint32& CallbackId ); - UIBackground * Background(); + UIBackground * background(); - UIBorder * Border(); + UIBorder * border(); - void SetThemeByName( const std::string& Theme ); + void setThemeByName( const std::string& Theme ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void SetThemeControl( UITheme * Theme, const std::string& ControlName ); + void setThemeControl( UITheme * Theme, const std::string& ControlName ); - void SetThemeToChilds( UITheme * Theme ); + void setThemeToChilds( UITheme * Theme ); - UISkin * GetSkin(); + UISkin * getSkin(); - void SetSkinFromTheme( UITheme * Theme, const std::string& ControlName ); + void setSkinFromTheme( UITheme * Theme, const std::string& ControlName ); - virtual void SetSkin( const UISkin& Skin ); + virtual void setSkin( const UISkin& Skin ); - UIControl * ChildGetFirst() const; + UIControl * childGetFirst() const; - UIControl * ChildGetLast() const; + UIControl * childGetLast() const; - bool IsMouseOver(); + bool isMouseOver(); - bool IsMouseOverMeOrChilds(); + bool isMouseOverMeOrChilds(); - Polygon2f &GetPolygon(); + Polygon2f &getPolygon(); - const Vector2f& GetPolygonCenter() const; + const Vector2f& getPolygonCenter() const; - void SetSkinState( const Uint32& State ); + void setSkinState( const Uint32& State ); - bool HasFocus() const; + bool hasFocus() const; - virtual void SetFocus(); + virtual void setFocus(); - bool IsParentOf( UIControl * Ctrl ); + bool isParentOf( UIControl * Ctrl ); - void SendEvent( const UIEvent * Event ); + void sendEvent( const UIEvent * Event ); - void SendMouseEvent( const Uint32& Event, const Vector2i& Pos, const Uint32& Flags ); + void sendMouseEvent( const Uint32& Event, const Vector2i& position, const Uint32& flags ); - void SendCommonEvent( const Uint32& Event ); + void sendCommonEvent( const Uint32& Event ); - Sizei GetSkinSize(); + Sizei getSkinSize(); - UIControl * NextComplexControl(); + UIControl * nextComplexControl(); - void ApplyDefaultTheme(); + void applyDefaultTheme(); - Recti GetScreenRect(); + Recti getScreenRect(); - void ChildsCloseAll(); + void childsCloseAll(); protected: typedef std::map< Uint32, std::map > UIEventsMap; friend class UIManager; @@ -275,117 +275,117 @@ class EE_API UIControl { bool mVisible; bool mEnabled; - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual Uint32 OnKeyDown( const UIEventKey& Event ); + virtual Uint32 onKeyDown( const UIEventKey& Event ); - virtual Uint32 OnKeyUp( const UIEventKey& Event ); + virtual Uint32 onKeyUp( const UIEventKey& Event ); - virtual Uint32 OnMouseMove( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseMove( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseDown( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDown( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDoubleClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseUp( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseUp( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseEnter( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseEnter( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseExit( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseExit( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnFocus(); + virtual Uint32 onFocus(); - virtual Uint32 OnFocusLoss(); + virtual Uint32 onFocusLoss(); - virtual void OnClose(); + virtual void onClose(); - virtual Uint32 OnValueChange(); + virtual Uint32 onValueChange(); - virtual void OnVisibleChange(); + virtual void onVisibleChange(); - virtual void OnEnabledChange(); + virtual void onEnabledChange(); - virtual void OnPosChange(); + virtual void onPositionChange(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void OnParentSizeChange( const Vector2i& SizeChange ); + virtual void onParentSizeChange( const Vector2i& SizeChange ); - virtual void OnStateChange(); + virtual void onStateChange(); - virtual void OnComplexControlFocusLoss(); + virtual void onComplexControlFocusLoss(); - virtual void BackgroundDraw(); + virtual void backgroundDraw(); - virtual void BorderDraw(); + virtual void borderDraw(); - virtual void UpdateQuad(); + virtual void updateQuad(); - virtual void UpdateCenter(); + virtual void updateCenter(); - virtual void MatrixSet(); + virtual void matrixSet(); - virtual void MatrixUnset(); + virtual void matrixUnset(); - virtual void DrawChilds(); + virtual void drawChilds(); - virtual void DoAfterSetTheme(); + virtual void doAftersetTheme(); - virtual UIControl * OverFind( const Vector2f& Point ); + virtual UIControl * overFind( const Vector2f& Point ); - void ClipMe(); + void clipMe(); - void CheckClose(); + void checkClose(); - void InternalDraw(); + void internalDraw(); - void ChildDeleteAll(); + void childDeleteAll(); - void ChildAdd( UIControl * ChildCtrl ); + void childAdd( UIControl * ChildCtrl ); - void ChildAddAt( UIControl * ChildCtrl, Uint32 Pos ); + void childAddAt( UIControl * ChildCtrl, Uint32 position ); - void ChildRemove( UIControl * ChildCtrl ); + void childRemove( UIControl * ChildCtrl ); - bool IsChild( UIControl * ChildCtrl ) const; + bool isChild( UIControl * ChildCtrl ) const; - bool InParentTreeOf( UIControl * Child ) const; + bool inParentTreeOf( UIControl * Child ) const; - Uint32 ChildCount() const; + Uint32 childCount() const; - UIControl * ChildAt( Uint32 Index ) const; + UIControl * childAt( Uint32 Index ) const; - UIControl * ChildPrev( UIControl * Ctrl, bool Loop = false ) const; + UIControl * childPrev( UIControl * Ctrl, bool Loop = false ) const; - UIControl * ChildNext( UIControl * Ctrl, bool Loop = false ) const; + UIControl * childNext( UIControl * Ctrl, bool Loop = false ) const; - void ClipDisable(); + void clipDisable(); - void ClipTo(); + void clipTo(); - void SetPrevSkinState(); + void setPrevSkinState(); - virtual void UpdateScreenPos(); + virtual void updateScreenPos(); - void UpdateChildsScreenPos(); + void updateChildsScreenPos(); - void WriteCtrlFlag( const Uint32& Flag, const Uint32& Val ); + void writeCtrlFlag( const Uint32& Flag, const Uint32& Val ); - void WriteFlag( const Uint32& Flag, const Uint32& Val ); + void writeFlag( const Uint32& Flag, const Uint32& Val ); - void SendParentSizeChange( const Vector2i& SizeChange ); + void sendParentSizeChange( const Vector2i& SizeChange ); - Time Elapsed(); + Time elapsed(); - Recti MakePadding( bool PadLeft = true, bool PadRight = true, bool PadTop = true, bool PadBottom = true, bool SkipFlags = false ); + Recti makePadding( bool PadLeft = true, bool PadRight = true, bool PadTop = true, bool PadBottom = true, bool SkipFlags = false ); - void SafeDeleteSkinState(); + void safeDeleteSkinState(); - Sizei GetSkinSize( UISkin * Skin, const Uint32& State = UISkinState::StateNormal ); + Sizei getSkinSize( UISkin * Skin, const Uint32& State = UISkinState::StateNormal ); - Rectf GetRectf(); + Rectf getRectf(); }; }} diff --git a/include/eepp/ui/uicontrolanim.hpp b/include/eepp/ui/uicontrolanim.hpp index 6f7a11250..a66b6986b 100644 --- a/include/eepp/ui/uicontrolanim.hpp +++ b/include/eepp/ui/uicontrolanim.hpp @@ -13,75 +13,75 @@ class EE_API UIControlAnim : public UIDragable { virtual ~UIControlAnim(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Update(); + virtual void update(); - const Float& Angle() const; + const Float& angle() const; - void Angle( const Float& angle ); + void angle( const Float& angle ); - void Angle( const Float& angle, const OriginPoint& center ); + void angle( const Float& angle, const OriginPoint& center ); - const OriginPoint& RotationOriginPoint() const; + const OriginPoint& rotationOriginPoint() const; - void RotationOriginPoint( const OriginPoint& center ); + void rotationOriginPoint( const OriginPoint& center ); - Vector2f RotationCenter(); + Vector2f rotationCenter(); - const Vector2f& Scale() const; + const Vector2f& scale() const; - void Scale( const Vector2f& scale ); + void scale( const Vector2f& scale ); - void Scale( const Vector2f& scale, const OriginPoint& center ); + void scale( const Vector2f& scale, const OriginPoint& center ); - void Scale( const Float& scale , const OriginPoint & center = OriginPoint::OriginCenter ); + void scale( const Float& scale , const OriginPoint & center = OriginPoint::OriginCenter ); - const OriginPoint& ScaleOriginPoint() const; + const OriginPoint& scaleOriginPoint() const; - void ScaleOriginPoint( const OriginPoint& center ); + void scaleOriginPoint( const OriginPoint& center ); - Vector2f ScaleCenter(); + Vector2f scaleCenter(); - const Float& Alpha() const; + const Float& alpha() const; - virtual void Alpha( const Float& alpha ); + virtual void alpha( const Float& alpha ); - virtual void AlphaChilds( const Float& alpha ); + virtual void alphaChilds( const Float& alpha ); - bool Animating(); + bool isAnimating(); - Interpolation * StartAlphaAnim( const Float& From, const Float& To, const Time& TotalTime, const bool& AlphaChilds = true, const Ease::Interpolation& Type = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); + Interpolation * startAlphaAnim( const Float& From, const Float& To, const Time& TotalTime, const bool& alphaChilds = true, const Ease::Interpolation& getType = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); - Waypoints * StartScaleAnim( const Vector2f& From, const Vector2f& To, const Time& TotalTime, const Ease::Interpolation& Type = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); + Waypoints * startScaleAnim( const Vector2f& From, const Vector2f& To, const Time& TotalTime, const Ease::Interpolation& getType = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); - Waypoints * StartScaleAnim( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); + Waypoints * startScaleAnim( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& getType = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); - Waypoints * StartMovement( const Vector2i& From, const Vector2i& To, const Time& TotalTime, const Ease::Interpolation& Type = Ease::Linear, Waypoints::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); + Waypoints * startMovement( const Vector2i& From, const Vector2i& To, const Time& TotalTime, const Ease::Interpolation& getType = Ease::Linear, Waypoints::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); - Interpolation * StartRotation( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); + Interpolation * startRotation( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& getType = Ease::Linear, Interpolation::OnPathEndCallback PathEndCallback = Interpolation::OnPathEndCallback() ); - Interpolation * CreateFadeIn( const Time& Time, const bool& AlphaChilds = true, const Ease::Interpolation& Type = Ease::Linear ); + Interpolation * createFadeIn( const Time& Time, const bool& alphaChilds = true, const Ease::Interpolation& getType = Ease::Linear ); - Interpolation * CreateFadeOut( const Time& Time, const bool& AlphaChilds = true, const Ease::Interpolation& Type = Ease::Linear ); + Interpolation * createFadeOut( const Time& Time, const bool& alphaChilds = true, const Ease::Interpolation& getType = Ease::Linear ); - Interpolation * CloseFadeOut( const Time& Time, const bool& AlphaChilds = true, const Ease::Interpolation& Type = Ease::Linear ); + Interpolation * closeFadeOut( const Time& Time, const bool& alphaChilds = true, const Ease::Interpolation& getType = Ease::Linear ); - Interpolation * DisableFadeOut( const Time & Time, const bool& AlphaChilds = true, const Ease::Interpolation& Type = Ease::Linear ); + Interpolation * disableFadeOut( const Time & Time, const bool& alphaChilds = true, const Ease::Interpolation& getType = Ease::Linear ); - Interpolation * RotationInterpolation(); + Interpolation * rotationInterpolation(); - Waypoints * ScaleInterpolation(); + Waypoints * scaleInterpolation(); - Interpolation * AlphaInterpolation(); + Interpolation * alphaInterpolation(); - Waypoints * MovementInterpolation(); + Waypoints * movementInterpolation(); - virtual void Draw(); + virtual void draw(); - bool FadingOut(); + bool isFadingOut(); protected: friend class UIManager; friend class UIControl; @@ -97,27 +97,27 @@ class EE_API UIControlAnim : public UIDragable { Interpolation * mAlphaAnim; Waypoints * mMoveAnim; - virtual void BackgroundDraw(); + virtual void backgroundDraw(); - virtual void BorderDraw(); + virtual void borderDraw(); - ColorA GetColor( const ColorA& Col ); + ColorA getColor( const ColorA& Col ); - virtual void UpdateQuad(); + virtual void updateQuad(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void OnAngleChange(); + virtual void onAngleChange(); - virtual void OnScaleChange(); + virtual void onScaleChange(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual void MatrixSet(); + virtual void matrixSet(); - virtual void MatrixUnset(); + virtual void matrixUnset(); - void UpdateOriginPoint(); + void updateOriginPoint(); }; }} diff --git a/include/eepp/ui/uidefaulttheme.hpp b/include/eepp/ui/uidefaulttheme.hpp index 6266795f2..bc1e525c0 100644 --- a/include/eepp/ui/uidefaulttheme.hpp +++ b/include/eepp/ui/uidefaulttheme.hpp @@ -5,29 +5,29 @@ namespace EE { namespace UI { -class EE_API UIDefaultTheme : public UITheme { +class EE_API UIdefaultTheme : public UITheme { public: - UIDefaultTheme( const std::string& getName, const std::string& Abbr, Graphics::Font * DefaultFont = NULL ); + UIdefaultTheme( const std::string& getName, const std::string& abbr, Graphics::Font * defaultFont = NULL ); - virtual UIPopUpMenu * CreatePopUpMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 100, Uint32 MinSpaceForIcons = 16, Uint32 MinRightMargin = 8 ); + virtual UIPopUpMenu * createPopUpMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 100, Uint32 MinSpaceForIcons = 16, Uint32 MinRightMargin = 8 ); - virtual UIProgressBar * CreateProgressBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool DisplayPercent = true, bool VerticalExpand = false, Vector2f MovementSpeed = Vector2f( -64, 0 ), Rectf FillerMargin = Rectf() ); + virtual UIProgressBar * createProgressBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool DisplayPercent = true, bool VerticalExpand = false, Vector2f MovementSpeed = Vector2f( -64, 0 ), Rectf FillerMargin = Rectf() ); - virtual UIWinMenu * CreateWinMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, Uint32 MarginBetweenButtons = 0, Uint32 ButtonMargin = 12, Uint32 MenuHeight = 0, Uint32 FirstButtonMargin = 1 ); + virtual UIWinMenu * createWinMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, Uint32 MarginBetweenButtons = 0, Uint32 ButtonMargin = 12, Uint32 MenuHeight = 0, Uint32 FirstButtonMargin = 1 ); - virtual UIWindow * CreateWindow( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); + virtual UIWindow * createWindow( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); - virtual UICommonDialog * CreateCommonDialog( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255, Uint32 CDLFlags = UI_CDL_DEFAULT_FLAGS, std::string DefaultFilePattern = "*", std::string DefaultDirectory = Sys::getProcessPath() ); + virtual UICommonDialog * createCommonDialog( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255, Uint32 CDLFlags = UI_CDL_DEFAULT_FLAGS, std::string DefaultFilePattern = "*", std::string DefaultDirectory = Sys::getProcessPath() ); - virtual UIComboBox * CreateComboBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); + virtual UIComboBox * createComboBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); - virtual UIDropDownList * CreateDropDownList( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); + virtual UIDropDownList * createDropDownList( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); - virtual UIMessageBox * CreateMessageBox( UI_MSGBOX_TYPE Type = MSGBOX_OKCANCEL, const String& Message = String(), Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); + virtual UIMessageBox * createMessageBox( UI_MSGBOX_TYPE Type = MSGBOX_OKCANCEL, const String& Message = String(), Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); - virtual UITabWidget * CreateTabWidget( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_CONTROL_DEFAULT_ANCHOR, const bool& TabsClosable = false, const bool& SpecialBorderTabs = false , const Int32& TabSeparation = 0, const Uint32& MaxTextLength = 30, const Uint32& TabWidgetHeight = 0, const Uint32& TabTextAlign = UI_HALIGN_CENTER | UI_VALIGN_CENTER, const Uint32& MinTabWidth = 32, const Uint32& MaxTabWidth = 210 ); + virtual UITabWidget * createTabWidget( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_CONTROL_DEFAULT_ANCHOR, const bool& TabsClosable = false, const bool& SpecialBorderTabs = false , const Int32& TabSeparation = 0, const Uint32& MaxTextLength = 30, const Uint32& TabWidgetHeight = 0, const Uint32& TabTextAlign = UI_HALIGN_CENTER | UI_VALIGN_CENTER, const Uint32& MinTabWidth = 32, const Uint32& MaxTabWidth = 210 ); - virtual UITooltip * CreateTooltip( UIControl * TooltipOf, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_PADDING | UI_AUTO_SIZE ); + virtual UITooltip * createTooltip( UIControl * TooltipOf, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_PADDING | UI_AUTO_SIZE ); }; }} diff --git a/include/eepp/ui/uidragable.hpp b/include/eepp/ui/uidragable.hpp index e02051319..839acc2a2 100644 --- a/include/eepp/ui/uidragable.hpp +++ b/include/eepp/ui/uidragable.hpp @@ -9,38 +9,38 @@ class EE_API UIDragable : public UIControl { public: UIDragable( const UIControl::CreateParams& Params ); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - bool Dragging() const; - void Dragging( const bool& dragging ); + bool dragging() const; + void dragging( const bool& dragging ); - const Vector2i& DragPoint() const; - void DragPoint( const Vector2i& Point ); + const Vector2i& dragPoint() const; + void dragPoint( const Vector2i& Point ); - virtual void Update(); + virtual void update(); - bool DragEnable() const; - void DragEnable( const bool& enable ); + bool dragEnable() const; + void dragEnable( const bool& enable ); - void DragButton( const Uint32& Button ); - const Uint32& DragButton() const; + void dragButton( const Uint32& Button ); + const Uint32& dragButton() const; protected: virtual ~UIDragable(); Vector2i mDragPoint; Uint32 mDragButton; - virtual Uint32 OnMouseDown( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDown( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseUp( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseUp( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnDrag( const Vector2i& Pos ); + virtual Uint32 OnDrag( const Vector2i& position ); - virtual Uint32 OnDragStart( const Vector2i& Pos ); + virtual Uint32 OnDragStart( const Vector2i& position ); - virtual Uint32 OnDragEnd( const Vector2i& Pos ); + virtual Uint32 OnDragEnd( const Vector2i& position ); }; }} diff --git a/include/eepp/ui/uidropdownlist.hpp b/include/eepp/ui/uidropdownlist.hpp index cc693be3b..3989baeb6 100644 --- a/include/eepp/ui/uidropdownlist.hpp +++ b/include/eepp/ui/uidropdownlist.hpp @@ -29,47 +29,47 @@ class EE_API UIDropDownList : public UITextInput { virtual ~UIDropDownList(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - UIListBox * ListBox() const; + UIListBox * getListBox() const; - virtual void Update(); + virtual void update(); protected: UIListBox * mListBox; Uint32 mMinNumVisibleItems; bool mPopUpToMainControl; - void ShowListBox(); + void showListBox(); - void OnListBoxFocusLoss( const UIEvent * Event ); + void onListBoxFocusLoss( const UIEvent * Event ); - virtual void OnItemSelected( const UIEvent * Event ); + virtual void onItemSelected( const UIEvent * Event ); - virtual void Show(); + virtual void show(); - virtual void Hide(); + virtual void hide(); - Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - virtual void OnItemClicked( const UIEvent * Event ); + virtual void onItemClicked( const UIEvent * Event ); - virtual void OnItemKeyDown( const UIEvent * Event ); + virtual void onItemKeyDown( const UIEvent * Event ); - virtual void OnControlClear( const UIEvent * Event ); + virtual void onControlClear( const UIEvent * Event ); - Uint32 OnKeyDown( const UIEventKey &Event ); + Uint32 onKeyDown( const UIEventKey &Event ); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void AutoSize(); + virtual void autoSize(); - virtual void AutoSizeControl(); + virtual void autoSizeControl(); - void DestroyListBox(); + void destroyListBox(); }; }} diff --git a/include/eepp/ui/uievent.hpp b/include/eepp/ui/uievent.hpp index 003b2f11e..290a40dec 100644 --- a/include/eepp/ui/uievent.hpp +++ b/include/eepp/ui/uievent.hpp @@ -54,13 +54,13 @@ class EE_API UIEvent { EventForceDWord = eeINDEX_NOT_FOUND }; - UIEvent( UIControl * Ctrl, const Uint32& EventType = EventForceDWord ); + UIEvent( UIControl * control, const Uint32& eventType = EventForceDWord ); ~UIEvent(); - UIControl * Ctrl() const; + UIControl * getControl() const; - const Uint32& EventType() const; + const Uint32& getEventType() const; protected: UIControl * mCtrl; Uint32 mEventType; diff --git a/include/eepp/ui/uieventkey.hpp b/include/eepp/ui/uieventkey.hpp index a1f704588..0c4c397c0 100644 --- a/include/eepp/ui/uieventkey.hpp +++ b/include/eepp/ui/uieventkey.hpp @@ -10,15 +10,15 @@ class UIControl; class EE_API UIEventKey : public UIEvent { public: - UIEventKey( UIControl * Ctrl, const Uint32& EventNum, const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ); + UIEventKey( UIControl * getControl, const Uint32& EventNum, const Uint32& getKeyCode, const Uint16& getChar, const Uint32& getMod ); ~UIEventKey(); - const Uint32& KeyCode() const; + const Uint32& getKeyCode() const; - const Uint16& Char() const; + const Uint16& getChar() const; - const Uint32& Mod() const; + const Uint32& getMod() const; protected: Uint32 mKeyCode; Uint16 mChar; diff --git a/include/eepp/ui/uieventmouse.hpp b/include/eepp/ui/uieventmouse.hpp index 912138137..14eedebcb 100644 --- a/include/eepp/ui/uieventmouse.hpp +++ b/include/eepp/ui/uieventmouse.hpp @@ -10,13 +10,13 @@ class UIControl; class EE_API UIEventMouse : public UIEvent { public: - UIEventMouse( UIControl * Ctrl, const Uint32& EventNum, const Vector2i& Pos, const Uint32& Flags ); + UIEventMouse( UIControl * getControl, const Uint32& EventNum, const Vector2i& getPosition, const Uint32& getFlags ); ~UIEventMouse(); - const Vector2i& Pos() const; + const Vector2i& getPosition() const; - const Uint32& Flags() const; + const Uint32& getFlags() const; protected: Vector2i mPos; Uint32 mFlags; diff --git a/include/eepp/ui/uigenericgrid.hpp b/include/eepp/ui/uigenericgrid.hpp index 1cce6aa6e..9ffbbff3e 100644 --- a/include/eepp/ui/uigenericgrid.hpp +++ b/include/eepp/ui/uigenericgrid.hpp @@ -40,67 +40,67 @@ class EE_API UIGenericGrid : public UIComplexControl { ~UIGenericGrid(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void Add( UIGridCell * Cell ); + void add( UIGridCell * Cell ); - void Remove( UIGridCell * Cell ); + void remove( UIGridCell * Cell ); - void Remove( std::vector ItemsIndex ); + void remove( std::vector ItemsIndex ); - void Remove( Uint32 ItemIndex ); + void remove( Uint32 ItemIndex ); - void CollumnWidth( const Uint32& CollumnIndex, const Uint32& CollumnWidth ); + void collumnWidth( const Uint32& CollumnIndex, const Uint32& collumnWidth ); - Uint32 Count() const; + Uint32 getCount() const; - const Uint32& CollumnsCount() const; + const Uint32& getCollumnsCount() const; - const Uint32& CollumnWidth( const Uint32& CollumnIndex ) const; + const Uint32& collumnWidth( const Uint32& CollumnIndex ) const; - void RowHeight( const Uint32& height ); + void rowHeight( const Uint32& height ); - const Uint32& RowHeight() const; + const Uint32& rowHeight() const; - UIGridCell * GetCell( const Uint32& CellIndex ) const; + UIGridCell * getCell( const Uint32& CellIndex ) const; - void VerticalScrollMode( const UI_SCROLLBAR_MODE& Mode ); + void verticalScrollMode( const UI_SCROLLBAR_MODE& Mode ); - const UI_SCROLLBAR_MODE& VerticalScrollMode(); + const UI_SCROLLBAR_MODE& verticalScrollMode(); - void HorizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ); + void horizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ); - const UI_SCROLLBAR_MODE& HorizontalScrollMode(); + const UI_SCROLLBAR_MODE& horizontalScrollMode(); - Uint32 GetCellPos( const Uint32& CollumnIndex ); + Uint32 getCellPosition( const Uint32& CollumnIndex ); - UIScrollBar * VerticalScrollBar() const; + UIScrollBar * verticalScrollBar() const; - UIScrollBar * HorizontalScrollBar() const; + UIScrollBar * horizontalScrollBar() const; - Uint32 GetItemIndex( UIGridCell * Item ); + Uint32 getItemIndex( UIGridCell * Item ); - UIGridCell * GetItemSelected(); + UIGridCell * getItemSelected(); - Uint32 GetItemSelectedIndex() const; + Uint32 getItemSelectedIndex() const; - Uint32 OnMessage( const UIMessage * Msg ); + Uint32 onMessage( const UIMessage * Msg ); - UIItemContainer * Container() const; + UIItemContainer * getContainer() const; - virtual void Update(); + virtual void update(); - bool TouchDragEnable() const; + bool touchDragEnable() const; - void TouchDragEnable( const bool& enable ); + void touchDragEnable( const bool& enable ); - bool TouchDragging() const; + bool touchDragging() const; - void TouchDragging( const bool& dragging ); + void touchDragging( const bool& dragging ); protected: friend class UIItemContainer; friend class UIGridCell; @@ -132,31 +132,31 @@ class EE_API UIGenericGrid : public UIComplexControl { bool mCollWidthAssigned; - void UpdateCells(); + void updateCells(); - void UpdateCollumnsPos(); + void updateCollumnsPos(); - void AutoPadding(); + void autoPadding(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - void ContainerResize(); + void containerResize(); - void OnScrollValueChange( const UIEvent * Event ); + void onScrollValueChange( const UIEvent * Event ); - void SetDefaultCollumnsWidth(); + void setDefaultCollumnsWidth(); - void UpdateScroll( bool FromScrollChange = false ); + void updateScroll( bool FromScrollChange = false ); - void UpdateSize(); + void updateSize(); - virtual Uint32 OnSelected(); + virtual Uint32 onSelected(); - void UpdateVScroll(); + void updateVScroll(); - void UpdateHScroll(); + void updateHScroll(); }; }} diff --git a/include/eepp/ui/uigfx.hpp b/include/eepp/ui/uigfx.hpp index 9282e4c88..92499dc84 100644 --- a/include/eepp/ui/uigfx.hpp +++ b/include/eepp/ui/uigfx.hpp @@ -28,40 +28,40 @@ class EE_API UIGfx : public UIComplexControl { virtual ~UIGfx(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Draw(); + virtual void draw(); - virtual void Alpha( const Float& alpha ); + virtual void alpha( const Float& alpha ); - Graphics::SubTexture * SubTexture() const; + Graphics::SubTexture * subTexture() const; - void SubTexture( Graphics::SubTexture * subTexture ); + void subTexture( Graphics::SubTexture * subTexture ); - const ColorA& Color() const; + const ColorA& color() const; - void Color( const ColorA& color ); + void color( const ColorA& col ); - const EE_RENDER_MODE& RenderMode() const; + const EE_RENDER_MODE& renderMode() const; - void RenderMode( const EE_RENDER_MODE& render ); + void renderMode( const EE_RENDER_MODE& render ); - const Vector2i& AlignOffset() const; + const Vector2i& alignOffset() const; protected: Graphics::SubTexture * mSubTexture; ColorA mColor; EE_RENDER_MODE mRender; Vector2i mAlignOffset; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void AutoSize(); + void autoSize(); - void AutoAlign(); + void autoAlign(); - void DrawSubTexture(); + void drawSubTexture(); }; }} diff --git a/include/eepp/ui/uigridcell.hpp b/include/eepp/ui/uigridcell.hpp index 392d4e6cb..aea0451ea 100644 --- a/include/eepp/ui/uigridcell.hpp +++ b/include/eepp/ui/uigridcell.hpp @@ -14,36 +14,36 @@ class EE_API UIGridCell : public UIComplexControl { virtual ~UIGridCell(); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void Cell( const Uint32& CollumnIndex, UIControl * Ctrl ); + void cell( const Uint32& CollumnIndex, UIControl * Ctrl ); - UIControl * Cell( const Uint32& CollumnIndex ) const; + UIControl * cell( const Uint32& CollumnIndex ) const; - virtual void Update(); + virtual void update(); - bool Selected() const; + bool isSelected() const; - void Unselect(); + void unselect(); - void Select(); + void select(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - void AutoSize(); + void autoSize(); protected: friend class UIItemContainer; friend class UIGenericGrid; std::vector mCells; - UIGenericGrid * GridParent() const; + UIGenericGrid * gridParent() const; - void FixCell(); + void fixCell(); - virtual Uint32 OnMouseExit( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseExit( const Vector2i& position, const Uint32 flags ); - virtual void OnStateChange(); + virtual void onStateChange(); }; }} diff --git a/include/eepp/ui/uiitemcontainer.hpp b/include/eepp/ui/uiitemcontainer.hpp index 72db47786..7ac347b50 100644 --- a/include/eepp/ui/uiitemcontainer.hpp +++ b/include/eepp/ui/uiitemcontainer.hpp @@ -12,11 +12,11 @@ class UIItemContainer : public UIControl { ~UIItemContainer(); - void Update(); + void update(); - void DrawChilds(); + void drawChilds(); protected: - UIControl * OverFind( const Vector2f& Point ); + UIControl * overFind( const Vector2f& Point ); }; template @@ -31,43 +31,43 @@ UIItemContainer::~UIItemContainer() } template -void UIItemContainer::Update() { - TContainer * tParent = reinterpret_cast ( Parent() ); +void UIItemContainer::update() { + TContainer * tParent = reinterpret_cast ( parent() ); if ( tParent->mItems.size() ) { for ( Uint32 i = tParent->mVisibleFirst; i <= tParent->mVisibleLast; i++ ) { if ( NULL != tParent->mItems[i] ) - tParent->mItems[i]->Update(); + tParent->mItems[i]->update(); } } } template -void UIItemContainer::DrawChilds() { - TContainer * tParent = reinterpret_cast ( Parent() ); +void UIItemContainer::drawChilds() { + TContainer * tParent = reinterpret_cast ( parent() ); if ( tParent->mItems.size() ) { for ( Uint32 i = tParent->mVisibleFirst; i <= tParent->mVisibleLast; i++ ) if ( NULL != tParent->mItems[i] ) - tParent->mItems[i]->InternalDraw(); + tParent->mItems[i]->internalDraw(); } } template -UIControl * UIItemContainer::OverFind( const Vector2f& Point ) { - TContainer * tParent = reinterpret_cast ( Parent() ); +UIControl * UIItemContainer::overFind( const Vector2f& Point ) { + TContainer * tParent = reinterpret_cast ( parent() ); UIControl * pOver = NULL; if ( mEnabled && mVisible && tParent->mItems.size() ) { - UpdateQuad(); + updateQuad(); if ( mPoly.pointInside( Point ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 1 ); + writeCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 1 ); for ( Uint32 i = tParent->mVisibleFirst; i <= tParent->mVisibleLast; i++ ) { if ( NULL != tParent->mItems[i] ) { - UIControl * ChildOver = tParent->mItems[i]->OverFind( Point ); + UIControl * ChildOver = tParent->mItems[i]->overFind( Point ); if ( NULL != ChildOver ) { pOver = ChildOver; diff --git a/include/eepp/ui/uilistbox.hpp b/include/eepp/ui/uilistbox.hpp index fd67f6bb4..7bf700b71 100644 --- a/include/eepp/ui/uilistbox.hpp +++ b/include/eepp/ui/uilistbox.hpp @@ -25,17 +25,17 @@ class EE_API UIListBox : public UIComplexControl { FontSelectedColor( 0, 0, 0, 255 ), TouchDragDeceleration( 0.01f ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontOverColor = Theme->FontOverColor(); - FontSelectedColor = Theme->FontSelectedColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontOverColor = Theme->fontOverColor(); + FontSelectedColor = Theme->fontSelectedColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -58,109 +58,109 @@ class EE_API UIListBox : public UIComplexControl { virtual ~UIListBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - void Clear(); + void clear(); - void AddListBoxItems( std::vector Texts ); + void addListBoxItems( std::vector Texts ); - Uint32 AddListBoxItem( const String& Text ); + Uint32 addListBoxItem( const String& Text ); - Uint32 AddListBoxItem( UIListBoxItem * Item ); + Uint32 addListBoxItem( UIListBoxItem * Item ); - Uint32 RemoveListBoxItem( const String& Text ); + Uint32 removeListBoxItem( const String& Text ); - Uint32 RemoveListBoxItem( UIListBoxItem * Item ); + Uint32 removeListBoxItem( UIListBoxItem * Item ); - Uint32 RemoveListBoxItem( Uint32 ItemIndex ); + Uint32 removeListBoxItem( Uint32 ItemIndex ); - void RemoveListBoxItems( std::vector ItemsIndex ); + void removeListBoxItems( std::vector ItemsIndex ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - bool IsMultiSelect() const; + bool isMultiSelect() const; - UIScrollBar * VerticalScrollBar() const; + UIScrollBar * verticalScrollBar() const; - UIScrollBar * HorizontalScrollBar() const; + UIScrollBar * horizontalScrollBar() const; - UIListBoxItem * GetItem( const Uint32& Index ) const; + UIListBoxItem * getItem( const Uint32& Index ) const; - Uint32 GetItemIndex( UIListBoxItem * Item ); + Uint32 getItemIndex( UIListBoxItem * Item ); - Uint32 GetItemIndex( const String& Text ); + Uint32 getItemIndex( const String& Text ); - UIListBoxItem * GetItemSelected(); + UIListBoxItem * getItemSelected(); - String GetItemSelectedText() const; + String getItemSelectedText() const; - Uint32 GetItemSelectedIndex() const; + Uint32 getItemSelectedIndex() const; - std::list GetItemsSelectedIndex() const; + std::list getItemsSelectedIndex() const; - std::list GetItemsSelected(); + std::list getItemsSelected(); - void FontColor( const ColorA& Color ); + void fontColor( const ColorA& Color ); - const ColorA& FontColor() const; + const ColorA& fontColor() const; - void FontOverColor( const ColorA& Color ); + void fontOverColor( const ColorA& Color ); - const ColorA& FontOverColor() const; + const ColorA& fontOverColor() const; - void FontSelectedColor( const ColorA& Color ); + void fontSelectedColor( const ColorA& Color ); - const ColorA& FontSelectedColor() const; + const ColorA& fontSelectedColor() const; - void Font( Graphics::Font * Font ); + void font( Graphics::Font * font ); - Graphics::Font * Font() const; + Graphics::Font * font() const; - void PaddingContainer( const Recti& Padding ); + void paddingContainer( const Recti& Padding ); - const Recti& PaddingContainer() const; + const Recti& paddingContainer() const; - void SmoothScroll( const bool& soft ); + void smoothScroll( const bool& soft ); - const bool& SmoothScroll() const; + const bool& smoothScroll() const; - void ScrollAlwaysVisible( const bool& visible ); + void scrollAlwaysVisible( const bool& visible ); - const bool& ScrollAlwaysVisible() const; + const bool& scrollAlwaysVisible() const; - void RowHeight( const Uint32& height ); + void rowHeight( const Uint32& height ); - const Uint32& RowHeight() const; + const Uint32& rowHeight() const; - Uint32 Count(); + Uint32 count(); - void SetSelected( Uint32 Index ); + void setSelected( Uint32 Index ); - void SetSelected( const String& Text ); + void setSelected( const String& Text ); - void SelectPrev(); + void selectPrev(); - void SelectNext(); + void selectNext(); - void VerticalScrollMode( const UI_SCROLLBAR_MODE& Mode ); + void verticalScrollMode( const UI_SCROLLBAR_MODE& Mode ); - const UI_SCROLLBAR_MODE& VerticalScrollMode(); + const UI_SCROLLBAR_MODE& verticalScrollMode(); - void HorizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ); + void horizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ); - const UI_SCROLLBAR_MODE& HorizontalScrollMode(); + const UI_SCROLLBAR_MODE& horizontalScrollMode(); - virtual void Update(); + virtual void update(); - bool TouchDragEnable() const; + bool touchDragEnable() const; - void TouchDragEnable( const bool& enable ); + void touchDragEnable( const bool& enable ); - bool TouchDragging() const; + bool touchDragging() const; - void TouchDragging( const bool& dragging ); + void touchDragging( const bool& dragging ); protected: friend class UIListBoxItem; friend class UIItemContainer; @@ -197,47 +197,47 @@ class EE_API UIListBox : public UIComplexControl { std::vector mItems; std::vector mTexts; - void UpdateScroll( bool FromScrollChange = false ); + void updateScroll( bool FromScrollChange = false ); - void OnScrollValueChange( const UIEvent * Event ); + void onScrollValueChange( const UIEvent * Event ); - void OnHScrollValueChange( const UIEvent * Event ); + void onHScrollValueChange( const UIEvent * Event ); - virtual void OnSizeChange(); + virtual void onSizeChange(); - void SetRowHeight(); + void setRowHeight(); - void UpdateListBoxItemsSize(); + void updateListBoxItemsSize(); - Uint32 GetListBoxItemIndex( const String& Name ); + Uint32 getListBoxItemIndex( const String& Name ); - Uint32 GetListBoxItemIndex( UIListBoxItem * Item ); + Uint32 getListBoxItemIndex( UIListBoxItem * Item ); - void ItemClicked( UIListBoxItem * Item ); + void itemClicked( UIListBoxItem * Item ); - void ResetItemsStates(); + void resetItemsStates(); - virtual Uint32 OnSelected(); + virtual Uint32 onSelected(); - void ContainerResize(); + void containerResize(); - void ItemUpdateSize( UIListBoxItem * Item ); + void itemUpdateSize( UIListBoxItem * Item ); - void AutoPadding(); + void autoPadding(); - void FindMaxWidth(); + void findMaxWidth(); - UIListBoxItem * CreateListBoxItem( const String& Name ); + UIListBoxItem * createListBoxItem( const String& Name ); - void CreateItemIndex( const Uint32& i ); + void createItemIndex( const Uint32& i ); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual Uint32 OnKeyDown( const UIEventKey &Event ); + virtual Uint32 onKeyDown( const UIEventKey &Event ); - void ItemKeyEvent( const UIEventKey &Event ); + void itemKeyEvent( const UIEventKey &Event ); }; }} diff --git a/include/eepp/ui/uilistboxitem.hpp b/include/eepp/ui/uilistboxitem.hpp index 6f833e1b3..61e77512d 100644 --- a/include/eepp/ui/uilistboxitem.hpp +++ b/include/eepp/ui/uilistboxitem.hpp @@ -14,27 +14,27 @@ class EE_API UIListBoxItem : public UITextBox { virtual ~UIListBoxItem(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual void Update(); + virtual void update(); - bool Selected() const; + bool isSelected() const; - void Unselect(); + void unselect(); - void Select(); + void select(); protected: friend class UIItemContainer; - virtual void OnStateChange(); + virtual void onStateChange(); - virtual Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseExit( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseExit( const Vector2i& position, const Uint32 flags ); }; }} diff --git a/include/eepp/ui/uimanager.hpp b/include/eepp/ui/uimanager.hpp index a02463dc5..8bb550069 100644 --- a/include/eepp/ui/uimanager.hpp +++ b/include/eepp/ui/uimanager.hpp @@ -15,90 +15,90 @@ class EE_API UIManager { public: ~UIManager(); - UIWindow * MainControl() const; + UIWindow * mainControl() const; - UIControl * FocusControl() const; + UIControl * focusControl() const; - void FocusControl( UIControl * Ctrl ); + void focusControl( UIControl * Ctrl ); - UIControl * OverControl() const; + UIControl * overControl() const; - void OverControl( UIControl * Ctrl ); + void overControl( UIControl * Ctrl ); - void Init( Uint32 Flags = 0, EE::Window::Window * window = NULL ); + void init( Uint32 Flags = 0, EE::Window::Window * window = NULL ); - void Shutdown(); + void shutdown(); - void Update(); + void update(); - void Draw(); + void draw(); - const Time& Elapsed() const; + const Time& elapsed() const; - void ResizeControl( EE::Window::Window * win ); + void resizeControl( EE::Window::Window * win ); - void SendMsg( UIControl * Ctrl, const Uint32& Msg, const Uint32& Flags = 0 ); + void sendMsg( UIControl * Ctrl, const Uint32& Msg, const Uint32& Flags = 0 ); - Vector2i GetMousePos(); + Vector2i getMousePos(); - Input * GetInput() const; + Input * getInput() const; - const Uint32& PressTrigger() const; + const Uint32& pressTrigger() const; - const Uint32& LastPressTrigger() const; + const Uint32& lastPressTrigger() const; - void ClipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ); + void clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ); - void ClipDisable(); + void clipDisable(); - void SendKeyUp( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ); + void sendKeyUp( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ); - void SendKeyDown( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ); + void sendKeyDown( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ); - void HighlightFocus( bool Highlight ); + void highlightFocus( bool Highlight ); - bool HighlightFocus() const; + bool highlightFocus() const; - void HighlightFocusColor( const ColorA& Color ); + void highlightFocusColor( const ColorA& Color ); - const ColorA& HighlightFocusColor() const; + const ColorA& highlightFocusColor() const; - void HighlightOver( bool Highlight ); + void highlightOver( bool Highlight ); - bool HighlightOver() const; + bool highlightOver() const; - void HighlightOverColor( const ColorA& Color ); + void highlightOverColor( const ColorA& Color ); - const ColorA& HighlightOverColor() const; + const ColorA& highlightOverColor() const; - void SendMouseClick( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); + void sendMouseClick( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); - void SendMouseUp( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); + void sendMouseUp( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); - void SendMouseDown( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); + void sendMouseDown( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ); - EE::Window::Window * GetWindow() const; + EE::Window::Window * getWindow() const; /** Control where the mouse click started to be down */ - UIControl * DownControl() const; + UIControl * downControl() const; - UIControl * LossFocusControl() const; + UIControl * lossFocusControl() const; - const bool& IsShootingDown() const; + const bool& isShootingDown() const; /** @return The position of the mouse when the event MouseDown was fired last time. ** Useful to compare the mouse position of the MouseClick event */ - const Vector2i& GetMouseDownPos() const; + const Vector2i& getMouseDownPos() const; - void SetControlDragging( bool dragging ); + void setControlDragging( bool dragging ); - const bool& IsControlDragging() const; + const bool& isControlDragging() const; - void UseGlobalCursors( const bool& use ); + void useGlobalCursors( const bool& use ); - const bool& UseGlobalCursors(); + const bool& useGlobalCursors(); - void SetCursor( EE_CURSOR_TYPE cursor ); + void setCursor( EE_CURSOR_TYPE cursor ); protected: friend class UIControl; friend class UIWindow; @@ -130,23 +130,23 @@ class EE_API UIManager { UIManager(); - void InputCallback( InputEvent * Event ); + void inputCallback( InputEvent * Event ); - void CheckTabPress( const Uint32& KeyCode ); + void checkTabPress( const Uint32& KeyCode ); - void SetActiveWindow( UIWindow * window ); + void setActiveWindow( UIWindow * window ); - void SetFocusLastWindow( UIWindow * window ); + void setFocusLastWindow( UIWindow * window ); - void WindowAdd( UIWindow * win ); + void windowAdd( UIWindow * win ); - void WindowRemove( UIWindow * win ); + void windowRemove( UIWindow * win ); - bool WindowExists( UIWindow * win ); + bool windowExists( UIWindow * win ); - void AddToCloseQueue( UIControl * Ctrl ); + void addToCloseQueue( UIControl * Ctrl ); - void CheckClose(); + void checkClose(); }; }} diff --git a/include/eepp/ui/uimenu.hpp b/include/eepp/ui/uimenu.hpp index 24fc7694e..b98dbf428 100644 --- a/include/eepp/ui/uimenu.hpp +++ b/include/eepp/ui/uimenu.hpp @@ -26,18 +26,18 @@ class EE_API UIMenu : public UIComplexControl { FontOverColor( 0, 0, 0, 255 ), FontSelectedColor( 0, 0, 0, 255 ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); - FontOverColor = Theme->FontOverColor(); - FontSelectedColor = Theme->FontSelectedColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); + FontOverColor = Theme->fontOverColor(); + FontSelectedColor = Theme->fontSelectedColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -55,15 +55,15 @@ class EE_API UIMenu : public UIComplexControl { }; - static void FixMenuPos( Vector2i& Pos, UIMenu * Menu, UIMenu * Parent = NULL, UIMenuSubMenu * SubMenu = NULL ); + static void FixMenuPos( Vector2i& position, UIMenu * Menu, UIMenu * parent = NULL, UIMenuSubMenu * SubMenu = NULL ); UIMenu( UIMenu::CreateParams& Params ); virtual ~UIMenu(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; Uint32 Add( const String& Text, SubTexture * Icon = NULL ); @@ -93,11 +93,11 @@ class EE_API UIMenu : public UIComplexControl { void Insert( UIControl * Control, const Uint32& Index ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual bool Show(); + virtual bool show(); - virtual bool Hide(); + virtual bool hide(); const Recti& Padding() const; protected: @@ -124,13 +124,13 @@ class EE_API UIMenu : public UIComplexControl { bool mClickHide; Uint32 mLastTickMove; - virtual void OnSizeChange(); + virtual void onSizeChange(); void AutoPadding(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - void SetControlSize( UIControl * Control, const Uint32& Pos ); + void SetControlSize( UIControl * Control, const Uint32& position ); void ResizeControls(); @@ -144,7 +144,7 @@ class EE_API UIMenu : public UIComplexControl { UIMenuSubMenu * CreateSubMenu( const String& Text, SubTexture * Icon, UIMenu * SubMenu ); - void DoAfterSetTheme(); + void doAftersetTheme(); bool CheckControlSize( UIControl * Control, const bool& Resize = true ); @@ -152,7 +152,7 @@ class EE_API UIMenu : public UIComplexControl { void SetItemSelected( UIControl * Item ); - virtual Uint32 OnKeyDown( const UIEventKey& Event ); + virtual Uint32 onKeyDown( const UIEventKey& Event ); void PrevSel(); diff --git a/include/eepp/ui/uimenucheckbox.hpp b/include/eepp/ui/uimenucheckbox.hpp index 0bd3e9921..87de1a1b9 100644 --- a/include/eepp/ui/uimenucheckbox.hpp +++ b/include/eepp/ui/uimenucheckbox.hpp @@ -11,29 +11,29 @@ class EE_API UIMenuCheckBox : public UIMenuItem { virtual ~UIMenuCheckBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - const bool& Active() const; + const bool& active() const; - const bool& IsActive() const; + const bool& isActive() const; - void Active( const bool& active ); + void active( const bool& active ); - void SwitchActive(); + void switchActive(); - virtual bool InheritsFrom( const Uint32 Type ); + virtual bool inheritsFrom( const Uint32 getType ); protected: bool mActive; UISkin * mSkinActive; UISkin * mSkinInactive; - virtual Uint32 OnMouseUp( const Vector2i &Pos, const Uint32 Flags ); + virtual Uint32 onMouseUp( const Vector2i &position, const Uint32 flags ); - virtual void OnStateChange(); + virtual void onStateChange(); }; }} diff --git a/include/eepp/ui/uimenuitem.hpp b/include/eepp/ui/uimenuitem.hpp index 4c45a412c..43fdaee26 100644 --- a/include/eepp/ui/uimenuitem.hpp +++ b/include/eepp/ui/uimenuitem.hpp @@ -11,15 +11,15 @@ class EE_API UIMenuItem : public UIPushButton { virtual ~UIMenuItem(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); protected: - virtual Uint32 OnMouseEnter( const Vector2i &Pos, const Uint32 Flags ); + virtual Uint32 onMouseEnter( const Vector2i &position, const Uint32 flags ); - virtual void OnStateChange(); + virtual void onStateChange(); }; }} diff --git a/include/eepp/ui/uimenusubmenu.hpp b/include/eepp/ui/uimenusubmenu.hpp index 6694077e2..55c66aad4 100644 --- a/include/eepp/ui/uimenusubmenu.hpp +++ b/include/eepp/ui/uimenusubmenu.hpp @@ -28,21 +28,21 @@ class EE_API UIMenuSubMenu : public UIMenuItem { virtual ~UIMenuSubMenu(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void SubMenu( UIMenu * SubMenu ); + void subMenu( UIMenu * subMenu ); - UIMenu * SubMenu() const; + UIMenu * subMenu() const; - UIGfx * Arrow() const; + UIGfx * getArrow() const; - void ShowSubMenu(); + void showSubMenu(); - virtual bool InheritsFrom( const Uint32 Type ); + virtual bool inheritsFrom( const Uint32 getType ); protected: UIMenu * mSubMenu; UISkin * mSkinArrow; @@ -52,17 +52,17 @@ class EE_API UIMenuSubMenu : public UIMenuItem { Uint32 mCbId; Uint32 mCbId2; - virtual Uint32 OnMouseExit( const Vector2i &Pos, const Uint32 Flags ); + virtual Uint32 onMouseExit( const Vector2i &position, const Uint32 flags ); - virtual Uint32 OnMouseMove( const Vector2i &Pos, const Uint32 Flags ); + virtual Uint32 onMouseMove( const Vector2i &position, const Uint32 flags ); - virtual void OnStateChange(); + virtual void onStateChange(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - void OnSubMenuFocusLoss( const UIEvent * Event ); + void onSubMenuFocusLoss( const UIEvent * Event ); - void OnHideByClick( const UIEvent * Event ); + void onHideByClick( const UIEvent * Event ); }; }} diff --git a/include/eepp/ui/uimessage.hpp b/include/eepp/ui/uimessage.hpp index 172c560fb..878d30fa7 100644 --- a/include/eepp/ui/uimessage.hpp +++ b/include/eepp/ui/uimessage.hpp @@ -28,15 +28,15 @@ class EE_API UIMessage { MsgForceDWord = eeINDEX_NOT_FOUND }; - UIMessage( UIControl * Ctrl, const Uint32& Msg, const Uint32& Flags = MsgForceDWord ); + UIMessage( UIControl * Ctrl, const Uint32& getMsg, const Uint32& getFlags = MsgForceDWord ); ~UIMessage(); - UIControl * Sender() const; + UIControl * getSender() const; - const Uint32& Msg() const; + const Uint32& getMsg() const; - const Uint32& Flags() const; + const Uint32& getFlags() const; private: UIControl * mCtrl; Uint32 mMsg; diff --git a/include/eepp/ui/uimessagebox.hpp b/include/eepp/ui/uimessagebox.hpp index ad3952c62..755b89100 100644 --- a/include/eepp/ui/uimessagebox.hpp +++ b/include/eepp/ui/uimessagebox.hpp @@ -29,17 +29,17 @@ class EE_API UIMessageBox : public UIWindow { virtual ~UIMessageBox(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - UITextBox * TextBox() const; + UITextBox * getTextBox() const; - UIPushButton * ButtonOK() const; + UIPushButton * getButtonOK() const; - UIPushButton * ButtonCancel() const; + UIPushButton * getButtonCancel() const; - virtual bool Show(); + virtual bool show(); protected: UI_MSGBOX_TYPE mMsgBoxType; UITextBox * mTextBox; @@ -47,9 +47,9 @@ class EE_API UIMessageBox : public UIWindow { UIPushButton * mButtonCancel; Uint32 mCloseWithKey; - void AutoSize(); + void autoSize(); - virtual Uint32 OnKeyUp( const UIEventKey& Event ); + virtual Uint32 onKeyUp( const UIEventKey& Event ); }; }} diff --git a/include/eepp/ui/uipopupmenu.hpp b/include/eepp/ui/uipopupmenu.hpp index e601dc6d6..464210d8f 100644 --- a/include/eepp/ui/uipopupmenu.hpp +++ b/include/eepp/ui/uipopupmenu.hpp @@ -11,19 +11,19 @@ class EE_API UIPopUpMenu : public UIMenu { virtual ~UIPopUpMenu(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual bool Show(); + virtual bool show(); - virtual bool Hide(); + virtual bool hide(); protected: - virtual void OnComplexControlFocusLoss(); + virtual void onComplexControlFocusLoss(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); #ifdef EE_PLATFORM_TOUCH Clock mTE; diff --git a/include/eepp/ui/uiprogressbar.hpp b/include/eepp/ui/uiprogressbar.hpp index fe73af6af..26ae94245 100644 --- a/include/eepp/ui/uiprogressbar.hpp +++ b/include/eepp/ui/uiprogressbar.hpp @@ -31,39 +31,39 @@ class EE_API UIProgressBar : public UIComplexControl { virtual ~UIProgressBar(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual void Progress( Float Val ); + virtual void progress( Float Val ); - const Float& Progress() const; + const Float& progress() const; - virtual void TotalSteps( const Float& Steps ); + virtual void totalSteps( const Float& Steps ); - const Float& TotalSteps() const; + const Float& totalSteps() const; - virtual void Draw(); + virtual void draw(); - void MovementSpeed( const Vector2f& Speed ); + void movementSpeed( const Vector2f& Speed ); - const Vector2f& MovementSpeed() const; + const Vector2f& movementSpeed() const; - void VerticalExpand( const bool& VerticalExpand ); + void verticalExpand( const bool& verticalExpand ); - const bool& VerticalExpand() const; + const bool& verticalExpand() const; - void FillerMargin( const Rectf& margin ); + void fillerMargin( const Rectf& margin ); - const Rectf& FillerMargin() const; + const Rectf& fillerMargin() const; - void DisplayPercent( const bool& DisplayPercent ); + void displayPercent( const bool& displayPercent ); - const bool& DisplayPercent() const; + const bool& displayPercent() const; - UITextBox * TextBox() const; + UITextBox * getTextBox() const; protected: bool mVerticalExpand; @@ -78,13 +78,13 @@ class EE_API UIProgressBar : public UIComplexControl { UITextBox * mTextBox; - virtual Uint32 OnValueChange(); + virtual Uint32 onValueChange(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - void UpdateTextBox(); + void updateTextBox(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); }; }} diff --git a/include/eepp/ui/uipushbutton.hpp b/include/eepp/ui/uipushbutton.hpp index dfe575551..ee2468c19 100644 --- a/include/eepp/ui/uipushbutton.hpp +++ b/include/eepp/ui/uipushbutton.hpp @@ -22,17 +22,17 @@ class EE_API UIPushButton : public UIComplexControl { IconAutoMargin( true ), IconMinSize( 0, 0 ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); - FontOverColor = Theme->FontOverColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); + FontOverColor = Theme->fontOverColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -58,37 +58,37 @@ class EE_API UIPushButton : public UIComplexControl { virtual ~UIPushButton(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual void Icon( SubTexture * Icon ); + virtual void icon( SubTexture * icon ); - virtual UIGfx * Icon() const; + virtual UIGfx * icon() const; - virtual void Text( const String& text ); + virtual void text( const String& text ); - virtual const String& Text(); + virtual const String& text(); - void Padding( const Recti& padding ); + void padding( const Recti& padding ); - const Recti& Padding() const; + const Recti& padding() const; - void IconHorizontalMargin( Int32 margin ); + void iconHorizontalMargin( Int32 margin ); - const Int32& IconHorizontalMargin() const; + const Int32& iconHorizontalMargin() const; - UITextBox * TextBox() const; + UITextBox * getTextBox() const; - const ColorA& FontColor() const; + const ColorA& fontColor() const; - void FontColor( const ColorA& color ); + void fontColor( const ColorA& color ); - const ColorA& FontOverColor() const; + const ColorA& fontOverColor() const; - void FontOverColor( const ColorA& color ); + void fontOverColor( const ColorA& color ); protected: ColorA mFontColor; ColorA mFontOverColor; @@ -96,19 +96,19 @@ class EE_API UIPushButton : public UIComplexControl { UITextBox * mTextBox; Int32 mIconSpace; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void AutoPadding(); + void autoPadding(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual void OnStateChange(); + virtual void onStateChange(); - virtual void DoAfterSetTheme(); + virtual void doAftersetTheme(); - virtual Uint32 OnKeyDown( const UIEventKey& Event ); + virtual Uint32 onKeyDown( const UIEventKey& Event ); - virtual Uint32 OnKeyUp( const UIEventKey& Event ); + virtual Uint32 onKeyUp( const UIEventKey& Event ); }; }} diff --git a/include/eepp/ui/uiradiobutton.hpp b/include/eepp/ui/uiradiobutton.hpp index 1f707f377..1cac51687 100644 --- a/include/eepp/ui/uiradiobutton.hpp +++ b/include/eepp/ui/uiradiobutton.hpp @@ -12,44 +12,44 @@ class EE_API UIRadioButton : public UITextBox { virtual ~UIRadioButton(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - const bool& IsActive() const; + const bool& isActive() const; - void Active( const bool& active ); + void active( const bool& active ); - const bool& Active() const; + const bool& active() const; - virtual void Padding( const Recti& padding ); + virtual void padding( const Recti& padding ); - UIControlAnim * ActiveButton() const; + UIControlAnim * activeButton() const; - UIControlAnim * InactiveButton() const; + UIControlAnim * inactiveButton() const; protected: UIControlAnim * mActiveButton; UIControlAnim * mInactiveButton; bool mActive; Uint32 mLastTick; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void SwitchState(); + void switchState(); - void AutoActivate(); + void autoActivate(); - bool CheckActives(); + bool checkActives(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnKeyDown( const UIEventKey& Event ); + virtual Uint32 onKeyDown( const UIEventKey& Event ); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual void AutoSize(); + virtual void autoSize(); }; }} diff --git a/include/eepp/ui/uiscrollbar.hpp b/include/eepp/ui/uiscrollbar.hpp index 6e0985791..10eb867d6 100644 --- a/include/eepp/ui/uiscrollbar.hpp +++ b/include/eepp/ui/uiscrollbar.hpp @@ -25,53 +25,53 @@ class EE_API UIScrollBar : public UIComplexControl { virtual ~UIScrollBar(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Value( Float Val ); + virtual void value( Float Val ); - const Float& Value() const; + const Float& value() const; - virtual void MinValue( const Float& MinVal ); + virtual void minValue( const Float& MinVal ); - const Float& MinValue() const; + const Float& minValue() const; - virtual void MaxValue( const Float& MaxVal ); + virtual void maxValue( const Float& MaxVal ); - const Float& MaxValue() const; + const Float& maxValue() const; - virtual void ClickStep( const Float& step ); + virtual void clickStep( const Float& step ); - const Float& ClickStep() const; + const Float& clickStep() const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - const bool& IsVertical() const; + const bool& isVertical() const; - virtual void Update(); + virtual void update(); - UISlider * Slider() const; + UISlider * getSlider() const; - UIControlAnim * ButtonUp() const; + UIControlAnim * getButtonUp() const; - UIControlAnim * ButtonDown() const; + UIControlAnim * getButtonDown() const; protected: UISlider * mSlider; UIControlAnim * mBtnUp; UIControlAnim * mBtnDown; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void AdjustChilds(); + void adjustChilds(); - void OnValueChangeCb( const UIEvent * Event ); + void onValueChangeCb( const UIEvent * Event ); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - void ManageClick( const Uint32& Flags ); + void manageClick( const Uint32& flags ); }; }} diff --git a/include/eepp/ui/uiselectbutton.hpp b/include/eepp/ui/uiselectbutton.hpp index 764865df3..7dd8ff8f6 100644 --- a/include/eepp/ui/uiselectbutton.hpp +++ b/include/eepp/ui/uiselectbutton.hpp @@ -11,17 +11,17 @@ class EE_API UISelectButton : public UIPushButton { virtual ~UISelectButton(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual bool Selected() const; + virtual bool selected() const; - virtual void Unselect(); + virtual void unselect(); - virtual void Select(); + virtual void select(); protected: - virtual void OnStateChange(); + virtual void onStateChange(); }; }} diff --git a/include/eepp/ui/uiseparator.hpp b/include/eepp/ui/uiseparator.hpp index ce5aaad67..67f2376e6 100644 --- a/include/eepp/ui/uiseparator.hpp +++ b/include/eepp/ui/uiseparator.hpp @@ -11,11 +11,11 @@ class EE_API UISeparator : public UIControlAnim { virtual ~UISeparator(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); protected: }; diff --git a/include/eepp/ui/uiskin.hpp b/include/eepp/ui/uiskin.hpp index 7920506cf..b5fd827a1 100644 --- a/include/eepp/ui/uiskin.hpp +++ b/include/eepp/ui/uiskin.hpp @@ -20,23 +20,23 @@ class EE_API UISkin { SkinTypeCount }; - static const char * GetSkinStateName( const Uint32& State ); + static const char * getSkinStateName( const Uint32& State ); UISkin( const std::string& getName, const Uint32& Type ); virtual ~UISkin(); - virtual void Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) = 0; + virtual void draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) = 0; - virtual void SetSkin( const Uint32& State ) = 0; + virtual void setSkin( const Uint32& State ) = 0; - virtual SubTexture * GetSubTexture( const Uint32& State ) const = 0; + virtual SubTexture * getSubTexture( const Uint32& State ) const = 0; - virtual void SetColor( const Uint32& State, const ColorA& Color ); + virtual void setColor( const Uint32& State, const ColorA& Color ); - virtual const ColorA& GetColor( const Uint32& State ) const; + virtual const ColorA& getColor( const Uint32& State ) const; - virtual void SetSkins(); + virtual void setSkins(); const std::string& getName() const; @@ -44,13 +44,13 @@ class EE_API UISkin { const Uint32& getId() const; - UITheme * Theme() const; + UITheme * theme() const; - void Theme( UITheme * theme ); + void theme( UITheme * theme ); - virtual UISkin * Copy() = 0; + virtual UISkin * copy() = 0; - const Uint32& GetType() const; + const Uint32& getType() const; protected: friend class UIControl; friend class UISkinState; @@ -62,13 +62,13 @@ class EE_API UISkin { ColorA mColor[ UISkinState::StateCount ]; UITheme * mTheme; - void StateBack( const Uint32& State ); + void stateBack( const Uint32& State ); - void SetPrevState(); + void setPrevState(); - bool GetColorDefault( const Uint32& State ); + bool getColorDefault( const Uint32& State ); - virtual void StateNormalToState( const Uint32& State ) = 0; + virtual void stateNormalToState( const Uint32& State ) = 0; }; }} diff --git a/include/eepp/ui/uiskincomplex.hpp b/include/eepp/ui/uiskincomplex.hpp index 46514e6fc..4c9a50972 100644 --- a/include/eepp/ui/uiskincomplex.hpp +++ b/include/eepp/ui/uiskincomplex.hpp @@ -27,22 +27,22 @@ class EE_API UISkinComplex : public UISkin { virtual ~UISkinComplex(); - virtual void Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ); + virtual void draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ); - void SetSkin( const Uint32& State ); + void setSkin( const Uint32& State ); - SubTexture * GetSubTexture( const Uint32& State ) const; + SubTexture * getSubTexture( const Uint32& State ) const; - SubTexture * GetSubTextureSide( const Uint32& State, const Uint32& Side ); + SubTexture * getSubTextureSide( const Uint32& State, const Uint32& Side ); - UISkinComplex * Copy( const std::string& NewName, const bool& CopyColorsState = true ); + UISkinComplex * copy( const std::string& NewName, const bool& CopyColorsState = true ); - virtual UISkin * Copy(); + virtual UISkin * copy(); protected: SubTexture * mSubTexture[ UISkinState::StateCount ][ SideCount ]; ColorA mTempColor; - void StateNormalToState( const Uint32& State ); + void stateNormalToState( const Uint32& State ); }; }} diff --git a/include/eepp/ui/uiskinsimple.hpp b/include/eepp/ui/uiskinsimple.hpp index 91b495bb3..8efa4d40e 100644 --- a/include/eepp/ui/uiskinsimple.hpp +++ b/include/eepp/ui/uiskinsimple.hpp @@ -12,20 +12,20 @@ class EE_API UISkinSimple : public UISkin { virtual ~UISkinSimple(); - virtual void Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ); + virtual void draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ); - void SetSkin( const Uint32& State ); + void setSkin( const Uint32& State ); - SubTexture * GetSubTexture( const Uint32& State ) const; + SubTexture * getSubTexture( const Uint32& State ) const; - UISkinSimple * Copy( const std::string& NewName, const bool& CopyColorsState = true ); + UISkinSimple * copy( const std::string& NewName, const bool& CopyColorsState = true ); - virtual UISkin * Copy(); + virtual UISkin * copy(); protected: SubTexture * mSubTexture[ UISkinState::StateCount ]; ColorA mTempColor; - void StateNormalToState( const Uint32& State ); + void stateNormalToState( const Uint32& State ); }; }} diff --git a/include/eepp/ui/uiskinstate.hpp b/include/eepp/ui/uiskinstate.hpp index e5ed1634c..863300ffc 100644 --- a/include/eepp/ui/uiskinstate.hpp +++ b/include/eepp/ui/uiskinstate.hpp @@ -23,17 +23,17 @@ class EE_API UISkinState { ~UISkinState(); - const Uint32& GetState() const; + const Uint32& getState() const; - void SetState( const Uint32& State ); + void setState( const Uint32& State ); - UISkin * GetSkin() const; + UISkin * getSkin() const; - void Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha ); + void draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha ); - bool StateExists( const Uint32& State ); + bool stateExists( const Uint32& State ); - const Uint32& GetPrevState() const; + const Uint32& getPrevState() const; protected: friend class UIControl; @@ -41,13 +41,13 @@ class EE_API UISkinState { Uint32 mCurState; Uint32 mLastState; - void StateBack( const Uint32& State ); + void stateBack( const Uint32& State ); - void SetPrevState(); + void setPrevState(); - void SetStateTypeSimple( const Uint32& State ); + void setStateTypeSimple( const Uint32& State ); - void SetStateTypeDefault( const Uint32& State ); + void setStateTypeDefault( const Uint32& State ); }; }} diff --git a/include/eepp/ui/uislider.hpp b/include/eepp/ui/uislider.hpp index adf9f1ee9..e607b078a 100644 --- a/include/eepp/ui/uislider.hpp +++ b/include/eepp/ui/uislider.hpp @@ -29,43 +29,43 @@ class EE_API UISlider : public UIComplexControl { virtual ~UISlider(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual void Value( Float Val ); + virtual void value( Float Val ); - const Float& Value() const; + const Float& value() const; - virtual void MinValue( const Float& MinVal ); + virtual void minValue( const Float& MinVal ); - const Float& MinValue() const; + const Float& minValue() const; - virtual void MaxValue( const Float& MaxVal ); + virtual void maxValue( const Float& MaxVal ); - const Float& MaxValue() const; + const Float& maxValue() const; - virtual void ClickStep( const Float& step ); + virtual void clickStep( const Float& step ); - const Float& ClickStep() const; + const Float& clickStep() const; - const bool& IsVertical() const; + const bool& isVertical() const; - virtual void Update(); + virtual void update(); - UIControl * GetBackSlider() const; + UIControl * getBackSlider() const; - UIDragable * GetSliderButton() const; + UIDragable * getSliderButton() const; - void AdjustChilds(); + void adjustChilds(); - const bool& AllowHalfSliderOut() const; + const bool& allowHalfSliderOut() const; - const bool& ExpandBackground() const; + const bool& expandBackground() const; - void ManageClick( const Uint32& Flags ); + void manageClick( const Uint32& flags ); protected: friend class Private::UISliderButton; @@ -83,13 +83,13 @@ class EE_API UISlider : public UIComplexControl { Uint32 mLastTickMove; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void FixSliderPos(); + void fixSliderPos(); - virtual Uint32 OnKeyDown( const UIEventKey &Event ); + virtual Uint32 onKeyDown( const UIEventKey &Event ); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); }; }} diff --git a/include/eepp/ui/uisliderbutton.hpp b/include/eepp/ui/uisliderbutton.hpp index 18d5ba83d..dec9180aa 100644 --- a/include/eepp/ui/uisliderbutton.hpp +++ b/include/eepp/ui/uisliderbutton.hpp @@ -11,7 +11,7 @@ class EE_API UISliderButton : public UIControlAnim { virtual ~UISliderButton(); protected: - virtual void OnPosChange(); + virtual void onPositionChange(); }; }}} diff --git a/include/eepp/ui/uispinbox.hpp b/include/eepp/ui/uispinbox.hpp index d1bd4d5dc..a6e65cdc5 100644 --- a/include/eepp/ui/uispinbox.hpp +++ b/include/eepp/ui/uispinbox.hpp @@ -28,43 +28,43 @@ class EE_API UISpinBox : public UIComplexControl { virtual ~UISpinBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual void Padding( const Recti& padding ); + virtual void padding( const Recti& padding ); - const Recti& Padding() const; + const Recti& padding() const; - virtual void ClickStep( const Float& step ); + virtual void clickStep( const Float& step ); - const Float& ClickStep() const; + const Float& clickStep() const; - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - void AddValue( const Float& value ); + void addValue( const Float& value ); - virtual void MinValue( const Float& MinVal ); + virtual void minValue( const Float& MinVal ); - const Float& MinValue() const; + const Float& minValue() const; - virtual void MaxValue( const Float& MaxVal ); + virtual void maxValue( const Float& MaxVal ); - const Float& MaxValue() const; + const Float& maxValue() const; - virtual void Value( const Float& Val ); + virtual void value( const Float& Val ); - const Float& Value() const; + const Float& value() const; - virtual void Update(); + virtual void update(); - UIControlAnim * ButtonPushUp() const; + UIControlAnim * getButtonPushUp() const; - UIControlAnim * ButtonPushDown() const; + UIControlAnim * getButtonPushDown() const; - UITextInput * TextInput() const; + UITextInput * getTextInput() const; protected: UITextInput * mInput; UIControlAnim * mPushUp; @@ -74,11 +74,11 @@ class EE_API UISpinBox : public UIComplexControl { Float mValue; Float mClickStep; - void AdjustChilds(); + void adjustChilds(); - void InternalValue( const Float& Val, const bool& Force = false ); + void internalValue( const Float& Val, const bool& Force = false ); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); }; }} diff --git a/include/eepp/ui/uisprite.hpp b/include/eepp/ui/uisprite.hpp index 3ba867a76..f9a4b5d73 100644 --- a/include/eepp/ui/uisprite.hpp +++ b/include/eepp/ui/uisprite.hpp @@ -32,27 +32,27 @@ class EE_API UISprite : public UIComplexControl { virtual ~UISprite(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Draw(); + virtual void draw(); - virtual void Alpha( const Float& alpha ); + virtual void alpha( const Float& alpha ); - Graphics::Sprite * Sprite() const; + Graphics::Sprite * sprite() const; - void Sprite( Graphics::Sprite * sprite ); + void sprite( Graphics::Sprite * sprite ); - ColorA Color() const; + ColorA color() const; - void Color( const ColorA& color ); + void color( const ColorA& color ); - const EE_RENDER_MODE& RenderMode() const; + const EE_RENDER_MODE& renderMode() const; - void RenderMode( const EE_RENDER_MODE& render ); + void renderMode( const EE_RENDER_MODE& render ); - const Vector2i& AlignOffset() const; + const Vector2i& alignOffset() const; protected: Graphics::Sprite * mSprite; EE_RENDER_MODE mRender; @@ -60,15 +60,15 @@ class EE_API UISprite : public UIComplexControl { SubTexture * mSubTextureLast; bool mDealloc; - void UpdateSize(); + void updateSize(); - void AutoAlign(); + void autoAlign(); - void CheckSubTextureUpdate(); + void checkSubTextureUpdate(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - Uint32 DealloSprite(); + Uint32 deallocSprite(); }; }} diff --git a/include/eepp/ui/uitab.hpp b/include/eepp/ui/uitab.hpp index e7bdf84f3..5e4af0c8d 100644 --- a/include/eepp/ui/uitab.hpp +++ b/include/eepp/ui/uitab.hpp @@ -9,33 +9,33 @@ class UITabWidget; class EE_API UITab : public UISelectButton { public: - UITab( UISelectButton::CreateParams& Params, UIControl * CtrlOwned ); + UITab( UISelectButton::CreateParams& Params, UIControl * ctrlOwned ); - UIControl * CtrlOwned() const; + UIControl * ctrlOwned() const; virtual ~UITab(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual const String& Text(); + virtual const String& text(); - virtual void Text( const String& text ); + virtual void text( const String& text ); - virtual void Update(); + virtual void update(); protected: UIControl * mCtrlOwned; - virtual Uint32 OnMouseClick( const Vector2i &Pos, const Uint32 Flags ); + virtual Uint32 onMouseClick( const Vector2i &position, const Uint32 flags ); - virtual void OnStateChange(); + virtual void onStateChange(); - void SetRealSize(); + void setRealSize(); - UITabWidget * GetTabWidget(); + UITabWidget * getTabWidget(); }; }} diff --git a/include/eepp/ui/uitabwidget.hpp b/include/eepp/ui/uitabwidget.hpp index 5ac51a155..f1797dd86 100644 --- a/include/eepp/ui/uitabwidget.hpp +++ b/include/eepp/ui/uitabwidget.hpp @@ -30,18 +30,18 @@ class EE_API UITabWidget : public UIComplexControl { { Flags = ( UI_VALIGN_BOTTOM | UI_HALIGN_LEFT | UI_ANCHOR_LEFT | UI_ANCHOR_TOP ); - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); - FontOverColor = Theme->FontOverColor(); - FontSelectedColor = Theme->FontSelectedColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); + FontOverColor = Theme->fontOverColor(); + FontSelectedColor = Theme->fontSelectedColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -69,43 +69,43 @@ class EE_API UITabWidget : public UIComplexControl { virtual ~UITabWidget(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - Uint32 Add( const String& Text, UIControl * CtrlOwned, SubTexture * Icon = NULL ); + Uint32 add( const String& Text, UIControl * CtrlOwned, SubTexture * Icon = NULL ); - Uint32 Add( UITab * Tab ); + Uint32 add( UITab * Tab ); - UITab * GetTab( const Uint32& Index ); + UITab * getTab( const Uint32& Index ); - UITab * GetTab( const String& Text ); + UITab * getTab( const String& Text ); - Uint32 GetTabIndex( UITab * Tab ); + Uint32 getTabIndex( UITab * Tab ); - Uint32 Count() const; + Uint32 count() const; - void Remove( const Uint32& Index ); + void remove( const Uint32& Index ); - void Remove( UITab * Tab ); + void remove( UITab * Tab ); - void RemoveAll(); + void removeAll(); - void Insert( const String& Text, UIControl * CtrlOwned, SubTexture * Icon, const Uint32& Index ); + void insert( const String& Text, UIControl * CtrlOwned, SubTexture * Icon, const Uint32& Index ); - void Insert( UITab * Tab, const Uint32& Index ); + void insert( UITab * Tab, const Uint32& Index ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - UITab * GetSelectedTab() const; + UITab * getSelectedTab() const; - Uint32 GetSelectedTabIndex() const; + Uint32 getSelectedTabIndex() const; - UIComplexControl * TabContainer() const; + UIComplexControl * getTabContainer() const; - UIComplexControl * ControlContainer() const; + UIComplexControl * getControlContainer() const; - virtual void Draw(); + virtual void draw(); protected: friend class UITab; @@ -131,29 +131,29 @@ class EE_API UITabWidget : public UIComplexControl { UITab * mTabSelected; Uint32 mTabSelectedIndex; - void DoAfterSetTheme(); + void doAftersetTheme(); - UITab * CreateTab( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ); + UITab * createTab( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ); - virtual void OnSizeChange(); + virtual void onSizeChange(); - void SetTabSelected( UITab * Tab ); + void setTabSelected( UITab * Tab ); - void SetTabContainerSize(); + void setTabContainerSize(); - void SeContainerSize(); + void seContainerSize(); - void PosTabs(); + void posTabs(); - void ZOrderTabs(); + void zorderTabs(); - void OrderTabs(); + void orderTabs(); - void SelectPrev(); + void selectPrev(); - void SelectNext(); + void selectNext(); - void ApplyThemeToTabs(); + void applyThemeToTabs(); }; }} diff --git a/include/eepp/ui/uitextbox.hpp b/include/eepp/ui/uitextbox.hpp index 58ada58ef..c193ffee8 100644 --- a/include/eepp/ui/uitextbox.hpp +++ b/include/eepp/ui/uitextbox.hpp @@ -16,16 +16,16 @@ class EE_API UITextBox : public UIComplexControl { FontShadowColor( 255, 255, 255, 150 ), FontSelectionBackColor( 150, 150, 150, 150 ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -40,57 +40,57 @@ class EE_API UITextBox : public UIComplexControl { virtual ~UITextBox(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Draw(); + virtual void draw(); - virtual void Alpha( const Float& alpha ); + virtual void alpha( const Float& alpha ); - Graphics::Font * Font() const; + Graphics::Font * font() const; - void Font( Graphics::Font * font ); + void font( Graphics::Font * font ); - virtual const String& Text(); + virtual const String& text(); - virtual void Text( const String& text ); + virtual void text( const String& text ); - const ColorA& Color() const; + const ColorA& color() const; - void Color( const ColorA& color ); + void color( const ColorA& color ); - const ColorA& ShadowColor() const; + const ColorA& shadowColor() const; - void ShadowColor( const ColorA& color ); + void shadowColor( const ColorA& color ); - const ColorA& SelectionBackColor() const; + const ColorA& selectionBackColor() const; - void SelectionBackColor( const ColorA& color ); + void selectionBackColor( const ColorA& color ); - virtual void OnTextChanged(); + virtual void onTextChanged(); - virtual void OnFontChanged(); + virtual void onFontChanged(); - virtual void Padding( const Recti& padding ); + virtual void padding( const Recti& padding ); - const Recti& Padding() const; + const Recti& padding() const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - TextCache * GetTextCache(); + TextCache * getTextCache(); - Float GetTextWidth(); + Float getTextWidth(); - Float GetTextHeight(); + Float getTextHeight(); - const int& GetNumLines() const; + const int& getNumLines() const; - const Vector2f& AlignOffset() const; + const Vector2f& alignOffset() const; - virtual void ShrinkText( const Uint32& MaxWidth ); + virtual void shrinkText( const Uint32& MaxWidth ); - bool IsTextSelectionEnabled() const; + bool isTextSelectionEnabled() const; protected: TextCache * mTextCache; String mString; @@ -102,31 +102,31 @@ class EE_API UITextBox : public UIComplexControl { Int32 mSelCurInit; Int32 mSelCurEnd; - virtual void DrawSelection(); + virtual void drawSelection(); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void AutoShrink(); + virtual void autoShrink(); - virtual void AutoSize(); + virtual void autoSize(); - virtual void AutoAlign(); + virtual void autoAlign(); - virtual Uint32 OnFocusLoss(); + virtual Uint32 onFocusLoss(); - virtual Uint32 OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDoubleClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseDown( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDown( const Vector2i& position, const Uint32 flags ); - virtual void SelCurInit( const Int32& init ); + virtual void selCurInit( const Int32& init ); - virtual void SelCurEnd( const Int32& end ); + virtual void selCurEnd( const Int32& end ); - virtual Int32 SelCurInit(); + virtual Int32 selCurInit(); - virtual Int32 SelCurEnd(); + virtual Int32 selCurEnd(); }; diff --git a/include/eepp/ui/uitextedit.hpp b/include/eepp/ui/uitextedit.hpp index 1cac46811..bf4be1e37 100644 --- a/include/eepp/ui/uitextedit.hpp +++ b/include/eepp/ui/uitextedit.hpp @@ -29,27 +29,27 @@ class EE_API UITextEdit : public UIComplexControl { virtual ~UITextEdit(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - const String& Text() const; + const String& text() const; - void Text( const String& Txt ); + void text( const String& Txt ); - UITextInput * TextInput() const; + UITextInput * getTextInput() const; - UIScrollBar * HScrollBar() const; + UIScrollBar * getHScrollBar() const; - UIScrollBar * VScrollBar() const; + UIScrollBar * getVScrollBar() const; - virtual void Update(); + virtual void update(); - void AllowEditing( const bool& allow ); + void allowEditing( const bool& allow ); - const bool& AllowEditing() const; + const bool& allowEditing() const; protected: UITextInput * mTextInput; UIScrollBar * mHScrollBar; @@ -60,29 +60,29 @@ class EE_API UITextEdit : public UIComplexControl { String mText; bool mSkipValueChange; - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual void OnParentSizeChange( const Vector2i& SizeChange ); + virtual void onParentSizeChange( const Vector2i& SizeChange ); - void OnVScrollValueChange( const UIEvent * Event ); + void onVScrollValueChange( const UIEvent * Event ); - void OnHScrollValueChange( const UIEvent * Event ); + void onHScrollValueChange( const UIEvent * Event ); - void OnInputSizeChange( const UIEvent * Event = NULL ); + void onInputSizeChange( const UIEvent * Event = NULL ); - void OnCursorPosChange( const UIEvent * Event ); + void onCursorPosChange( const UIEvent * Event ); - void AutoPadding(); + void autoPadding(); - void ScrollbarsSet(); + void scrollbarsSet(); - void FixScroll(); + void fixScroll(); - void FixScrollToCursor(); + void fixScrollToCursor(); - void ShrinkText( const Uint32& Width ); + void shrinkText( const Uint32& Width ); }; }} diff --git a/include/eepp/ui/uitextinput.hpp b/include/eepp/ui/uitextinput.hpp index f5785a79d..6768aca17 100644 --- a/include/eepp/ui/uitextinput.hpp +++ b/include/eepp/ui/uitextinput.hpp @@ -30,29 +30,29 @@ class EE_API UITextInput : public UITextBox { virtual ~UITextInput(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Update(); + virtual void update(); - virtual void Draw(); + virtual void draw(); - void PushIgnoredChar( const Uint32& ch ); + void pushIgnoredChar( const Uint32& ch ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - InputTextBuffer * GetInputTextBuffer(); + InputTextBuffer * getInputTextBuffer(); - void AllowEditing( const bool& allow ); + void allowEditing( const bool& allow ); - const bool& AllowEditing() const; + const bool& allowEditing() const; - virtual const String& Text(); + virtual const String& text(); - virtual void Text( const String& text ); + virtual void text( const String& text ); - virtual void ShrinkText( const Uint32& MaxWidth ); + virtual void shrinkText( const Uint32& MaxWidth ); protected: InputTextBuffer mTextBuffer; Float mWaitCursorTime; @@ -61,41 +61,41 @@ class EE_API UITextInput : public UITextBox { bool mAllowEditing; bool mShowingWait; - void ResetWaitCursor(); + void resetWaitCursor(); - virtual void AlignFix(); + virtual void alignFix(); - virtual void AutoSize(); + virtual void autoSize(); - void PrivOnPressEnter(); + void privOnPressEnter(); - void AutoPadding(); + void autoPadding(); - virtual Uint32 OnMouseClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseDoubleClick( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnMouseExit( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseExit( const Vector2i& position, const Uint32 flags ); - virtual Uint32 OnFocus(); + virtual Uint32 onFocus(); - virtual Uint32 OnFocusLoss(); + virtual Uint32 onFocusLoss(); - virtual Uint32 OnPressEnter(); + virtual Uint32 onPressEnter(); - virtual void OnCursorPosChange(); + virtual void onCursorPosChange(); - void DrawWaitingCursor(); + void drawWaitingCursor(); - virtual void UpdateText(); + virtual void updateText(); - virtual void SelCurInit( const Int32& init ); + virtual void selCurInit( const Int32& init ); - virtual void SelCurEnd( const Int32& end ); + virtual void selCurEnd( const Int32& end ); - virtual Int32 SelCurInit(); + virtual Int32 selCurInit(); - virtual Int32 SelCurEnd(); + virtual Int32 selCurEnd(); }; }} diff --git a/include/eepp/ui/uitextinputpassword.hpp b/include/eepp/ui/uitextinputpassword.hpp index 76ccc379b..f4f738ae1 100644 --- a/include/eepp/ui/uitextinputpassword.hpp +++ b/include/eepp/ui/uitextinputpassword.hpp @@ -10,23 +10,23 @@ class UITextInputPassword : public UITextInput public: UITextInputPassword( const UITextInput::CreateParams& Params ); - virtual void Draw(); + virtual void draw(); - virtual const String& Text(); + virtual const String& text(); - virtual void Text( const String& text ); + virtual void text( const String& text ); - TextCache * GetPassCache() const; + TextCache * getPassCache() const; protected: TextCache * mPassCache; - void AlignFix(); + void alignFix(); - void AutoAlign(); + void autoAlign(); - void UpdateText(); + void updateText(); - void UpdatePass( const String& pass ); + void updatePass( const String& pass ); }; }} diff --git a/include/eepp/ui/uitheme.hpp b/include/eepp/ui/uitheme.hpp index 3128a347f..742ef7c54 100644 --- a/include/eepp/ui/uitheme.hpp +++ b/include/eepp/ui/uitheme.hpp @@ -48,19 +48,19 @@ class EE_API UITheme : protected ResourceManager { using ResourceManager::exists; using ResourceManager::existsId; - static UITheme * LoadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtlas * TextureAtlas ); + static UITheme * loadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtlas * getTextureAtlas ); - static UITheme * LoadFromPath( UITheme * tTheme, const std::string& Path, const std::string ImgExt = "png" ); + static UITheme * loadFromPath( UITheme * tTheme, const std::string& Path, const std::string ImgExt = "png" ); - static UITheme * LoadFromTextureAtlas( Graphics::TextureAtlas * TextureAtlas, const std::string& getName, const std::string NameAbbr ); + static UITheme * loadFromTextureAtlas( Graphics::TextureAtlas * getTextureAtlas, const std::string& getName, const std::string NameAbbr ); - static UITheme * LoadFromPath( const std::string& Path, const std::string& getName, const std::string& NameAbbr, const std::string ImgExt = "png" ); + static UITheme * loadFromPath( const std::string& Path, const std::string& getName, const std::string& NameAbbr, const std::string ImgExt = "png" ); - void AddThemeElement( const std::string& Element ); + void addThemeElement( const std::string& Element ); - void AddThemeIcon( const std::string& Icon ); + void addThemeIcon( const std::string& Icon ); - UITheme( const std::string& getName, const std::string& Abbr, Graphics::Font * DefaultFont = NULL ); + UITheme( const std::string& getName, const std::string& abbr, Graphics::Font * defaultFont = NULL ); virtual ~UITheme(); @@ -70,87 +70,87 @@ class EE_API UITheme : protected ResourceManager { const Uint32& getId() const; - const std::string& Abbr() const; + const std::string& abbr() const; virtual UISkin * add( UISkin * Resource ); - void Font( Graphics::Font * Font ); + void font( Graphics::Font * font ); - Graphics::Font * Font() const; + Graphics::Font * font() const; - const ColorA& FontColor() const; + const ColorA& fontColor() const; - const ColorA& FontShadowColor() const; + const ColorA& fontShadowColor() const; - const ColorA& FontOverColor() const; + const ColorA& fontOverColor() const; - const ColorA& FontSelectedColor() const; + const ColorA& fontSelectedColor() const; - void FontColor( const ColorA& Color ); + void fontColor( const ColorA& Color ); - void FontShadowColor( const ColorA& Color ); + void fontShadowColor( const ColorA& Color ); - void FontOverColor( const ColorA& Color ); + void fontOverColor( const ColorA& Color ); - void FontSelectedColor( const ColorA& Color ); + void fontSelectedColor( const ColorA& Color ); - void UseDefaultThemeValues( const bool& Use ); + void useDefaultThemeValues( const bool& Use ); - const bool& UseDefaultThemeValues() const; + const bool& useDefaultThemeValues() const; - Graphics::TextureAtlas * TextureAtlas() const; + Graphics::TextureAtlas * getTextureAtlas() const; - SubTexture * GetIconByName( const std::string& name ); + SubTexture * getIconByName( const std::string& name ); - virtual UIGfx * CreateGfx( SubTexture * SubTexture, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, ColorA SubTextureColor = ColorA(255,255,255,255), EE_RENDER_MODE SubTextureRender = RN_NORMAL ); + virtual UIGfx * createGfx( SubTexture * SubTexture, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, ColorA SubTextureColor = ColorA(255,255,255,255), EE_RENDER_MODE SubTextureRender = RN_NORMAL ); - virtual UISprite * CreateSprite( Sprite * Sprite, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, bool DealloSprite = true, EE_RENDER_MODE SpriteRender = RN_NORMAL ); + virtual UISprite * createSprite( Sprite * Sprite, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, bool DealloSprite = true, EE_RENDER_MODE SpriteRender = RN_NORMAL ); - virtual UICheckBox * CreateCheckBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS ); + virtual UICheckBox * createCheckBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS ); - virtual UIRadioButton * CreateRadioButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS ); + virtual UIRadioButton * createRadioButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS ); - virtual UITextBox * CreateTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + virtual UITextBox * createTextBox( const String& Text = "", UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - virtual UITextEdit * CreateTextEdit( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, UI_SCROLLBAR_MODE HScrollBar = UI_SCROLLBAR_AUTO, UI_SCROLLBAR_MODE VScrollBar = UI_SCROLLBAR_AUTO, bool WordWrap = true ); + virtual UITextEdit * createTextEdit( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, UI_SCROLLBAR_MODE HScrollBar = UI_SCROLLBAR_AUTO, UI_SCROLLBAR_MODE VScrollBar = UI_SCROLLBAR_AUTO, bool WordWrap = true ); - virtual UITextInput * CreateTextInput( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, bool SupportFreeEditing = true, Uint32 MaxLength = 256 ); + virtual UITextInput * createTextInput( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, bool SupportFreeEditing = true, Uint32 MaxLength = 256 ); - virtual UITextInputPassword * CreateTextInputPassword( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, bool SupportFreeEditing = true, Uint32 MaxLength = 256 ); + virtual UITextInputPassword * createTextInputPassword( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, bool SupportFreeEditing = true, Uint32 MaxLength = 256 ); - virtual UITooltip * CreateTooltip( UIControl * TooltipOf, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_PADDING | UI_AUTO_SIZE ); + virtual UITooltip * createTooltip( UIControl * TooltipOf, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_PADDING | UI_AUTO_SIZE ); - virtual UIScrollBar * CreateScrollBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, bool VerticalScrollBar = false ); + virtual UIScrollBar * createScrollBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE, bool VerticalScrollBar = false ); - virtual UISlider * CreateSlider( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool VerticalSlider = false, bool AllowHalfSliderOut = true, bool ExpandBackground = false ); + virtual UISlider * createSlider( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool VerticalSlider = false, bool AllowHalfSliderOut = true, bool ExpandBackground = false ); - virtual UISpinBox * CreateSpinBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, Float DefaultValue = 0.f, bool AllowDotsInNumbers = true ); + virtual UISpinBox * createSpinBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, Float DefaultValue = 0.f, bool AllowDotsInNumbers = true ); - virtual UIComboBox * CreateComboBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); + virtual UIComboBox * createComboBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); - virtual UIDropDownList * CreateDropDownList( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); + virtual UIDropDownList * createDropDownList( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING, Uint32 MinNumVisibleItems = 6, bool PopUpToMainControl = false, UIListBox * ListBox = NULL ); - virtual UIListBox * CreateListBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING, bool SmoothScroll = true, Uint32 RowHeight = 0, UI_SCROLLBAR_MODE VScrollMode = UI_SCROLLBAR_AUTO, UI_SCROLLBAR_MODE HScrollMode = UI_SCROLLBAR_AUTO, Recti PaddingContainer = Recti() ); + virtual UIListBox * createListBox( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING, bool SmoothScroll = true, Uint32 RowHeight = 0, UI_SCROLLBAR_MODE VScrollMode = UI_SCROLLBAR_AUTO, UI_SCROLLBAR_MODE HScrollMode = UI_SCROLLBAR_AUTO, Recti PaddingContainer = Recti() ); - virtual UIMenu * CreateMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 0, Uint32 MinSpaceForIcons = 0, Uint32 MinRightMargin = 0 ); + virtual UIMenu * createMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 0, Uint32 MinSpaceForIcons = 0, Uint32 MinRightMargin = 0 ); - virtual UIPopUpMenu * CreatePopUpMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 0, Uint32 MinSpaceForIcons = 0, Uint32 MinRightMargin = 0 ); + virtual UIPopUpMenu * createPopUpMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE | UI_AUTO_PADDING, Uint32 RowHeight = 0, Recti PaddingContainer = Recti(), Uint32 MinWidth = 0, Uint32 MinSpaceForIcons = 0, Uint32 MinRightMargin = 0 ); - virtual UIProgressBar * CreateProgressBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool DisplayPercent = false, bool VerticalExpand = false, Vector2f MovementSpeed = Vector2f( 64, 0 ), Rectf FillerMargin = Rectf() ); + virtual UIProgressBar * createProgressBar( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, bool DisplayPercent = false, bool VerticalExpand = false, Vector2f MovementSpeed = Vector2f( 64, 0 ), Rectf FillerMargin = Rectf() ); - virtual UIPushButton * CreatePushButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, SubTexture * Icon = NULL, Int32 IconHorizontalMargin = 0, bool IconAutoMargin = true ); + virtual UIPushButton * createPushButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, SubTexture * Icon = NULL, Int32 IconHorizontalMargin = 0, bool IconAutoMargin = true ); - virtual UISelectButton * CreateSelectButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, SubTexture * Icon = NULL, Int32 IconHorizontalMargin = 0, bool IconAutoMargin = true ); + virtual UISelectButton * createSelectButton( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, SubTexture * Icon = NULL, Int32 IconHorizontalMargin = 0, bool IconAutoMargin = true ); - virtual UIWinMenu * CreateWinMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, Uint32 MarginBetweenButtons = 0, Uint32 ButtonMargin = 4, Uint32 MenuHeight = 0, Uint32 FirstButtonMargin = 1 ); + virtual UIWinMenu * createWinMenu( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS, Uint32 MarginBetweenButtons = 0, Uint32 ButtonMargin = 4, Uint32 MenuHeight = 0, Uint32 FirstButtonMargin = 1 ); - virtual UIWindow * CreateWindow( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); + virtual UIWindow * createWindow( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); - virtual UICommonDialog * CreateCommonDialog( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255, Uint32 CDLFlags = UI_CDL_DEFAULT_FLAGS, std::string DefaultFilePattern = "*", std::string DefaultDirectory = Sys::getProcessPath() ); + virtual UICommonDialog * createCommonDialog( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255, Uint32 CDLFlags = UI_CDL_DEFAULT_FLAGS, std::string DefaultFilePattern = "*", std::string DefaultDirectory = Sys::getProcessPath() ); - virtual UIMessageBox * CreateMessageBox( UI_MSGBOX_TYPE Type = MSGBOX_OKCANCEL, const String& Message = String(), Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); + virtual UIMessageBox * createMessageBox( UI_MSGBOX_TYPE Type = MSGBOX_OKCANCEL, const String& Message = String(), Uint32 WinFlags = UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED, Sizei MinWindowSize = Sizei(0,0), Uint8 BaseAlpha = 255 ); - virtual UITabWidget * CreateTabWidget( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_CONTROL_DEFAULT_ANCHOR, const bool& TabsClosable = false, const bool& SpecialBorderTabs = false , const Int32& TabSeparation = 0, const Uint32& MaxTextLength = 30, const Uint32& TabWidgetHeight = 0, const Uint32& TabTextAlign = UI_HALIGN_CENTER | UI_VALIGN_CENTER, const Uint32& MinTabWidth = 32, const Uint32& MaxTabWidth = 210 ); + virtual UITabWidget * createTabWidget( UIControl * Parent = NULL, const Sizei& Size = Sizei(), const Vector2i& Pos = Vector2i(), const Uint32& Flags = UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_CONTROL_DEFAULT_ANCHOR, const bool& TabsClosable = false, const bool& SpecialBorderTabs = false , const Int32& TabSeparation = 0, const Uint32& MaxTextLength = 30, const Uint32& TabWidgetHeight = 0, const Uint32& TabTextAlign = UI_HALIGN_CENTER | UI_VALIGN_CENTER, const Uint32& MinTabWidth = 32, const Uint32& MaxTabWidth = 210 ); protected: std::string mName; Uint32 mNameHash; @@ -161,15 +161,15 @@ class EE_API UITheme : protected ResourceManager { ColorA mFontShadowColor; ColorA mFontOverColor; ColorA mFontSelectedColor; - bool mUseDefaultThemeValues; + bool mUsedefaultThemeValues; std::list mUIElements; std::list mUIIcons; - void TextureAtlas( Graphics::TextureAtlas * SG ); + void getTextureAtlas( Graphics::TextureAtlas * SG ); - static bool SearchFilesOfElement( Graphics::TextureAtlas * SG, const std::string& Path, std::string Element, Uint32& IsComplex, const std::string ImgExt ); + static bool searchFilesOfElement( Graphics::TextureAtlas * SG, const std::string& Path, std::string Element, Uint32& IsComplex, const std::string ImgExt ); - static bool SearchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Element, Uint32& IsComplex ); + static bool searchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Element, Uint32& IsComplex ); }; }} diff --git a/include/eepp/ui/uithememanager.hpp b/include/eepp/ui/uithememanager.hpp index 5187a94eb..c9628a841 100644 --- a/include/eepp/ui/uithememanager.hpp +++ b/include/eepp/ui/uithememanager.hpp @@ -14,62 +14,62 @@ class EE_API UIThemeManager : public ResourceManager { public: virtual ~UIThemeManager(); - void DefaultFont( Font * Font ); + void defaultFont( Font * Font ); - Font * DefaultFont() const; + Font * defaultFont() const; - void SetTheme( const std::string& Theme ); + void setTheme( const std::string& Theme ); - void SetTheme( UITheme * Theme ); + void setTheme( UITheme * Theme ); - void DefaultTheme( UITheme * Theme ); + void defaultTheme( UITheme * Theme ); - void DefaultTheme( const std::string& Theme ); + void defaultTheme( const std::string& Theme ); - UITheme * DefaultTheme() const; + UITheme * defaultTheme() const; - void ApplyDefaultTheme( UIControl * Control ); + void applyDefaultTheme( UIControl * Control ); - void AutoApplyDefaultTheme( const bool& apply ); + void autoApplyDefaultTheme( const bool& apply ); - const bool& AutoApplyDefaultTheme() const; + const bool& autoApplyDefaultTheme() const; - void DefaultEffectsEnabled( const bool& Enabled ); + void defaultEffectsEnabled( const bool& Enabled ); - const bool& DefaultEffectsEnabled() const; + const bool& defaultEffectsEnabled() const; - const Time& ControlsFadeInTime() const; + const Time& controlsFadeInTime() const; - void ControlsFadeInTime( const Time & Time ); + void controlsFadeInTime( const Time & Time ); - const Time& ControlsFadeOutTime() const; + const Time& controlsFadeOutTime() const; - void ControlsFadeOutTime( const Time& Time ); + void controlsFadeOutTime( const Time& Time ); - void TooltipTimeToShow( const Time & Time ); + void tooltipTimeToShow( const Time & Time ); - const Time& TooltipTimeToShow() const; + const Time& tooltipTimeToShow() const; - void TooltipFollowMouse( const bool& Follow ); + void tooltipFollowMouse( const bool& Follow ); - const bool& TooltipFollowMouse() const; + const bool& tooltipFollowMouse() const; - void CursorSize( const Sizei& Size ); + void cursorSize( const Sizei& Size ); - const Sizei& CursorSize() const; + const Sizei& cursorSize() const; protected: Font * mFont; UITheme * mThemeDefault; - bool mAutoApplyDefaultTheme; + bool mautoApplyDefaultTheme; bool mEnableDefaultEffects; Time mFadeInTime; Time mFadeOutTime; - Time mTooltipTimeToShow; - bool mTooltipFollowMouse; + Time mtooltipTimeToShow; + bool mtooltipFollowMouse; - Sizei mCursorSize; + Sizei mcursorSize; UIThemeManager(); }; diff --git a/include/eepp/ui/uitooltip.hpp b/include/eepp/ui/uitooltip.hpp index 96c817b15..3d218a5de 100644 --- a/include/eepp/ui/uitooltip.hpp +++ b/include/eepp/ui/uitooltip.hpp @@ -19,16 +19,16 @@ class EE_API UITooltip : public UIControlAnim { FontColor( 0, 0, 0, 255 ), FontShadowColor( 255, 255, 255, 150 ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } inline ~CreateParams() {} @@ -43,59 +43,59 @@ class EE_API UITooltip : public UIControlAnim { virtual ~UITooltip(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void Show(); + void show(); - void Hide(); + void hide(); - virtual void Draw(); + virtual void draw(); - virtual void Alpha( const Float& alpha ); + virtual void alpha( const Float& alpha ); - Graphics::Font * Font() const; + Graphics::Font * font() const; - void Font( Graphics::Font * font ); + void font( Graphics::Font * font ); - virtual const String& Text(); + virtual const String& text(); - virtual void Text( const String& text ); + virtual void text( const String& text ); - const ColorA& Color() const; + const ColorA& color() const; - void Color( const ColorA& color ); + void color( const ColorA& color ); - const ColorA& ShadowColor() const; + const ColorA& shadowColor() const; - void ShadowColor( const ColorA& color ); + void shadowColor( const ColorA& color ); - virtual void OnTextChanged(); + virtual void onTextChanged(); - virtual void OnFontChanged(); + virtual void onFontChanged(); - virtual void Padding( const Recti& padding ); + virtual void padding( const Recti& padding ); - const Recti& Padding() const; + const Recti& padding() const; - TextCache * GetTextCache(); + TextCache * getTextCache(); - Float GetTextWidth(); + Float getTextWidth(); - Float GetTextHeight(); + Float getTextHeight(); - const int& GetNumLines() const; + const int& getNumLines() const; - const Vector2f& AlignOffset() const; + const Vector2f& alignOffset() const; - void TooltipTime( const Time& Time ); + void tooltipTime( const Time& Time ); - void TooltipTimeAdd( const Time & Time ); + void tooltipTimeAdd( const Time & Time ); - const Time & TooltipTime() const; + const Time & tooltipTime() const; protected: TextCache * mTextCache; ColorA mFontColor; @@ -105,13 +105,13 @@ class EE_API UITooltip : public UIControlAnim { Time mTooltipTime; UIControl * mTooltipOf; - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void AutoSize(); + virtual void autoSize(); - virtual void AutoAlign(); + virtual void autoAlign(); - virtual void AutoPadding(); + virtual void autoPadding(); }; }} diff --git a/include/eepp/ui/uiwindow.hpp b/include/eepp/ui/uiwindow.hpp index bda9947f8..d839c0ed7 100644 --- a/include/eepp/ui/uiwindow.hpp +++ b/include/eepp/ui/uiwindow.hpp @@ -42,61 +42,61 @@ class EE_API UIWindow : public UIComplexControl { virtual ~UIWindow(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - virtual void Size( const Sizei& Size ); + virtual void size( const Sizei& size ); - void Size( const Int32& Width, const Int32& Height ); + void size( const Int32& Width, const Int32& Height ); - const Sizei& Size(); + const Sizei& size(); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - virtual Uint32 OnMessage( const UIMessage *Msg ); + virtual Uint32 onMessage( const UIMessage *Msg ); - UIControlAnim * Container() const; + UIControlAnim * getContainer() const; - UIComplexControl * ButtonClose() const; + UIComplexControl * getButtonClose() const; - UIComplexControl * ButtonMaximize() const; + UIComplexControl * getButtonMaximize() const; - UIComplexControl * ButtonMinimize() const; + UIComplexControl * getButtonMinimize() const; - virtual void Draw(); + virtual void draw(); - virtual bool Show(); + virtual bool show(); virtual bool Hide(); - virtual void Update(); + virtual void update(); virtual void CloseWindow(); - virtual void Close(); + virtual void close(); - void BaseAlpha( const Uint8& Alpha ); + void baseAlpha( const Uint8& alpha ); - const Uint8& BaseAlpha() const; + const Uint8& baseAlpha() const; - void Title( const String& Text ); + void title( const String& Text ); - String Title() const; + String title() const; - UITextBox * TitleTextBox() const; + UITextBox * titleTextBox() const; - bool AddShortcut( const Uint32& KeyCode, const Uint32& Mod, UIPushButton * Button ); + bool addShortcut( const Uint32& KeyCode, const Uint32& Mod, UIPushButton * Button ); - bool RemoveShortcut( const Uint32& KeyCode, const Uint32& Mod ); + bool removeShortcut( const Uint32& KeyCode, const Uint32& Mod ); - bool IsModal(); + bool isModal(); - UIControlAnim * GetModalControl() const; + UIControlAnim * getModalControl() const; - void Maximize(); + void maximize(); - bool IsMaximixable(); + bool isMaximixable(); protected: class KeyboardShortcut { public: @@ -167,53 +167,53 @@ class EE_API UIWindow : public UIComplexControl { bool mDecoAutoSize; bool mBorderAutoSize; - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnKeyDown( const UIEventKey &Event ); + virtual Uint32 onKeyDown( const UIEventKey &Event ); - void ButtonCloseClick( const UIEvent * Event ); + void buttonCloseClick( const UIEvent * Event ); - void ButtonMaximizeClick( const UIEvent * Event ); + void buttonMaximizeClick( const UIEvent * Event ); - void ButtonMinimizeClick( const UIEvent * Event ); + void buttonMinimizeClick( const UIEvent * Event ); - void ContainerPosChange( const UIEvent * Event ); + void containerPosChange( const UIEvent * Event ); - void FixChildsSize(); + void fixChildsSize(); - void DoResize ( const UIMessage * Msg ); + void doResize ( const UIMessage * Msg ); - void DecideResizeType( UIControl * Control ); + void decideResizeType( UIControl * Control ); - void TryResize( const UI_RESIZE_TYPE& Type ); + void tryResize( const UI_RESIZE_TYPE& getType ); - void EndResize(); + void endResize(); - void UpdateResize(); + void updateResize(); - void InternalSize( Sizei Size ); + void internalSize( Sizei size ); - void InternalSize( const Int32& w, const Int32& h ); + void internalSize( const Int32& w, const Int32& h ); - void GetMinWinSize(); + void getMinWinSize(); - void FixTitleSize(); + void fixTitleSize(); - Uint32 OnMouseDoubleClick( const Vector2i &Pos, const Uint32 Flags ); + Uint32 onMouseDoubleClick( const Vector2i &position, const Uint32 flags ); - void CheckShortcuts( const Uint32& KeyCode, const Uint32& Mod ); + void checkShortcuts( const Uint32& KeyCode, const Uint32& Mod ); - KeyboardShortcuts::iterator ExistsShortcut( const Uint32& KeyCode, const Uint32& Mod ); + KeyboardShortcuts::iterator existsShortcut( const Uint32& KeyCode, const Uint32& Mod ); - void CreateModalControl(); + void createModalControl(); - void EnableByModal(); + void enableByModal(); - void DisableByModal(); + void disableByModal(); - void ResizeCursor(); + void resizeCursor(); }; }} diff --git a/include/eepp/ui/uiwinmenu.hpp b/include/eepp/ui/uiwinmenu.hpp index 0ea723403..1c8bac812 100644 --- a/include/eepp/ui/uiwinmenu.hpp +++ b/include/eepp/ui/uiwinmenu.hpp @@ -24,18 +24,18 @@ class EE_API UIWinMenu : public UIComplexControl { MenuHeight(0), FirstButtonMargin(1) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - Font = Theme->Font(); - FontColor = Theme->FontColor(); - FontShadowColor = Theme->FontShadowColor(); - FontOverColor = Theme->FontOverColor(); - FontSelectedColor = Theme->FontSelectedColor(); + Font = Theme->font(); + FontColor = Theme->fontColor(); + FontShadowColor = Theme->fontShadowColor(); + FontOverColor = Theme->fontOverColor(); + FontSelectedColor = Theme->fontSelectedColor(); } if ( NULL == Font ) - Font = UIThemeManager::instance()->DefaultFont(); + Font = UIThemeManager::instance()->defaultFont(); } Graphics::Font * Font; @@ -53,33 +53,33 @@ class EE_API UIWinMenu : public UIComplexControl { virtual ~UIWinMenu(); - virtual Uint32 Type() const; + virtual Uint32 getType() const; - virtual bool IsType( const Uint32& type ) const; + virtual bool isType( const Uint32& type ) const; - void AddMenuButton( const String& ButtonText, UIPopUpMenu * Menu ); + void addMenuButton( const String& ButtonText, UIPopUpMenu * Menu ); - void RemoveMenuButton( const String& ButtonText ); + void removeMenuButton( const String& ButtonText ); - virtual void SetTheme( UITheme * Theme ); + virtual void setTheme( UITheme * Theme ); - void FontColor( const ColorA& Color ); + void fontColor( const ColorA& Color ); - const ColorA& FontColor() const; + const ColorA& fontColor() const; - void FontOverColor( const ColorA& Color ); + void fontOverColor( const ColorA& Color ); - const ColorA& FontOverColor() const; + const ColorA& fontOverColor() const; - void FontSelectedColor( const ColorA& Color ); + void fontSelectedColor( const ColorA& Color ); - const ColorA& FontSelectedColor() const; + const ColorA& fontSelectedColor() const; - Graphics::Font * Font() const; + Graphics::Font * font() const; - UISelectButton * GetButton( const String& ButtonText ); + UISelectButton * getButton( const String& ButtonText ); - UIPopUpMenu * GetPopUpMenu( const String& ButtonText ); + UIPopUpMenu * getPopUpMenu( const String& ButtonText ); protected: typedef std::list< std::pair< UISelectButton *, UIPopUpMenu * > > WinMenuList; @@ -95,21 +95,21 @@ class EE_API UIWinMenu : public UIComplexControl { Uint32 mMenuHeight; WinMenuList mButtons; - void RefreshButtons(); + void refreshButtons(); - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual void OnComplexControlFocusLoss(); + virtual void onComplexControlFocusLoss(); - UIPopUpMenu * GetMenuFromButton( UISelectButton * Button ); + UIPopUpMenu * getMenuFromButton( UISelectButton * Button ); - bool IsPopUpMenuChild( UIControl * Ctrl ); + bool isPopUpMenuChild( UIControl * Ctrl ); - void OnMenuFocusLoss( const UIEvent * Event ); + void onMenuFocusLoss( const UIEvent * Event ); - void UnselectButtons(); + void unselectButtons(); - void DestroyMenues(); + void destroyMenues(); }; }} diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 709ab09c2..6ca114ccb 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/src/eepp/gaming/mapeditor/mapeditor.cpp b/src/eepp/gaming/mapeditor/mapeditor.cpp index dc6cb338d..b8de55ac6 100644 --- a/src/eepp/gaming/mapeditor/mapeditor.cpp +++ b/src/eepp/gaming/mapeditor/mapeditor.cpp @@ -41,7 +41,7 @@ namespace EE { namespace Gaming { MapEditor::MapEditor( UIWindow * AttatchTo, const MapEditorCloseCb& callback ) : mUIWindow( AttatchTo ), - mTheme( UIThemeManager::instance()->DefaultTheme() ), + mTheme( UIThemeManager::instance()->defaultTheme() ), mUIMap( NULL ), mCloseCb( callback ), mGOTypeList( NULL ), @@ -56,18 +56,18 @@ MapEditor::MapEditor( UIWindow * AttatchTo, const MapEditorCloseCb& callback ) : } if ( NULL == mUIWindow ) { - mUIWindow = UIManager::instance()->MainControl(); - mUIWindow->SetSkinFromTheme( mTheme, "winback" ); + mUIWindow = UIManager::instance()->mainControl(); + mUIWindow->setSkinFromTheme( mTheme, "winback" ); } - if ( UIManager::instance()->MainControl() == mUIWindow ) { + if ( UIManager::instance()->mainControl() == mUIWindow ) { mUIContainer = mUIWindow; } else { - mUIContainer = mUIWindow->Container(); + mUIContainer = mUIWindow->getContainer(); } - mUIWindow->Title( "Map Editor" ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapEditor::WindowClose ) ); + mUIWindow->title( "Map Editor" ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapEditor::WindowClose ) ); CreateME(); } @@ -84,53 +84,53 @@ void MapEditor::CreateME() { } void MapEditor::CreateWinMenu() { - UIWinMenu * WinMenu = mTheme->CreateWinMenu( mUIContainer ); + UIWinMenu * WinMenu = mTheme->createWinMenu( mUIContainer ); - mTileBox = mTheme->CreateTextBox( "", mUIContainer, Sizei(), Vector2i(), UI_HALIGN_RIGHT | UI_VALIGN_CENTER | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT ); - mTileBox->Size( 100, WinMenu->Size().height() ); - mTileBox->Pos( Vector2i( mUIContainer->Size().width() - mTileBox->Size().width(), 0 ) ); - mTileBox->UpdateAnchorsDistances(); + mTileBox = mTheme->createTextBox( "", mUIContainer, Sizei(), Vector2i(), UI_HALIGN_RIGHT | UI_VALIGN_CENTER | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT ); + mTileBox->size( 100, WinMenu->size().height() ); + mTileBox->position( Vector2i( mUIContainer->size().width() - mTileBox->size().width(), 0 ) ); + mTileBox->updateAnchorsDistances(); - UIPopUpMenu * PU1 = mTheme->CreatePopUpMenu( mUIContainer ); - PU1->Add( "New...", mTheme->GetIconByName( "document-new" ) ); - PU1->Add( "Open...", mTheme->GetIconByName( "document-open" ) ); + UIPopUpMenu * PU1 = mTheme->createPopUpMenu( mUIContainer ); + PU1->Add( "New...", mTheme->getIconByName( "document-new" ) ); + PU1->Add( "Open...", mTheme->getIconByName( "document-open" ) ); PU1->AddSeparator(); - PU1->Add( "Save", mTheme->GetIconByName( "document-save" ) ); - PU1->Add( "Save As...", mTheme->GetIconByName( "document-save-as" ) ); + PU1->Add( "Save", mTheme->getIconByName( "document-save" ) ); + PU1->Add( "Save As...", mTheme->getIconByName( "document-save-as" ) ); PU1->AddSeparator(); - PU1->Add( "Close", mTheme->GetIconByName( "document-close" ) ); + PU1->Add( "Close", mTheme->getIconByName( "document-close" ) ); PU1->AddSeparator(); - PU1->Add( "Quit", mTheme->GetIconByName( "quit" ) ); + PU1->Add( "Quit", mTheme->getIconByName( "quit" ) ); - PU1->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::FileMenuClick ) ); - WinMenu->AddMenuButton( "File", PU1 ); + PU1->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::FileMenuClick ) ); + WinMenu->addMenuButton( "File", PU1 ); - UIPopUpMenu * PU3 = mTheme->CreatePopUpMenu( mUIContainer ); + UIPopUpMenu * PU3 = mTheme->createPopUpMenu( mUIContainer ); mChkShowGrid = reinterpret_cast( PU3->GetItem( PU3->AddCheckBox( "Show Grid" ) ) ); - mChkShowGrid->Active( true ); + mChkShowGrid->active( true ); mChkMarkTileOver = reinterpret_cast( PU3->GetItem( PU3->AddCheckBox( "Mark Tile Over" ) ) ); mChkShowBlocked = reinterpret_cast( PU3->GetItem( PU3->AddCheckBox( "Show Blocked" ) ) ); PU3->AddSeparator(); - mUIWindow->AddShortcut( KEY_KP_PLUS , KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Zoom In", mTheme->GetIconByName( "zoom-in" ) ) ) ) ); - mUIWindow->AddShortcut( KEY_KP_MINUS, KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Zoom Out", mTheme->GetIconByName( "zoom-out" ) ) ) ) ); - mUIWindow->AddShortcut( KEY_KP0 , KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Normal Size", mTheme->GetIconByName( "zoom-original" ) ) ) ) ); + mUIWindow->addShortcut( KEY_KP_PLUS , KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Zoom In", mTheme->getIconByName( "zoom-in" ) ) ) ) ); + mUIWindow->addShortcut( KEY_KP_MINUS, KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Zoom Out", mTheme->getIconByName( "zoom-out" ) ) ) ) ); + mUIWindow->addShortcut( KEY_KP0 , KEYMOD_CTRL, reinterpret_cast ( PU3->GetItem( PU3->Add( "Normal Size", mTheme->getIconByName( "zoom-original" ) ) ) ) ); PU3->AddSeparator(); - PU3->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::ViewMenuClick ) ); - WinMenu->AddMenuButton( "View", PU3 ); + PU3->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::ViewMenuClick ) ); + WinMenu->addMenuButton( "View", PU3 ); - UIPopUpMenu * PU4 = mTheme->CreatePopUpMenu( mUIContainer ); + UIPopUpMenu * PU4 = mTheme->createPopUpMenu( mUIContainer ); PU4->Add( "Properties..." ); PU4->Add( "Resize..." ); - PU4->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::MapMenuClick ) ); - WinMenu->AddMenuButton( "Map", PU4 ); + PU4->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::MapMenuClick ) ); + WinMenu->addMenuButton( "Map", PU4 ); - UIPopUpMenu * PU5 = mTheme->CreatePopUpMenu( mUIContainer ); + UIPopUpMenu * PU5 = mTheme->createPopUpMenu( mUIContainer ); PU5->Add( "Add Tile Layer..." ); PU5->Add( "Add Object Layer..." ); PU5->AddSeparator(); @@ -150,45 +150,45 @@ void MapEditor::CreateWinMenu() { LayerChkBoxIndex = PU5->AddCheckBox( "Visible" ); mLayerChkVisible = reinterpret_cast ( PU5->GetItem( LayerChkBoxIndex ) ); - PU5->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::LayerMenuClick ) ); - WinMenu->AddMenuButton( "Layer", PU5 ); + PU5->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::LayerMenuClick ) ); + WinMenu->addMenuButton( "Layer", PU5 ); - UIPopUpMenu * PU6 = mTheme->CreatePopUpMenu( mUIContainer ); + UIPopUpMenu * PU6 = mTheme->createPopUpMenu( mUIContainer ); PU6->Add( "New Texture Atlas..." ); PU6->Add( "Add External Texture Atlas..." ); - WinMenu->AddMenuButton( "Atlases", PU6 ); - PU6->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::MapMenuClick ) ); + WinMenu->addMenuButton( "Atlases", PU6 ); + PU6->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::MapMenuClick ) ); UIComplexControl::CreateParams Params; Params.Parent( mUIContainer ); - Params.PosSet( 0, WinMenu->Size().height() ); - Params.SizeSet( mUIContainer->Size().width(), mUIContainer->Size().height() - WinMenu->Size().height() ); + Params.PosSet( 0, WinMenu->size().height() ); + Params.SizeSet( mUIContainer->size().width(), mUIContainer->size().height() - WinMenu->size().height() ); Params.Flags = UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_REPORT_SIZE_CHANGE_TO_CHILDS; mWinContainer = eeNew( UIComplexControl, ( Params ) ); - mWinContainer->Visible( true ); - mWinContainer->Enabled( true ); + mWinContainer->visible( true ); + mWinContainer->enabled( true ); } void MapEditor::CreateETGMenu() { Int32 Width = 200; Int32 DistToBorder = 5; - Int32 ContPosX = mWinContainer->Size().width() - Width - DistToBorder; + Int32 ContPosX = mWinContainer->size().width() - Width - DistToBorder; Int32 DistFromTopMenu = 4; UIComplexControl::CreateParams CParams; CParams.Parent( mWinContainer ); - CParams.SizeSet( Sizei( Width + DistToBorder, mWinContainer->Size().height() ) ); + CParams.SizeSet( Sizei( Width + DistToBorder, mWinContainer->size().height() ) ); CParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mSubTextureCont = eeNew( UIComplexControl, ( CParams ) ); - mSubTextureCont->Enabled( true ); - mSubTextureCont->Visible( true ); + mSubTextureCont->enabled( true ); + mSubTextureCont->visible( true ); mLightCont = eeNew( UIComplexControl, ( CParams ) ); mObjectCont = eeNew( UIComplexControl, ( CParams ) ); - mTabWidget = mTheme->CreateTabWidget( mWinContainer, Sizei( Width + DistToBorder, mWinContainer->Size().height() - DistFromTopMenu ), Vector2i( ContPosX, DistFromTopMenu ), UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM ); - mTabWidget->AddEventListener( UIEvent::EventOnTabSelected, cb::Make1( this, &MapEditor::OnTabSelected ) ); + mTabWidget = mTheme->createTabWidget( mWinContainer, Sizei( Width + DistToBorder, mWinContainer->size().height() - DistFromTopMenu ), Vector2i( ContPosX, DistFromTopMenu ), UI_HALIGN_CENTER | UI_VALIGN_BOTTOM | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM ); + mTabWidget->addEventListener( UIEvent::EventOnTabSelected, cb::Make1( this, &MapEditor::OnTabSelected ) ); CreateTabs(); CreateLighContainer(); @@ -199,21 +199,21 @@ void MapEditor::CreateETGMenu() { } void MapEditor::CreateTabs() { - mTabWidget->RemoveAll(); - mTabWidget->Add( "Sprites", mSubTextureCont ); + mTabWidget->removeAll(); + mTabWidget->add( "Sprites", mSubTextureCont ); if ( NULL != mUIMap && NULL != mUIMap->Map() ) { if ( mUIMap->Map()->LightsEnabled() ) { - mTabWidget->Add( "Lights", mLightCont ); + mTabWidget->add( "Lights", mLightCont ); } } - mTabWidget->Add( "Objects", mObjectCont ); + mTabWidget->add( "Objects", mObjectCont ); } void MapEditor::OnTabSelected( const UIEvent * Event ) { if ( NULL != mUIMap ) { - switch ( mTabWidget->GetSelectedTabIndex() ) { + switch ( mTabWidget->getSelectedTabIndex() ) { case 0: mUIMap->EditingDisabled(); break; @@ -232,92 +232,92 @@ void MapEditor::FillGotyList() { items.push_back( "SubTexture" ); items.push_back( "SubTextureEx" ); items.push_back( "Sprite" ); - mGOTypeList->ListBox()->Clear(); - mGOTypeList->ListBox()->AddListBoxItems( items ); - mGOTypeList->ListBox()->SetSelected(0); + mGOTypeList->getListBox()->clear(); + mGOTypeList->getListBox()->addListBoxItems( items ); + mGOTypeList->getListBox()->setSelected(0); } void MapEditor::CreateSubTextureContainer( Int32 Width ) { UITextBox * Txt; Uint32 TxtFlags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP | UI_DRAW_SHADOW; - Txt = mTheme->CreateTextBox( "Add Game Object as...", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 4 ), TxtFlags ); + Txt = mTheme->createTextBox( "Add Game Object as...", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 4 ), TxtFlags ); - mGOTypeList = mTheme->CreateDropDownList( mSubTextureCont, Sizei( Width - 26, 21 ), Vector2i( TAB_CONT_X_DIST, Txt->Pos().y + Txt->Size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); - mGOTypeList->AddEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnTypeChange ) ); + mGOTypeList = mTheme->createDropDownList( mSubTextureCont, Sizei( Width - 26, 21 ), Vector2i( TAB_CONT_X_DIST, Txt->position().y + Txt->size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); + mGOTypeList->addEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnTypeChange ) ); FillGotyList(); - mBtnGOTypeAdd = mTheme->CreatePushButton( mSubTextureCont, Sizei( 24, 21 ), Vector2i( mGOTypeList->Pos().x + mGOTypeList->Size().width() + 2, mGOTypeList->Pos().y ), UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mTheme->GetIconByName( "add" ) ); - mBtnGOTypeAdd->TooltipText( "Adds a new game object type\nunknown by the map editor." ); - mBtnGOTypeAdd->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::AddNewGOType ) ); + mBtnGOTypeAdd = mTheme->createPushButton( mSubTextureCont, Sizei( 24, 21 ), Vector2i( mGOTypeList->position().x + mGOTypeList->size().width() + 2, mGOTypeList->position().y ), UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mTheme->getIconByName( "add" ) ); + mBtnGOTypeAdd->tooltipText( "Adds a new game object type\nunknown by the map editor." ); + mBtnGOTypeAdd->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::AddNewGOType ) ); - if ( NULL == mBtnGOTypeAdd->Icon()->SubTexture() ) - mBtnGOTypeAdd->Text( "..." ); + if ( NULL == mBtnGOTypeAdd->icon()->subTexture() ) + mBtnGOTypeAdd->text( "..." ); - Txt = mTheme->CreateTextBox( "Layers:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mGOTypeList->Pos().y + mGOTypeList->Size().height() + 4 ), TxtFlags ); + Txt = mTheme->createTextBox( "Layers:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mGOTypeList->position().y + mGOTypeList->size().height() + 4 ), TxtFlags ); - mLayerList = mTheme->CreateDropDownList( mSubTextureCont, Sizei( Width, 21 ), Vector2i( TAB_CONT_X_DIST, Txt->Pos().y + Txt->Size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); - mLayerList->AddEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnLayerSelect ) ); + mLayerList = mTheme->createDropDownList( mSubTextureCont, Sizei( Width, 21 ), Vector2i( TAB_CONT_X_DIST, Txt->position().y + Txt->size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); + mLayerList->addEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnLayerSelect ) ); - Txt = mTheme->CreateTextBox( "Game Object Flags:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mLayerList->Pos().y + mLayerList->Size().height() + 4 ), TxtFlags ); + Txt = mTheme->createTextBox( "Game Object Flags:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mLayerList->position().y + mLayerList->size().height() + 4 ), TxtFlags ); Uint32 ChkFlags = UI_CONTROL_DEFAULT_ALIGN | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; - mChkMirrored = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( TAB_CONT_X_DIST, Txt->Pos().y + Txt->Size().height() + 4 ), ChkFlags ); - mChkMirrored->Text( "Mirrored" ); - mChkMirrored->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickMirrored ) ); + mChkMirrored = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( TAB_CONT_X_DIST, Txt->position().y + Txt->size().height() + 4 ), ChkFlags ); + mChkMirrored->text( "Mirrored" ); + mChkMirrored->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickMirrored ) ); - mChkFliped = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkMirrored->Pos().x + mChkMirrored->Size().width() + 32, mChkMirrored->Pos().y ), ChkFlags ); - mChkFliped->Text( "Fliped" ); - mChkFliped->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickFliped ) ); + mChkFliped = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkMirrored->position().x + mChkMirrored->size().width() + 32, mChkMirrored->position().y ), ChkFlags ); + mChkFliped->text( "Fliped" ); + mChkFliped->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickFliped ) ); - mChkBlocked = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkMirrored->Pos().x, mChkMirrored->Pos().y + mChkMirrored->Size().height() + 4 ), ChkFlags ); - mChkBlocked->Text( "Blocked" ); - mChkBlocked->TooltipText( "Blocks the tile occupied by the sprite." ); - mChkBlocked->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickBlocked ) ); + mChkBlocked = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkMirrored->position().x, mChkMirrored->position().y + mChkMirrored->size().height() + 4 ), ChkFlags ); + mChkBlocked->text( "Blocked" ); + mChkBlocked->tooltipText( "Blocks the tile occupied by the sprite." ); + mChkBlocked->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickBlocked ) ); - mChkAnim = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkFliped->Pos().x, mChkFliped->Pos().y + mChkFliped->Size().height() + 4 ), ChkFlags ); - mChkAnim->Text( "Animated" ); - mChkAnim->TooltipText( "Indicates if the Sprite is animated." ); - mChkAnim->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickAnimated ) ); + mChkAnim = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkFliped->position().x, mChkFliped->position().y + mChkFliped->size().height() + 4 ), ChkFlags ); + mChkAnim->text( "Animated" ); + mChkAnim->tooltipText( "Indicates if the Sprite is animated." ); + mChkAnim->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickAnimated ) ); - mChkRot90 = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkBlocked->Pos().x, mChkBlocked->Pos().y + mChkBlocked->Size().height() + 4 ), ChkFlags ); - mChkRot90->Text( String::fromUtf8( "Rotate 90º" ) ); - mChkRot90->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickRot90 ) ); + mChkRot90 = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkBlocked->position().x, mChkBlocked->position().y + mChkBlocked->size().height() + 4 ), ChkFlags ); + mChkRot90->text( String::fromUtf8( "Rotate 90º" ) ); + mChkRot90->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickRot90 ) ); - mChkAutoFix = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkAnim->Pos().x, mChkAnim->Pos().y + mChkAnim->Size().height() + 4 ), ChkFlags ); - mChkAutoFix->Text( "AutoFix TilePos" ); - mChkAutoFix->TooltipText( "In a tiled layer if the sprite is moved,\nit will update the current tile position automatically." ); - mChkAutoFix->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickAutoFix ) ); + mChkAutoFix = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( mChkAnim->position().x, mChkAnim->position().y + mChkAnim->size().height() + 4 ), ChkFlags ); + mChkAutoFix->text( "AutoFix TilePos" ); + mChkAutoFix->tooltipText( "In a tiled layer if the sprite is moved,\nit will update the current tile position automatically." ); + mChkAutoFix->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickAutoFix ) ); - Txt = mTheme->CreateTextBox( "Game Object Data:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mChkRot90->Pos().y + mChkRot90->Size().height() + 8 ), TxtFlags ); + Txt = mTheme->createTextBox( "Game Object Data:", mSubTextureCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, mChkRot90->position().y + mChkRot90->size().height() + 8 ), TxtFlags ); - mChkDI = mTheme->CreateCheckBox( mSubTextureCont, Sizei(), Vector2i( TAB_CONT_X_DIST, Txt->Pos().y + Txt->Size().height() + 4 ), ChkFlags ); - mChkDI->Text( "Add as DataId" ); - mChkDI->TooltipText( "If the resource it's not a sprite,\nyou can reference it with a data id" ); - mChkDI->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickDI ) ); + mChkDI = mTheme->createCheckBox( mSubTextureCont, Sizei(), Vector2i( TAB_CONT_X_DIST, Txt->position().y + Txt->size().height() + 4 ), ChkFlags ); + mChkDI->text( "Add as DataId" ); + mChkDI->tooltipText( "If the resource it's not a sprite,\nyou can reference it with a data id" ); + mChkDI->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickDI ) ); UIComplexControl::CreateParams SGParams; SGParams.Parent( mSubTextureCont ); - SGParams.PosSet( Vector2i( TAB_CONT_X_DIST, mChkDI->Pos().y + mChkDI->Size().height() + 8 ) ); + SGParams.PosSet( Vector2i( TAB_CONT_X_DIST, mChkDI->position().y + mChkDI->size().height() + 8 ) ); SGParams.SizeSet( Sizei( Width, 400 ) ); SGParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mSGCont = eeNew( UIComplexControl, ( SGParams ) ); - mSGCont->Enabled( true ); - mSGCont->Visible( true ); + mSGCont->enabled( true ); + mSGCont->visible( true ); - Txt = mTheme->CreateTextBox( "Texture Atlases:", mSGCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 0 ), TxtFlags ); + Txt = mTheme->createTextBox( "Texture Atlases:", mSGCont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 0 ), TxtFlags ); - mTextureAtlasesList = mTheme->CreateDropDownList( mSGCont, Sizei( Width, 21 ), Vector2i( 0, Txt->Pos().y +Txt->Size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); - mTextureAtlasesList->AddEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnTextureAtlasChange ) ); + mTextureAtlasesList = mTheme->createDropDownList( mSGCont, Sizei( Width, 21 ), Vector2i( 0, Txt->position().y +Txt->size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); + mTextureAtlasesList->addEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnTextureAtlasChange ) ); - mSubTextureList = mTheme->CreateListBox( mSGCont, Sizei( Width, 156 ), Vector2i( 0, mTextureAtlasesList->Pos().y + mTextureAtlasesList->Size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); - mSubTextureList->Size( mSubTextureList->Size().width(), mSubTextureList->RowHeight() * 9 + mSubTextureList->PaddingContainer().Top + mSubTextureList->PaddingContainer().Bottom ); - mSubTextureList->AddEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnSubTextureChange ) ); + mSubTextureList = mTheme->createListBox( mSGCont, Sizei( Width, 156 ), Vector2i( 0, mTextureAtlasesList->position().y + mTextureAtlasesList->size().height() + 4 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); + mSubTextureList->size( mSubTextureList->size().width(), mSubTextureList->rowHeight() * 9 + mSubTextureList->paddingContainer().Top + mSubTextureList->paddingContainer().Bottom ); + mSubTextureList->addEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &MapEditor::OnSubTextureChange ) ); - mGfxPreview = mTheme->CreateGfx( NULL, mSGCont, Sizei( Width, Width ), Vector2i( 0, mSubTextureList->Pos().y + mSubTextureList->Size().height() + 4 ), UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP | UI_AUTO_FIT ); - mGfxPreview->Border( true ); - mGfxPreview->Border()->Color( ColorA( 0, 0, 0, 200 ) ); + mGfxPreview = mTheme->createGfx( NULL, mSGCont, Sizei( Width, Width ), Vector2i( 0, mSubTextureList->position().y + mSubTextureList->size().height() + 4 ), UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP | UI_AUTO_FIT ); + mGfxPreview->border( true ); + mGfxPreview->border()->color( ColorA( 0, 0, 0, 200 ) ); UIComplexControl::CreateParams DIParams; DIParams.Parent( mSubTextureCont ); @@ -325,79 +325,79 @@ void MapEditor::CreateSubTextureContainer( Int32 Width ) { DIParams.SizeSet( Sizei( Width, 400 ) ); DIParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mDICont = eeNew( UIComplexControl, ( DIParams ) ); - mDICont->Enabled( false ); - mDICont->Visible( false ); + mDICont->enabled( false ); + mDICont->visible( false ); - Txt = mTheme->CreateTextBox( "DataId String:", mDICont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 0 ), TxtFlags ); + Txt = mTheme->createTextBox( "DataId String:", mDICont, Sizei( Width, 16 ), Vector2i( TAB_CONT_X_DIST, 0 ), TxtFlags ); - mDataIdInput = mTheme->CreateTextInput( mDICont, Sizei( Width / 4 * 3, 21 ), Vector2i( TAB_CONT_X_DIST + 8, Txt->Pos().y + Txt->Size().height() + 8 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); + mDataIdInput = mTheme->createTextInput( mDICont, Sizei( Width / 4 * 3, 21 ), Vector2i( TAB_CONT_X_DIST + 8, Txt->position().y + Txt->size().height() + 8 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); FillSGCombo(); } void MapEditor::CreateLighContainer() { - UIPushButton * NewLightBut = mTheme->CreatePushButton( mLightCont, Sizei( mLightCont->Size().width() - TAB_CONT_X_DIST * 2, 22 ), Vector2i( TAB_CONT_X_DIST, 0 ) ); - NewLightBut->Text( "New Light" ); - NewLightBut->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnNewLight ) ); + UIPushButton * NewLightBut = mTheme->createPushButton( mLightCont, Sizei( mLightCont->size().width() - TAB_CONT_X_DIST * 2, 22 ), Vector2i( TAB_CONT_X_DIST, 0 ) ); + NewLightBut->text( "New Light" ); + NewLightBut->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnNewLight ) ); - UITextBox * Txt = mTheme->CreateTextBox( "Light Color:", mLightCont, Sizei(), Vector2i( TAB_CONT_X_DIST, 32 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + UITextBox * Txt = mTheme->createTextBox( "Light Color:", mLightCont, Sizei(), Vector2i( TAB_CONT_X_DIST, 32 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; ComParams.Parent( mLightCont ); - ComParams.PosSet( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 4 ); + ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); ComParams.SizeSet( 58, 64 ); - ComParams.Background.Color( ColorA(255,255,255,255) ); - ComParams.Border.Color( ColorA( 100, 100, 100, 200 ) ); + ComParams.Background.color( ColorA(255,255,255,255) ); + ComParams.Border.color( ColorA( 100, 100, 100, 200 ) ); ComParams.Flags |= UI_FILL_BACKGROUND | UI_BORDER; mUIBaseColor = eeNew( UIComplexControl, ( ComParams ) ); - mUIBaseColor->Visible( true ); - mUIBaseColor->Enabled( true ); + mUIBaseColor->visible( true ); + mUIBaseColor->enabled( true ); - Txt = mTheme->CreateTextBox( "R:", mLightCont, Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIBaseColor->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIRedSlider = mTheme->CreateSlider( mLightCont, Sizei( 100, 20 ), Vector2i( Txt->Pos().x + Txt->Size().width(), Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIRedSlider->MaxValue( 255 ); - mUIRedSlider->Value( 255 ); - mUIRedSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnRedChange ) ); + Txt = mTheme->createTextBox( "R:", mLightCont, Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIBaseColor->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedSlider = mTheme->createSlider( mLightCont, Sizei( 100, 20 ), Vector2i( Txt->position().x + Txt->size().width(), Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIRedSlider->maxValue( 255 ); + mUIRedSlider->value( 255 ); + mUIRedSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnRedChange ) ); - mUIRedTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mTheme->createTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIRedSlider->position().x + mUIRedSlider->size().width() + 4, mUIRedSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mTheme->CreateTextBox( "G:", mLightCont, Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIGreenSlider = mTheme->CreateSlider( mLightCont, Sizei( 100, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIGreenSlider->MaxValue( 255 ); - mUIGreenSlider->Value( 255 ); - mUIGreenSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnGreenChange ) ); + Txt = mTheme->createTextBox( "G:", mLightCont, Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIRedSlider->position().y + mUIRedSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenSlider = mTheme->createSlider( mLightCont, Sizei( 100, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIGreenSlider->maxValue( 255 ); + mUIGreenSlider->value( 255 ); + mUIGreenSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnGreenChange ) ); - mUIGreenTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mTheme->createTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIGreenSlider->position().x + mUIGreenSlider->size().width() + 4, mUIGreenSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mTheme->CreateTextBox( "B:", mLightCont, Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIBlueSlider = mTheme->CreateSlider( mLightCont, Sizei( 100, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIBlueSlider->MaxValue( 255 ); - mUIBlueSlider->Value( 255 ); - mUIBlueSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnBlueChange ) ); + Txt = mTheme->createTextBox( "B:", mLightCont, Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIGreenSlider->position().y + mUIGreenSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueSlider = mTheme->createSlider( mLightCont, Sizei( 100, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIBlueSlider->maxValue( 255 ); + mUIBlueSlider->value( 255 ); + mUIBlueSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnBlueChange ) ); - mUIBlueTxt = mTheme->CreateTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mTheme->createTextBox( String::toStr( (Uint32)255 ), mLightCont, Sizei(), Vector2i( mUIBlueSlider->position().x + mUIBlueSlider->size().width() + 4, mUIBlueSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mTheme->CreateTextBox( "Light Radius:", mLightCont, Sizei(), Vector2i( TAB_CONT_X_DIST, mUIBlueTxt->Pos().y + mUIBlueTxt->Size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Light Radius:", mLightCont, Sizei(), Vector2i( TAB_CONT_X_DIST, mUIBlueTxt->position().y + mUIBlueTxt->size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mLightRadius = mTheme->CreateSpinBox( mLightCont, Sizei( 100, 22 ), Vector2i( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, 100, false ); - mLightRadius->MaxValue( 2000 ); - mLightRadius->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnLightRadiusChangeVal ) ); + mLightRadius = mTheme->createSpinBox( mLightCont, Sizei( 100, 22 ), Vector2i( Txt->position().x, Txt->position().y + Txt->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, 100, false ); + mLightRadius->maxValue( 2000 ); + mLightRadius->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnLightRadiusChangeVal ) ); - mLightTypeChk = mTheme->CreateCheckBox( mLightCont, Sizei(), Vector2i( mLightRadius->Pos().x, mLightRadius->Pos().y + mLightRadius->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mLightTypeChk->Text( "Isometric Light" ); - mLightTypeChk->Active( false ); - mLightTypeChk->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnLightTypeChange ) ); + mLightTypeChk = mTheme->createCheckBox( mLightCont, Sizei(), Vector2i( mLightRadius->position().x, mLightRadius->position().y + mLightRadius->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mLightTypeChk->text( "Isometric Light" ); + mLightTypeChk->active( false ); + mLightTypeChk->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnLightTypeChange ) ); } UISelectButton * MapEditor::AddObjContButton( String text, Uint32 mode ) { - UISelectButton * Button = mTheme->CreateSelectButton( mObjectCont, Sizei( mObjectCont->Size().width() - TAB_CONT_X_DIST * 2, 22 ), Vector2i( TAB_CONT_X_DIST, mLastSelButtonY ) ); + UISelectButton * Button = mTheme->createSelectButton( mObjectCont, Sizei( mObjectCont->size().width() - TAB_CONT_X_DIST * 2, 22 ), Vector2i( TAB_CONT_X_DIST, mLastSelButtonY ) ); - Button->Text( text ); - Button->Data( mode ); + Button->text( text ); + Button->data( mode ); - Button->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnObjectModeSel ) ); + Button->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnObjectModeSel ) ); - mLastSelButtonY += Button->Size().height() + 4; + mLastSelButtonY += Button->size().height() + 4; mObjContButton.push_back( Button ); @@ -405,46 +405,46 @@ UISelectButton * MapEditor::AddObjContButton( String text, Uint32 mode ) { } void MapEditor::CreateObjectsContainer() { - AddObjContButton( "Select Objects", UIMap::SELECT_OBJECTS )->Select(); + AddObjContButton( "Select Objects", UIMap::SELECT_OBJECTS )->select(); AddObjContButton( "Edit Polygons", UIMap::EDIT_POLYGONS ); AddObjContButton( "Insert Object", UIMap::INSERT_OBJECT ); AddObjContButton( "Insert Polygon", UIMap::INSERT_POLYGON ); UISelectButton * Button = AddObjContButton( "Insert Polyline", UIMap::INSERT_POLYLINE ); - Int32 nextY = Button->Pos().y + Button->Size().height() + 4; + Int32 nextY = Button->position().y + Button->size().height() + 4; Uint32 ChkFlags = UI_CONTROL_DEFAULT_ALIGN | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; - mChkClampToTile = mTheme->CreateCheckBox( mObjectCont, Sizei(), Vector2i( 12, nextY ), ChkFlags ); - mChkClampToTile->Text( "Clamp Position to Tile" ); - mChkClampToTile->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickClampToTile ) ); - mChkClampToTile->Active( true ); + mChkClampToTile = mTheme->createCheckBox( mObjectCont, Sizei(), Vector2i( 12, nextY ), ChkFlags ); + mChkClampToTile->text( "Clamp Position to Tile" ); + mChkClampToTile->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickClampToTile ) ); + mChkClampToTile->active( true ); } void MapEditor::OnObjectModeSel( const UIEvent * Event ) { - UISelectButton * Button = static_cast( Event->Ctrl() ); + UISelectButton * Button = static_cast( Event->getControl() ); UISelectButton * ButtonT = NULL; for ( std::list::iterator it = mObjContButton.begin(); it != mObjContButton.end(); it++ ) { ButtonT = *it; - ButtonT->Unselect(); + ButtonT->unselect(); } - Button->Select(); + Button->select(); - mUIMap->EditingObjMode( (UIMap::EDITING_OBJ_MODE)Button->Data() ); + mUIMap->EditingObjMode( (UIMap::EDITING_OBJ_MODE)Button->data() ); } void MapEditor::CreateUIMap() { - UISkin * HScrollSkin = mTheme->getByName( mTheme->Abbr() + "_" + "hscrollbar_bg" ); - UISkin * VScrollSkin = mTheme->getByName( mTheme->Abbr() + "_" + "vscrollbar_bg" ); + UISkin * HScrollSkin = mTheme->getByName( mTheme->abbr() + "_" + "hscrollbar_bg" ); + UISkin * VScrollSkin = mTheme->getByName( mTheme->abbr() + "_" + "vscrollbar_bg" ); Float ScrollH = 16; Float ScrollV = 16; if ( NULL != HScrollSkin ) { - SubTexture * tTex = HScrollSkin->GetSubTexture( UISkinState::StateNormal ); + SubTexture * tTex = HScrollSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tTex ) { ScrollH = tTex->size().height(); @@ -452,7 +452,7 @@ void MapEditor::CreateUIMap() { } if ( NULL != VScrollSkin ) { - SubTexture * tTex = VScrollSkin->GetSubTexture( UISkinState::StateNormal ); + SubTexture * tTex = VScrollSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tTex ) { ScrollV = tTex->size().height(); @@ -462,16 +462,16 @@ void MapEditor::CreateUIMap() { UIComplexControl::CreateParams Params; Params.Parent( mWinContainer ); Params.PosSet( 0, 0 ); - Params.SizeSet( mWinContainer->Size().width() - 225 - ScrollV, mWinContainer->Size().height() - ScrollH ); + Params.SizeSet( mWinContainer->size().width() - 225 - ScrollV, mWinContainer->size().height() - ScrollH ); Params.Flags |= UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT; mUIMap = eeNew( UIMap, ( Params, mTheme ) ); - mUIMap->Visible( true ); - mUIMap->Enabled( true ); + mUIMap->visible( true ); + mUIMap->enabled( true ); CreateNewEmptyMap(); - mUIMap->AddEventListener( UIEvent::EventOnSizeChange, cb::Make1( this, &MapEditor::OnMapSizeChange ) ); - mUIMap->AddEventListener( UIEvent::EventMouseDown, cb::Make1( this, &MapEditor::OnMapMouseDown ) ); - mUIMap->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnMapMouseClick ) ); + mUIMap->addEventListener( UIEvent::EventOnSizeChange, cb::Make1( this, &MapEditor::OnMapSizeChange ) ); + mUIMap->addEventListener( UIEvent::EventMouseDown, cb::Make1( this, &MapEditor::OnMapMouseDown ) ); + mUIMap->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::OnMapMouseClick ) ); mUIMap->SetLightSelectCb( cb::Make1( this, &MapEditor::OnLightSelect ) ); mUIMap->SetLightRadiusChangeCb( cb::Make1( this, &MapEditor::OnLightRadiusChange ) ); mUIMap->SetAddObjectCallback( cb::Make2( this, &MapEditor::OnAddObject ) ); @@ -479,23 +479,23 @@ void MapEditor::CreateUIMap() { mUIMap->SetUpdateScrollCb( cb::Make0( this, &MapEditor::UpdateScroll ) ); mUIMap->SetTileBox( mTileBox ); - mMapHScroll = mTheme->CreateScrollBar( mWinContainer, Sizei( Params.Size.width(), ScrollH ), Vector2i( 0, mWinContainer->Size().height() - ScrollH ), UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM | UI_AUTO_SIZE ); - mMapHScroll->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnScrollMapH ) ); + mMapHScroll = mTheme->createScrollBar( mWinContainer, Sizei( Params.Size.width(), ScrollH ), Vector2i( 0, mWinContainer->size().height() - ScrollH ), UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM | UI_AUTO_SIZE ); + mMapHScroll->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnScrollMapH ) ); - mMapVScroll = mTheme->CreateScrollBar( mWinContainer, Sizei( ScrollV, Params.Size.height() ), Vector2i( Params.Size.width() + ScrollV, 0 ), UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_AUTO_SIZE , true ); - mMapVScroll->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnScrollMapV ) ); + mMapVScroll = mTheme->createScrollBar( mWinContainer, Sizei( ScrollV, Params.Size.height() ), Vector2i( Params.Size.width() + ScrollV, 0 ), UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_AUTO_SIZE , true ); + mMapVScroll->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &MapEditor::OnScrollMapV ) ); MapCreated(); } void MapEditor::OnAddObject( Uint32 Type, Polygon2f poly ) { if ( NULL == mCurLayer ) { - CreateNoLayerAlert( "No layers found" )->SetFocus(); + CreateNoLayerAlert( "No layers found" )->setFocus(); return; } if ( mCurLayer->Type() != MAP_LAYER_OBJECT ) { - CreateAlert( "Wrong Layer", "Objects only can be added to an Object Layer" )->SetFocus(); + CreateAlert( "Wrong Layer", "Objects only can be added to an Object Layer" )->setFocus(); return; } @@ -516,44 +516,44 @@ void MapEditor::OnAddObject( Uint32 Type, Polygon2f poly ) { void MapEditor::OnLightTypeChange( const UIEvent * Event ) { if ( NULL != mUIMap->GetSelectedLight() ) { - mUIMap->GetSelectedLight()->Type( mLightTypeChk->Active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ); + mUIMap->GetSelectedLight()->Type( mLightTypeChk->active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ); } } void MapEditor::OnLightRadiusChangeVal( const UIEvent * Event ) { if ( NULL != mUIMap->GetSelectedLight() ) { - mUIMap->GetSelectedLight()->Radius( mLightRadius->Value() ); + mUIMap->GetSelectedLight()->Radius( mLightRadius->value() ); } } void MapEditor::OnLightRadiusChange( MapLight * Light ) { - mLightRadius->Value( Light->Radius() ); + mLightRadius->value( Light->Radius() ); } void MapEditor::OnLightSelect( MapLight * Light ) { ColorA Col( Light->Color() ); - mUIRedSlider->Value( Col.r() ); - mUIGreenSlider->Value( Col.g() ); - mUIBlueSlider->Value( Col.b() ); - mLightRadius->Value( Light->Radius() ); - mLightTypeChk->Active( Light->Type() == LIGHT_ISOMETRIC ? true : false ); + mUIRedSlider->value( Col.r() ); + mUIGreenSlider->value( Col.g() ); + mUIBlueSlider->value( Col.b() ); + mLightRadius->value( Light->Radius() ); + mLightTypeChk->active( Light->Type() == LIGHT_ISOMETRIC ? true : false ); } void MapEditor::OnNewLight( const UIEvent * Event ) { const UIEventMouse * MEvent = reinterpret_cast ( Event ); - if ( MEvent->Flags() & EE_BUTTON_LMASK ) { + if ( MEvent->getFlags() & EE_BUTTON_LMASK ) { Vector2i Pos = mUIMap->Map()->GetMouseMapPos(); - mUIMap->AddLight( eeNew( MapLight, ( mLightRadius->Value(), Pos.x, Pos.y, mUIBaseColor->Background()->Color().ToColor(), mLightTypeChk->Active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ) ) ); + mUIMap->AddLight( eeNew( MapLight, ( mLightRadius->value(), Pos.x, Pos.y, mUIBaseColor->background()->color().ToColor(), mLightTypeChk->active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ) ) ); } } void MapEditor::OnRedChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Red = (Uint8)mUIRedSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Red = (Uint8)mUIRedSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIRedTxt->text( String::toStr( (Int32)mUIRedSlider->value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { RGB lCol( mUIMap->GetSelectedLight()->Color() ); @@ -563,10 +563,10 @@ void MapEditor::OnRedChange( const UIEvent * Event ) { } void MapEditor::OnGreenChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Green = (Uint8)mUIGreenSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Green = (Uint8)mUIGreenSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIGreenTxt->text( String::toStr( (Uint32)mUIGreenSlider->value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { RGB lCol( mUIMap->GetSelectedLight()->Color() ); @@ -576,10 +576,10 @@ void MapEditor::OnGreenChange( const UIEvent * Event ) { } void MapEditor::OnBlueChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Blue = (Uint8)mUIBlueSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Blue = (Uint8)mUIBlueSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIBlueTxt->text( String::toStr( (Uint32)mUIBlueSlider->value() ) ); if ( NULL != mUIMap->GetSelectedLight() ) { RGB lCol( mUIMap->GetSelectedLight()->Color() ); @@ -589,74 +589,74 @@ void MapEditor::OnBlueChange( const UIEvent * Event ) { } void MapEditor::ChkClickDI( const UIEvent * Event ) { - if ( mChkDI->Active() ) { - mSGCont->Enabled( false ); - mSGCont->Visible( false ); - mDICont->Enabled( true ); - mDICont->Visible( true ); + if ( mChkDI->active() ) { + mSGCont->enabled( false ); + mSGCont->visible( false ); + mDICont->enabled( true ); + mDICont->visible( true ); } else { - mSGCont->Enabled( true ); - mSGCont->Visible( true ); - mDICont->Enabled( false ); - mDICont->Visible( false ); + mSGCont->enabled( true ); + mSGCont->visible( true ); + mDICont->enabled( false ); + mDICont->visible( false ); } } void MapEditor::ChkClickClampToTile( const UIEvent * Event ) { - mUIMap->ClampToTile( mChkClampToTile->Active() ); + mUIMap->ClampToTile( mChkClampToTile->active() ); } void MapEditor::UpdateGfx() { - if ( mChkMirrored->Active() && mChkFliped->Active() ) - mGfxPreview->RenderMode( RN_FLIPMIRROR ); - else if( mChkMirrored->Active() ) - mGfxPreview->RenderMode( RN_MIRROR ); - else if ( mChkFliped->Active() ) - mGfxPreview->RenderMode( RN_FLIP ); + if ( mChkMirrored->active() && mChkFliped->active() ) + mGfxPreview->renderMode( RN_FLIPMIRROR ); + else if( mChkMirrored->active() ) + mGfxPreview->renderMode( RN_MIRROR ); + else if ( mChkFliped->active() ) + mGfxPreview->renderMode( RN_FLIP ); else - mGfxPreview->RenderMode( RN_NORMAL ); + mGfxPreview->renderMode( RN_NORMAL ); - if ( mChkRot90->Active() ) - mGfxPreview->Angle( 90 ); + if ( mChkRot90->active() ) + mGfxPreview->angle( 90 ); else - mGfxPreview->Angle( 0 ); + mGfxPreview->angle( 0 ); } void MapEditor::UpdateFlags() { mCurGOFlags = 0; - if ( mChkMirrored->Active() ) + if ( mChkMirrored->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_MIRRORED; - if ( mChkFliped->Active() ) + if ( mChkFliped->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_FLIPED; - if ( mChkBlocked->Active() ) + if ( mChkBlocked->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_BLOCKED; - if ( mChkAnim->Active() ) + if ( mChkAnim->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_ANIMATED; - if ( mChkRot90->Active() ) + if ( mChkRot90->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_ROTATE_90DEG; - if ( mChkAutoFix->Active() ) + if ( mChkAutoFix->active() ) mCurGOFlags |= GObjFlags::GAMEOBJECT_AUTO_FIX_TILE_POS; } void MapEditor::OnTypeChange( const UIEvent * Event ) { - if ( mGOTypeList->Text() == "SubTexture" ) + if ( mGOTypeList->text() == "SubTexture" ) mCurGOType = GAMEOBJECT_TYPE_SUBTEXTURE; - else if ( mGOTypeList->Text() == "SubTextureEx" ) + else if ( mGOTypeList->text() == "SubTextureEx" ) mCurGOType = GAMEOBJECT_TYPE_SUBTEXTUREEX; - else if ( mGOTypeList->Text() == "Sprite" ) + else if ( mGOTypeList->text() == "Sprite" ) mCurGOType = GAMEOBJECT_TYPE_SPRITE; else - mCurGOType = String::hash( mGOTypeList->Text().toUtf8() ); + mCurGOType = String::hash( mGOTypeList->text().toUtf8() ); - if ( NULL != mChkAnim && NULL != mGOTypeList && mChkAnim->Active() && mGOTypeList->Text() != "Sprite" ) { - if ( mGOTypeList->Text() == "SubTexture" || mGOTypeList->Text() == "SubTextureEx" ) { - mChkAnim->Active( false ); + if ( NULL != mChkAnim && NULL != mGOTypeList && mChkAnim->active() && mGOTypeList->text() != "Sprite" ) { + if ( mGOTypeList->text() == "SubTexture" || mGOTypeList->text() == "SubTextureEx" ) { + mChkAnim->active( false ); } } } @@ -687,8 +687,8 @@ void MapEditor::ChkClickAutoFix( const UIEvent * Event ) { void MapEditor::ChkClickAnimated( const UIEvent * Event ) { UpdateFlags(); - if ( mChkAnim->Active() && ( mGOTypeList->Text() == "SubTexture" || mGOTypeList->Text() == "SubTextureEx" ) ) { - mGOTypeList->ListBox()->SetSelected( "Sprite" ); + if ( mChkAnim->active() && ( mGOTypeList->text() == "SubTexture" || mGOTypeList->text() == "SubTextureEx" ) ) { + mGOTypeList->getListBox()->setSelected( "Sprite" ); } } @@ -698,14 +698,14 @@ void MapEditor::AddNewGOType( const UIEvent * Event ) { void MapEditor::OnNewGOTypeAdded( std::string name, Uint32 hash ) { if ( "" != name ) { - for ( Uint32 i = 0; i < mGOTypeList->ListBox()->Count(); i++ ) { - UIListBoxItem * Item = mGOTypeList->ListBox()->GetItem(i); + for ( Uint32 i = 0; i < mGOTypeList->getListBox()->count(); i++ ) { + UIListBoxItem * Item = mGOTypeList->getListBox()->getItem(i); - if ( Item->Text() == name ) + if ( Item->text() == name ) return; } - mGOTypeList->ListBox()->AddListBoxItem( name ); + mGOTypeList->getListBox()->addListBoxItem( name ); mUIMap->Map()->AddVirtualObjectType( name ); } } @@ -714,12 +714,12 @@ void MapEditor::FillSGCombo() { TextureAtlasManager * SGM = TextureAtlasManager::instance(); std::list& Res = SGM->getResources(); - mTextureAtlasesList->ListBox()->Clear(); + mTextureAtlasesList->getListBox()->clear(); std::vector items; Uint32 Restricted1 = String::hash( std::string( "global" ) ); - Uint32 Restricted2 = String::hash( mTheme->TextureAtlas()->getName() ); + Uint32 Restricted2 = String::hash( mTheme->getTextureAtlas()->getName() ); for ( std::list::iterator it = Res.begin(); it != Res.end(); it++ ) { if ( (*it)->getId() != Restricted1 && (*it)->getId() != Restricted2 ) @@ -727,20 +727,20 @@ void MapEditor::FillSGCombo() { } if ( items.size() ) { - mTextureAtlasesList->ListBox()->AddListBoxItems( items ); + mTextureAtlasesList->getListBox()->addListBoxItems( items ); } - if ( mTextureAtlasesList->ListBox()->Count() && NULL == mTextureAtlasesList->ListBox()->GetItemSelected() ) { - mTextureAtlasesList->ListBox()->SetSelected( 0 ); + if ( mTextureAtlasesList->getListBox()->count() && NULL == mTextureAtlasesList->getListBox()->getItemSelected() ) { + mTextureAtlasesList->getListBox()->setSelected( 0 ); } } void MapEditor::FillSubTextureList() { TextureAtlasManager * SGM = TextureAtlasManager::instance(); - mCurSG = SGM->getByName( mTextureAtlasesList->Text() ); + mCurSG = SGM->getByName( mTextureAtlasesList->text() ); std::list& Res = mCurSG->getResources(); - mSubTextureList->Clear(); + mSubTextureList->clear(); if ( NULL != mCurSG ) { std::vector items; @@ -752,20 +752,20 @@ void MapEditor::FillSubTextureList() { if ( items.size() ) { std::sort( items.begin(), items.end() ); - mSubTextureList->AddListBoxItems( items ); - mSubTextureList->SetSelected( 0 ); + mSubTextureList->addListBoxItems( items ); + mSubTextureList->setSelected( 0 ); } } - mSubTextureList->VerticalScrollBar()->ClickStep( 8.f / (Float)mSubTextureList->Count() ); + mSubTextureList->verticalScrollBar()->clickStep( 8.f / (Float)mSubTextureList->count() ); } void MapEditor::OnSubTextureChange( const UIEvent * Event ) { if ( NULL != mCurSG ) { - SubTexture * tSubTexture = mCurSG->getByName( mSubTextureList->GetItemSelectedText() ); + SubTexture * tSubTexture = mCurSG->getByName( mSubTextureList->getItemSelectedText() ); if ( NULL != tSubTexture ) { - mGfxPreview->SubTexture( tSubTexture ); + mGfxPreview->subTexture( tSubTexture ); } } } @@ -779,19 +779,19 @@ void MapEditor::CreateNewMap() { } void MapEditor::CreateNewEmptyMap() { - mUIMap->Map()->Create( Sizei( 100, 100 ), 16, Sizei( 32, 32 ), MAP_EDITOR_DEFAULT_FLAGS | MAP_FLAG_LIGHTS_ENABLED, mUIMap->Size() ); + mUIMap->Map()->Create( Sizei( 100, 100 ), 16, Sizei( 32, 32 ), MAP_EDITOR_DEFAULT_FLAGS | MAP_FLAG_LIGHTS_ENABLED, mUIMap->size() ); } void MapEditor::MapCreated() { mCurLayer = NULL; - mLayerList->ListBox()->Clear(); + mLayerList->getListBox()->clear(); UpdateFlags(); SetViewOptions(); FillSGCombo(); FillGotyList(); - mMapHScroll->Value( 0 ); - mMapVScroll->Value( 0 ); + mMapHScroll->value( 0 ); + mMapVScroll->value( 0 ); OnMapSizeChange( NULL ); mUIMap->ClearLights(); @@ -805,48 +805,48 @@ void MapEditor::OnMapSizeChange( const UIEvent *Event ) { Vector2i v( mUIMap->Map()->GetMaxOffset() ); - mMapHScroll->MinValue( 0 ); - mMapHScroll->MaxValue( v.x ); - mMapHScroll->ClickStep( mUIMap->Map()->TileSize().width() * mUIMap->Map()->Scale() ); - mMapVScroll->MinValue( 0 ); - mMapVScroll->MaxValue( v.y ); - mMapVScroll->ClickStep( mUIMap->Map()->TileSize().height() * mUIMap->Map()->Scale() ); + mMapHScroll->minValue( 0 ); + mMapHScroll->maxValue( v.x ); + mMapHScroll->clickStep( mUIMap->Map()->TileSize().width() * mUIMap->Map()->Scale() ); + mMapVScroll->minValue( 0 ); + mMapVScroll->maxValue( v.y ); + mMapVScroll->clickStep( mUIMap->Map()->TileSize().height() * mUIMap->Map()->Scale() ); } void MapEditor::OnScrollMapH( const UIEvent * Event ) { if ( mMouseScrolling ) return; - UIScrollBar * Scr = reinterpret_cast ( Event->Ctrl() ); + UIScrollBar * Scr = reinterpret_cast ( Event->getControl() ); Vector2f Off = mUIMap->Map()->Offset(); - Off.x = -Scr->Value(); + Off.x = -Scr->value(); mUIMap->Map()->Offset( Off ) ; } void MapEditor::OnScrollMapV( const UIEvent * Event ) { - UIScrollBar * Scr = reinterpret_cast ( Event->Ctrl() ); + UIScrollBar * Scr = reinterpret_cast ( Event->getControl() ); Vector2f Off = mUIMap->Map()->Offset(); - Off.y = -Scr->Value(); + Off.y = -Scr->value(); mUIMap->Map()->Offset( Off ) ; } void MapEditor::UpdateScroll() { mMouseScrolling = true; - mMapHScroll->Value( -mUIMap->Map()->Offset().x ); - mMapVScroll->Value( -mUIMap->Map()->Offset().y ); + mMapHScroll->value( -mUIMap->Map()->Offset().x ); + mMapVScroll->value( -mUIMap->Map()->Offset().y ); mMouseScrolling = false; } void MapEditor::MapOpen( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); - if ( mUIMap->Map()->Load( CDL->GetFullPath() ) ) { + if ( mUIMap->Map()->Load( CDL->getFullPath() ) ) { OnMapLoad(); } } @@ -854,7 +854,7 @@ void MapEditor::MapOpen( const UIEvent * Event ) { void MapEditor::OnMapLoad() { mCurLayer = NULL; - mUIMap->Map()->ViewSize( mUIMap->Size() ); + mUIMap->Map()->ViewSize( mUIMap->size() ); MapCreated(); @@ -864,9 +864,9 @@ void MapEditor::OnMapLoad() { } void MapEditor::MapSave( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); - std::string path( CDL->GetFullPath() ); + std::string path( CDL->getFullPath() ); if ( path.substr( path.size() - 4 ) != ".eem" ) { path += ".eem"; @@ -876,40 +876,40 @@ void MapEditor::MapSave( const UIEvent * Event ) { } void MapEditor::FileMenuClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "New..." == txt ) { CreateNewMap(); } else if ( "Open..." == txt ) { - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, "*.eem" ); + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, "*.eem" ); - TGDialog->Title( "Open Map" ); - TGDialog->AddEventListener( UIEvent::EventOpenFile, cb::Make1( this, &MapEditor::MapOpen ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Open Map" ); + TGDialog->addEventListener( UIEvent::EventOpenFile, cb::Make1( this, &MapEditor::MapOpen ) ); + TGDialog->center(); + TGDialog->show(); } else if ( "Save As..." == txt ) { - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_SAVE_DIALOG, "*.eem" ); + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_SAVE_DIALOG, "*.eem" ); - TGDialog->Title( "Save Map" ); - TGDialog->AddEventListener( UIEvent::EventSaveFile, cb::Make1( this, &MapEditor::MapSave ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Save Map" ); + TGDialog->addEventListener( UIEvent::EventSaveFile, cb::Make1( this, &MapEditor::MapSave ) ); + TGDialog->center(); + TGDialog->show(); } else if ( "Save" == txt ) { if ( mUIMap->Map()->Path().size() ) { mUIMap->Map()->Save( mUIMap->Map()->Path() ); } } else if ( "Close" == txt ) { - UIMessageBox * MsgBox = mTheme->CreateMessageBox( MSGBOX_OKCANCEL, "Do you really want to close the current map?\nAll changes will be lost." ); - MsgBox->AddEventListener( UIEvent::EventMsgBoxConfirmClick, cb::Make1( this, &MapEditor::OnMapClose ) ); - MsgBox->Title( "Close Map?" ); - MsgBox->Center(); - MsgBox->Show(); + UIMessageBox * MsgBox = mTheme->createMessageBox( MSGBOX_OKCANCEL, "Do you really want to close the current map?\nAll changes will be lost." ); + MsgBox->addEventListener( UIEvent::EventMsgBoxConfirmClick, cb::Make1( this, &MapEditor::OnMapClose ) ); + MsgBox->title( "Close Map?" ); + MsgBox->center(); + MsgBox->show(); } else if ( "Quit" == txt ) { - if ( mUIWindow == UIManager::instance()->MainControl() ) { - UIManager::instance()->GetWindow()->close(); + if ( mUIWindow == UIManager::instance()->mainControl() ) { + UIManager::instance()->getWindow()->close(); } else { mUIWindow->CloseWindow(); } @@ -927,17 +927,17 @@ void MapEditor::OnMapClose( const UIEvent * Event ) { } void MapEditor::ViewMenuClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "Show Grid" == txt ) { - mUIMap->Map()->DrawGrid( reinterpret_cast ( Event->Ctrl() )->Active() ); + mUIMap->Map()->DrawGrid( reinterpret_cast ( Event->getControl() )->active() ); } else if ( "Mark Tile Over" == txt ) { - mUIMap->Map()->DrawTileOver( reinterpret_cast ( Event->Ctrl() )->Active() ); + mUIMap->Map()->DrawTileOver( reinterpret_cast ( Event->getControl() )->active() ); } else if ( "Show Blocked" == txt ) { - mUIMap->Map()->ShowBlocked( reinterpret_cast ( Event->Ctrl() )->Active() ); + mUIMap->Map()->ShowBlocked( reinterpret_cast ( Event->getControl() )->active() ); } else if ( "Zoom In" == txt ) { ZoomIn(); } else if ( "Zoom Out" == txt ) { @@ -1006,23 +1006,23 @@ void MapEditor::ZoomOut() { } void MapEditor::MapMenuClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "New Texture Atlas..." == txt ) { - UIWindow * tWin = mTheme->CreateWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); + UIWindow * tWin = mTheme->createWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); eeNew ( Tools::TextureAtlasEditor, ( tWin ) ); - tWin->Center(); - tWin->Show(); + tWin->center(); + tWin->show(); } else if ( "Add External Texture Atlas..." == txt ) { - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, std::string( "*" ) + EE_TEXTURE_ATLAS_EXTENSION ); + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, std::string( "*" ) + EE_TEXTURE_ATLAS_EXTENSION ); - TGDialog->Title( "Load Texture Atlas..." ); - TGDialog->AddEventListener( UIEvent::EventOpenFile, cb::Make1( this, &MapEditor::TextureAtlasOpen ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Load Texture Atlas..." ); + TGDialog->addEventListener( UIEvent::EventOpenFile, cb::Make1( this, &MapEditor::TextureAtlasOpen ) ); + TGDialog->center(); + TGDialog->show(); } else if ( "Properties..." == txt ) { eeNew( TileMapProperties, ( mUIMap->Map() ) ); } else if ( "Resize..." ) { @@ -1031,10 +1031,10 @@ void MapEditor::MapMenuClick( const UIEvent * Event ) { } void MapEditor::LayerMenuClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "Add Tile Layer..." == txt ) { eeNew( UIMapLayerNew, ( mUIMap, MAP_LAYER_TILED, cb::Make1( this, &MapEditor::OnLayerAdd ) ) ); @@ -1064,10 +1064,10 @@ void MapEditor::LayerMenuClick( const UIEvent * Event ) { } UIMessageBox * MapEditor::CreateAlert( const String& title, const String& text ) { - UIMessageBox * MsgBox = mTheme->CreateMessageBox( MSGBOX_OK, text ); - MsgBox->Title( title ); - MsgBox->Center(); - MsgBox->Show(); + UIMessageBox * MsgBox = mTheme->createMessageBox( MSGBOX_OK, text ); + MsgBox->title( title ); + MsgBox->center(); + MsgBox->show(); return MsgBox; } @@ -1099,12 +1099,12 @@ void MapEditor::RefreshGotyList() { TileMap::GOTypesList& GOList = mUIMap->Map()->GetVirtualObjectTypes(); for ( TileMap::GOTypesList::iterator it = GOList.begin(); it != GOList.end(); it++ ) { - mGOTypeList->ListBox()->AddListBoxItem( (*it) ); + mGOTypeList->getListBox()->addListBoxItem( (*it) ); } } void MapEditor::RefreshLayersList() { - mLayerList->ListBox()->Clear(); + mLayerList->getListBox()->clear(); if ( mUIMap->Map()->LayerCount() ) { std::vector layers; @@ -1113,63 +1113,63 @@ void MapEditor::RefreshLayersList() { layers.push_back( mUIMap->Map()->GetLayer(i)->Name() ); } - mLayerList->ListBox()->AddListBoxItems( layers ); + mLayerList->getListBox()->addListBoxItems( layers ); } if ( NULL != mCurLayer ) { - mLayerList->ListBox()->SetSelected( mCurLayer->Name() ); + mLayerList->getListBox()->setSelected( mCurLayer->Name() ); } else { if ( mUIMap->Map()->LayerCount() ) { - mLayerList->ListBox()->SetSelected(0); + mLayerList->getListBox()->setSelected(0); } } } void MapEditor::TextureAtlasOpen( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); - std::string sgname = FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( CDL->GetFullPath() ) ); + std::string sgname = FileSystem::fileRemoveExtension( FileSystem::fileNameFromPath( CDL->getFullPath() ) ); TextureAtlas * SG = TextureAtlasManager::instance()->getByName( sgname ); if ( NULL == SG ) { - TextureAtlasLoader tgl( CDL->GetFullPath() ); + TextureAtlasLoader tgl( CDL->getFullPath() ); if ( tgl.isLoaded() ) { - mTextureAtlasesList->ListBox()->AddListBoxItem( sgname ); + mTextureAtlasesList->getListBox()->addListBoxItem( sgname ); } } else { - if ( eeINDEX_NOT_FOUND == mTextureAtlasesList->ListBox()->GetItemIndex( sgname ) ) { - mTextureAtlasesList->ListBox()->AddListBoxItem( sgname ); + if ( eeINDEX_NOT_FOUND == mTextureAtlasesList->getListBox()->getItemIndex( sgname ) ) { + mTextureAtlasesList->getListBox()->addListBoxItem( sgname ); } } } void MapEditor::OnLayerAdd( UIMapLayerNew * UILayer ) { - bool SetSelected = ( 0 == mLayerList->ListBox()->Count() ) ? true : false; + bool SetSelected = ( 0 == mLayerList->getListBox()->count() ) ? true : false; - mLayerList->ListBox()->AddListBoxItem( UILayer->Name() ); + mLayerList->getListBox()->addListBoxItem( UILayer->Name() ); if ( SetSelected ) { mCurLayer = UILayer->Layer(); mUIMap->CurLayer( mCurLayer ); - mLayerList->ListBox()->SetSelected(0); + mLayerList->getListBox()->setSelected(0); } } void MapEditor::OnLayerSelect( const UIEvent * Event ) { - MapLayer * tLayer = mUIMap->Map()->GetLayer( mLayerList->Text() ); + MapLayer * tLayer = mUIMap->Map()->GetLayer( mLayerList->text() ); if ( NULL != tLayer ) { mCurLayer = tLayer; mUIMap->CurLayer( mCurLayer ); - mLayerChkVisible->Active( mCurLayer->Visible() ); + mLayerChkVisible->active( mCurLayer->Visible() ); - mLayerChkLights->Active( mCurLayer->LightsEnabled() ); + mLayerChkLights->active( mCurLayer->LightsEnabled() ); } } @@ -1185,32 +1185,32 @@ GameObject * MapEditor::CreateGameObject() { if ( GAMEOBJECT_TYPE_SUBTEXTURE == mCurGOType ) { - tObj = eeNew( GameObjectSubTexture, ( mCurGOFlags, mCurLayer, mGfxPreview->SubTexture() ) ); + tObj = eeNew( GameObjectSubTexture, ( mCurGOFlags, mCurLayer, mGfxPreview->subTexture() ) ); } else if ( GAMEOBJECT_TYPE_SUBTEXTUREEX == mCurGOType ) { - tObj = eeNew( GameObjectSubTextureEx, ( mCurGOFlags, mCurLayer, mGfxPreview->SubTexture() ) ); + tObj = eeNew( GameObjectSubTextureEx, ( mCurGOFlags, mCurLayer, mGfxPreview->subTexture() ) ); } else if ( GAMEOBJECT_TYPE_SPRITE == mCurGOType ) { - if ( mChkAnim->Active() ) { + if ( mChkAnim->active() ) { - Sprite * tAnimSprite = eeNew( Sprite, ( String::removeNumbersAtEnd( mGfxPreview->SubTexture()->getName() ) ) ); + Sprite * tAnimSprite = eeNew( Sprite, ( String::removeNumbersAtEnd( mGfxPreview->subTexture()->getName() ) ) ); tObj = eeNew( GameObjectSprite, ( mCurGOFlags, mCurLayer, tAnimSprite ) ); } else { - Sprite * tStatiSprite = eeNew( Sprite, ( mGfxPreview->SubTexture() ) ); + Sprite * tStatiSprite = eeNew( Sprite, ( mGfxPreview->subTexture() ) ); tObj = eeNew( GameObjectSprite, ( mCurGOFlags, mCurLayer, tStatiSprite ) ); } } else { //! Creates an empty game object. The client will interpret the GameObject Type, and instanciate the corresponding class. - if ( mChkDI->Active() ) - tObj = eeNew( GameObjectVirtual, ( String::hash( mDataIdInput->Text().toUtf8() ), mCurLayer, mCurGOFlags, mCurGOType ) ); + if ( mChkDI->active() ) + tObj = eeNew( GameObjectVirtual, ( String::hash( mDataIdInput->text().toUtf8() ), mCurLayer, mCurGOFlags, mCurGOType ) ); else - tObj = eeNew( GameObjectVirtual, ( mGfxPreview->SubTexture(), mCurLayer, mCurGOFlags, mCurGOType ) ); + tObj = eeNew( GameObjectVirtual, ( mGfxPreview->subTexture(), mCurLayer, mCurGOFlags, mCurGOType ) ); } return tObj; @@ -1247,7 +1247,7 @@ void MapEditor::AddGameObject() { Vector2i p( tMap->GetMouseMapPos() ); - if ( UIManager::instance()->GetInput()->isKeyDown( KEY_LCTRL ) ) { + if ( UIManager::instance()->getInput()->isKeyDown( KEY_LCTRL ) ) { p = tMap->GetMouseTilePosCoords(); } @@ -1270,21 +1270,21 @@ GameObject * MapEditor::GetCurrentGOOver() { void MapEditor::OnMapMouseClick( const UIEvent * Event ) { const UIEventMouse * MEvent = reinterpret_cast ( Event ); - if ( mSubTextureCont->Visible() ) { - if ( NULL == mCurLayer || NULL == mGfxPreview->SubTexture() || UIManager::instance()->DownControl() != mUIMap ) { + if ( mSubTextureCont->visible() ) { + if ( NULL == mCurLayer || NULL == mGfxPreview->subTexture() || UIManager::instance()->downControl() != mUIMap ) { if ( NULL == mCurLayer ) CreateNoLayerAlert( "No layers found" ); return; } - if ( MEvent->Flags() & EE_BUTTON_LMASK ) { + if ( MEvent->getFlags() & EE_BUTTON_LMASK ) { if ( mCurLayer->Type() == MAP_LAYER_OBJECT ) AddGameObject(); - } else if ( MEvent->Flags() & EE_BUTTON_RMASK ) { + } else if ( MEvent->getFlags() & EE_BUTTON_RMASK ) { if ( mCurLayer->Type() == MAP_LAYER_OBJECT ) RemoveGameObject(); - } else if ( MEvent->Flags() & EE_BUTTON_MMASK ) { + } else if ( MEvent->getFlags() & EE_BUTTON_MMASK ) { if ( mCurLayer->Type() == MAP_LAYER_TILED ) { GameObject * tObj = GetCurrentGOOver(); @@ -1292,7 +1292,7 @@ void MapEditor::OnMapMouseClick( const UIEvent * Event ) { tObj->Blocked( !tObj->Blocked() ); } } - } else if ( MEvent->Flags() & EE_BUTTON_WUMASK ) { + } else if ( MEvent->getFlags() & EE_BUTTON_WUMASK ) { if ( mCurLayer->Type() == MAP_LAYER_TILED ) { GameObject * tObj = GetCurrentGOOver(); @@ -1300,7 +1300,7 @@ void MapEditor::OnMapMouseClick( const UIEvent * Event ) { tObj->Mirrored( !tObj->Mirrored() ); } } - } else if ( MEvent->Flags() & EE_BUTTON_WDMASK ) { + } else if ( MEvent->getFlags() & EE_BUTTON_WDMASK ) { if ( mCurLayer->Type() == MAP_LAYER_TILED ) { GameObject * tObj = GetCurrentGOOver(); @@ -1315,15 +1315,15 @@ void MapEditor::OnMapMouseClick( const UIEvent * Event ) { void MapEditor::OnMapMouseDown( const UIEvent * Event ) { const UIEventMouse * MEvent = reinterpret_cast ( Event ); - if ( mSubTextureCont->Visible() ) { - if ( NULL == mCurLayer || NULL == mGfxPreview->SubTexture() || UIManager::instance()->DownControl() != mUIMap ) + if ( mSubTextureCont->visible() ) { + if ( NULL == mCurLayer || NULL == mGfxPreview->subTexture() || UIManager::instance()->downControl() != mUIMap ) return; - if ( MEvent->Flags() & EE_BUTTON_LMASK ) { + if ( MEvent->getFlags() & EE_BUTTON_LMASK ) { if ( mCurLayer->Type() == MAP_LAYER_TILED ) AddGameObjectToTile(); - } else if ( MEvent->Flags() & EE_BUTTON_RMASK ) { + } else if ( MEvent->getFlags() & EE_BUTTON_RMASK ) { if ( mCurLayer->Type() == MAP_LAYER_TILED ) RemoveGameObjectFromTile(); } @@ -1331,9 +1331,9 @@ void MapEditor::OnMapMouseDown( const UIEvent * Event ) { } void MapEditor::SetViewOptions() { - mChkShowGrid->Active( mUIMap->Map()->DrawGrid() ? true : false ); - mChkMarkTileOver->Active( mUIMap->Map()->DrawTileOver() ? true : false ); - mChkShowBlocked->Active( mUIMap->Map()->ShowBlocked() ? true : false ); + mChkShowGrid->active( mUIMap->Map()->DrawGrid() ? true : false ); + mChkMarkTileOver->active( mUIMap->Map()->DrawTileOver() ? true : false ); + mChkShowBlocked->active( mUIMap->Map()->ShowBlocked() ? true : false ); } }} diff --git a/src/eepp/gaming/mapeditor/maplayerproperties.cpp b/src/eepp/gaming/mapeditor/maplayerproperties.cpp index 268401584..f942d00fe 100644 --- a/src/eepp/gaming/mapeditor/maplayerproperties.cpp +++ b/src/eepp/gaming/mapeditor/maplayerproperties.cpp @@ -15,73 +15,73 @@ MapLayerProperties::MapLayerProperties( MapLayer * Map, RefreshLayerListCb Cb ) return; } - mUITheme = UIThemeManager::instance()->DefaultTheme(); + mUITheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mUITheme ) return; - mUIWindow = mUITheme->CreateWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapLayerProperties::WindowClose ) ); - mUIWindow->Title( "Layer Properties" ); + mUIWindow = mUITheme->createWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapLayerProperties::WindowClose ) ); + mUIWindow->title( "Layer Properties" ); Int32 InitialY = 16; Int32 DistFromTitle = 18; - UITextBox * Txt = mUITheme->CreateTextBox( "Layer name:", mUIWindow->Container(), Sizei(), Vector2i( 50, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIInput = mUITheme->CreateTextInput( mUIWindow->Container(), Sizei( 120, 22 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - mUIInput->Text( mLayer->Name() ); - mUIInput->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapLayerProperties::OKClick ) ); + UITextBox * Txt = mUITheme->createTextBox( "Layer name:", mUIWindow->getContainer(), Sizei(), Vector2i( 50, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIInput = mUITheme->createTextInput( mUIWindow->getContainer(), Sizei( 120, 22 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); + mUIInput->text( mLayer->Name() ); + mUIInput->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapLayerProperties::OKClick ) ); Uint32 TxtBoxFlags = UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_HALIGN_CENTER | UI_VALIGN_CENTER; - mUITheme->CreateTextBox( "Property Name", mUIWindow->Container(), Sizei(192, 24), Vector2i( 50, mUIInput->Pos().y + mUIInput->Size().height() + 12 ), TxtBoxFlags ); - UITextBox * TxtBox = mUITheme->CreateTextBox( "Property Value", mUIWindow->Container(), Sizei(192, 24), Vector2i( 50+192, mUIInput->Pos().y + mUIInput->Size().height() + 12 ), TxtBoxFlags ); + mUITheme->createTextBox( "Property Name", mUIWindow->getContainer(), Sizei(192, 24), Vector2i( 50, mUIInput->position().y + mUIInput->size().height() + 12 ), TxtBoxFlags ); + UITextBox * TxtBox = mUITheme->createTextBox( "Property Value", mUIWindow->getContainer(), Sizei(192, 24), Vector2i( 50+192, mUIInput->position().y + mUIInput->size().height() + 12 ), TxtBoxFlags ); - UIPushButton * OKButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "ok" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::OKClick ) ); + UIPushButton * OKButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "ok" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::OKClick ) ); - OKButton->Text( "OK" ); + OKButton->text( "OK" ); - UIPushButton * CancelButton = mUITheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mUITheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::CancelClick ) ); + CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->Container() ); - GridParams.PosSet( 50, TxtBox->Pos().y + TxtBox->Size().height() ); + GridParams.Parent( mUIWindow->getContainer() ); + GridParams.PosSet( 50, TxtBox->position().y + TxtBox->size().height() ); GridParams.SizeSet( 400, 350 ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; mGenGrid = eeNew( UIGenericGrid, ( GridParams ) ); - mGenGrid->Visible( true ); - mGenGrid->Enabled( true ); - mGenGrid->CollumnWidth( 0, 10 ); - mGenGrid->CollumnWidth( 1, 175 ); - mGenGrid->CollumnWidth( 2, 10 ); - mGenGrid->CollumnWidth( 3, 175 ); - mGenGrid->CollumnWidth( 4, 10 ); + mGenGrid->visible( true ); + mGenGrid->enabled( true ); + mGenGrid->collumnWidth( 0, 10 ); + mGenGrid->collumnWidth( 1, 175 ); + mGenGrid->collumnWidth( 2, 10 ); + mGenGrid->collumnWidth( 3, 175 ); + mGenGrid->collumnWidth( 4, 10 ); - Vector2i Pos( mGenGrid->Pos().x + mGenGrid->Size().width() + 10, mGenGrid->Pos().y ); + Vector2i Pos( mGenGrid->position().x + mGenGrid->size().width() + 10, mGenGrid->position().y ); - UIPushButton * AddButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "add" ) ); - AddButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::AddCellClick ) ); + UIPushButton * AddButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "add" ) ); + AddButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::AddCellClick ) ); - if ( NULL == AddButton->Icon()->SubTexture() ) - AddButton->Text( "+" ); + if ( NULL == AddButton->icon()->subTexture() ) + AddButton->text( "+" ); - Pos.y += AddButton->Size().height() + 5; + Pos.y += AddButton->size().height() + 5; - UIPushButton * RemoveButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "remove" ) ); - RemoveButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::RemoveCellClick ) ); + UIPushButton * RemoveButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "remove" ) ); + RemoveButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapLayerProperties::RemoveCellClick ) ); - if ( NULL == RemoveButton->Icon()->SubTexture() ) - RemoveButton->Text( "-" ); + if ( NULL == RemoveButton->icon()->subTexture() ) + RemoveButton->text( "-" ); CreateGridElems(); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); } MapLayerProperties::~MapLayerProperties() { @@ -90,14 +90,14 @@ MapLayerProperties::~MapLayerProperties() { void MapLayerProperties::SaveProperties() { mLayer->ClearProperties(); - for ( Uint32 i = 0; i < mGenGrid->Count(); i++ ) { - UIGridCell * Cell = mGenGrid->GetCell( i ); + for ( Uint32 i = 0; i < mGenGrid->getCount(); i++ ) { + UIGridCell * Cell = mGenGrid->getCell( i ); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - if ( NULL != Cell && Input->Text().size() && Input2->Text().size() ) { - mLayer->AddProperty( Input->Text(), Input2->Text() ); + if ( NULL != Cell && Input->text().size() && Input2->text().size() ) { + mLayer->AddProperty( Input->text(), Input2->text() ); } } } @@ -108,20 +108,20 @@ void MapLayerProperties::LoadProperties() { for ( MapLayer::PropertiesMap::iterator it = Proper.begin(); it != Proper.end(); it++ ) { UIGridCell * Cell = CreateCell(); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - Input->Text( it->first ); - Input2->Text( it->second ); + Input->text( it->first ); + Input2->text( it->second ); - mGenGrid->Add( Cell ); + mGenGrid->add( Cell ); } } void MapLayerProperties::OKClick( const UIEvent * Event ) { SaveProperties(); - mLayer->Name( mUIInput->Text().toUtf8() ); + mLayer->Name( mUIInput->text().toUtf8() ); if ( mRefreshCb.IsSet() ) { mRefreshCb(); @@ -139,27 +139,27 @@ void MapLayerProperties::WindowClose( const UIEvent * Event ) { } void MapLayerProperties::AddCellClick( const UIEvent * Event ) { - mGenGrid->Add( CreateCell() ); + mGenGrid->add( CreateCell() ); - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND == Index ) { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } void MapLayerProperties::RemoveCellClick( const UIEvent * Event ) { - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND != Index ) { - mGenGrid->Remove( Index ); + mGenGrid->remove( Index ); - if ( Index < mGenGrid->Count() ) { - mGenGrid->GetCell( Index )->Select(); + if ( Index < mGenGrid->getCount() ) { + mGenGrid->getCell( Index )->select(); } else { - if ( mGenGrid->Count() ) { + if ( mGenGrid->getCount() ) { if ( Index > 0 ) - mGenGrid->GetCell( Index - 1 )->Select(); + mGenGrid->getCell( Index - 1 )->select(); } } } @@ -168,16 +168,16 @@ void MapLayerProperties::RemoveCellClick( const UIEvent * Event ) { void MapLayerProperties::CreateGridElems() { LoadProperties(); - if ( 0 == mGenGrid->Count() ) { + if ( 0 == mGenGrid->getCount() ) { AddCellClick( NULL ); } else { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } UIGridCell * MapLayerProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->Container() ); + CellParams.Parent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; @@ -189,15 +189,15 @@ UIGridCell * MapLayerProperties::CreateCell() { UITextInput * TxtInput = eeNew( UITextInput, ( TxtInputParams ) ); UITextInput * TxtInput2 = eeNew( UITextInput, ( TxtInputParams ) ); - Cell->Cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 1, TxtInput ); + Cell->cell( 1, TxtInput ); - Cell->Cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 3, TxtInput2 ); + Cell->cell( 3, TxtInput2 ); - Cell->Cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); return Cell; } diff --git a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp b/src/eepp/gaming/mapeditor/mapobjectproperties.cpp index f826c1050..191823ac6 100644 --- a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp +++ b/src/eepp/gaming/mapeditor/mapobjectproperties.cpp @@ -14,78 +14,78 @@ MapObjectProperties::MapObjectProperties( GameObjectObject * Obj ) : return; } - mUITheme = UIThemeManager::instance()->DefaultTheme(); + mUITheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mUITheme ) return; - mUIWindow = mUITheme->CreateWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapObjectProperties::WindowClose ) ); - mUIWindow->Title( "Object Properties" ); + mUIWindow = mUITheme->createWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &MapObjectProperties::WindowClose ) ); + mUIWindow->title( "Object Properties" ); Int32 InitialY = 16; Int32 DistFromTitle = 18; - UITextBox * Txt = mUITheme->CreateTextBox( "Object name:", mUIWindow->Container(), Sizei(), Vector2i( 50, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIInput = mUITheme->CreateTextInput( mUIWindow->Container(), Sizei( 120, 22 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - mUIInput->Text( mObj->Name() ); - mUIInput->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapObjectProperties::OKClick ) ); + UITextBox * Txt = mUITheme->createTextBox( "Object name:", mUIWindow->getContainer(), Sizei(), Vector2i( 50, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIInput = mUITheme->createTextInput( mUIWindow->getContainer(), Sizei( 120, 22 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); + mUIInput->text( mObj->Name() ); + mUIInput->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapObjectProperties::OKClick ) ); - UITextBox * Txt2 = mUITheme->CreateTextBox( "Object type:", mUIWindow->Container(), Sizei(), Vector2i( 50+192, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIInput2 = mUITheme->CreateTextInput( mUIWindow->Container(), Sizei( 120, 22 ), Vector2i( Txt2->Pos().x + DistFromTitle, Txt2->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - mUIInput2->Text( mObj->TypeName() ); - mUIInput2->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapObjectProperties::OKClick ) ); + UITextBox * Txt2 = mUITheme->createTextBox( "Object type:", mUIWindow->getContainer(), Sizei(), Vector2i( 50+192, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIInput2 = mUITheme->createTextInput( mUIWindow->getContainer(), Sizei( 120, 22 ), Vector2i( Txt2->position().x + DistFromTitle, Txt2->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); + mUIInput2->text( mObj->TypeName() ); + mUIInput2->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &MapObjectProperties::OKClick ) ); Uint32 TxtBoxFlags = UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_HALIGN_CENTER | UI_VALIGN_CENTER; - mUITheme->CreateTextBox( "Property Name", mUIWindow->Container(), Sizei(192, 24), Vector2i( 50, mUIInput->Pos().y + mUIInput->Size().height() + 12 ), TxtBoxFlags ); - UITextBox * TxtBox = mUITheme->CreateTextBox( "Property Value", mUIWindow->Container(), Sizei(192, 24), Vector2i( 50+192, mUIInput->Pos().y + mUIInput->Size().height() + 12 ), TxtBoxFlags ); + mUITheme->createTextBox( "Property Name", mUIWindow->getContainer(), Sizei(192, 24), Vector2i( 50, mUIInput->position().y + mUIInput->size().height() + 12 ), TxtBoxFlags ); + UITextBox * TxtBox = mUITheme->createTextBox( "Property Value", mUIWindow->getContainer(), Sizei(192, 24), Vector2i( 50+192, mUIInput->position().y + mUIInput->size().height() + 12 ), TxtBoxFlags ); - UIPushButton * OKButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "ok" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::OKClick ) ); + UIPushButton * OKButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "ok" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::OKClick ) ); - OKButton->Text( "OK" ); + OKButton->text( "OK" ); - UIPushButton * CancelButton = mUITheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mUITheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::CancelClick ) ); + CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->Container() ); - GridParams.PosSet( 50, TxtBox->Pos().y + TxtBox->Size().height() ); + GridParams.Parent( mUIWindow->getContainer() ); + GridParams.PosSet( 50, TxtBox->position().y + TxtBox->size().height() ); GridParams.SizeSet( 400, 350 ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; mGenGrid = eeNew( UIGenericGrid, ( GridParams ) ); - mGenGrid->Visible( true ); - mGenGrid->Enabled( true ); - mGenGrid->CollumnWidth( 0, 10 ); - mGenGrid->CollumnWidth( 1, 175 ); - mGenGrid->CollumnWidth( 2, 10 ); - mGenGrid->CollumnWidth( 3, 175 ); - mGenGrid->CollumnWidth( 4, 10 ); + mGenGrid->visible( true ); + mGenGrid->enabled( true ); + mGenGrid->collumnWidth( 0, 10 ); + mGenGrid->collumnWidth( 1, 175 ); + mGenGrid->collumnWidth( 2, 10 ); + mGenGrid->collumnWidth( 3, 175 ); + mGenGrid->collumnWidth( 4, 10 ); - Vector2i Pos( mGenGrid->Pos().x + mGenGrid->Size().width() + 10, mGenGrid->Pos().y ); + Vector2i Pos( mGenGrid->position().x + mGenGrid->size().width() + 10, mGenGrid->position().y ); - UIPushButton * AddButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "add" ) ); - AddButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::AddCellClick ) ); + UIPushButton * AddButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "add" ) ); + AddButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::AddCellClick ) ); - if ( NULL == AddButton->Icon()->SubTexture() ) - AddButton->Text( "+" ); + if ( NULL == AddButton->icon()->subTexture() ) + AddButton->text( "+" ); - Pos.y += AddButton->Size().height() + 5; + Pos.y += AddButton->size().height() + 5; - UIPushButton * RemoveButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "remove" ) ); - RemoveButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::RemoveCellClick ) ); + UIPushButton * RemoveButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "remove" ) ); + RemoveButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapObjectProperties::RemoveCellClick ) ); - if ( NULL == RemoveButton->Icon()->SubTexture() ) - RemoveButton->Text( "-" ); + if ( NULL == RemoveButton->icon()->subTexture() ) + RemoveButton->text( "-" ); CreateGridElems(); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); } MapObjectProperties::~MapObjectProperties() { @@ -94,14 +94,14 @@ MapObjectProperties::~MapObjectProperties() { void MapObjectProperties::SaveProperties() { mObj->ClearProperties(); - for ( Uint32 i = 0; i < mGenGrid->Count(); i++ ) { - UIGridCell * Cell = mGenGrid->GetCell( i ); + for ( Uint32 i = 0; i < mGenGrid->getCount(); i++ ) { + UIGridCell * Cell = mGenGrid->getCell( i ); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - if ( NULL != Cell && Input->Text().size() && Input2->Text().size() ) { - mObj->AddProperty( Input->Text(), Input2->Text() ); + if ( NULL != Cell && Input->text().size() && Input2->text().size() ) { + mObj->AddProperty( Input->text(), Input2->text() ); } } } @@ -112,21 +112,21 @@ void MapObjectProperties::LoadProperties() { for ( GameObjectObject::PropertiesMap::iterator it = Proper.begin(); it != Proper.end(); it++ ) { UIGridCell * Cell = CreateCell(); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - Input->Text( it->first ); - Input2->Text( it->second ); + Input->text( it->first ); + Input2->text( it->second ); - mGenGrid->Add( Cell ); + mGenGrid->add( Cell ); } } void MapObjectProperties::OKClick( const UIEvent * Event ) { SaveProperties(); - mObj->Name( mUIInput->Text().toUtf8() ); - mObj->TypeName( mUIInput2->Text().toUtf8() ); + mObj->Name( mUIInput->text().toUtf8() ); + mObj->TypeName( mUIInput2->text().toUtf8() ); mUIWindow->CloseWindow(); } @@ -140,27 +140,27 @@ void MapObjectProperties::WindowClose( const UIEvent * Event ) { } void MapObjectProperties::AddCellClick( const UIEvent * Event ) { - mGenGrid->Add( CreateCell() ); + mGenGrid->add( CreateCell() ); - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND == Index ) { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } void MapObjectProperties::RemoveCellClick( const UIEvent * Event ) { - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND != Index ) { - mGenGrid->Remove( Index ); + mGenGrid->remove( Index ); - if ( Index < mGenGrid->Count() ) { - mGenGrid->GetCell( Index )->Select(); + if ( Index < mGenGrid->getCount() ) { + mGenGrid->getCell( Index )->select(); } else { - if ( mGenGrid->Count() ) { + if ( mGenGrid->getCount() ) { if ( Index > 0 ) - mGenGrid->GetCell( Index - 1 )->Select(); + mGenGrid->getCell( Index - 1 )->select(); } } } @@ -169,16 +169,16 @@ void MapObjectProperties::RemoveCellClick( const UIEvent * Event ) { void MapObjectProperties::CreateGridElems() { LoadProperties(); - if ( 0 == mGenGrid->Count() ) { + if ( 0 == mGenGrid->getCount() ) { AddCellClick( NULL ); } else { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } UIGridCell * MapObjectProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->Container() ); + CellParams.Parent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; @@ -190,15 +190,15 @@ UIGridCell * MapObjectProperties::CreateCell() { UITextInput * TxtInput = eeNew( UITextInput, ( TxtInputParams ) ); UITextInput * TxtInput2 = eeNew( UITextInput, ( TxtInputParams ) ); - Cell->Cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 1, TxtInput ); + Cell->cell( 1, TxtInput ); - Cell->Cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 3, TxtInput2 ); + Cell->cell( 3, TxtInput2 ); - Cell->Cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); return Cell; } diff --git a/src/eepp/gaming/mapeditor/tilemapproperties.cpp b/src/eepp/gaming/mapeditor/tilemapproperties.cpp index 3e5c658ce..b9f675228 100644 --- a/src/eepp/gaming/mapeditor/tilemapproperties.cpp +++ b/src/eepp/gaming/mapeditor/tilemapproperties.cpp @@ -13,14 +13,14 @@ TileMapProperties::TileMapProperties( TileMap * Map ) : return; } - mUITheme = UIThemeManager::instance()->DefaultTheme(); + mUITheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mUITheme ) return; - mUIWindow = mUITheme->CreateWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TileMapProperties::WindowClose ) ); - mUIWindow->Title( "Map Properties" ); + mUIWindow = mUITheme->createWindow( NULL, Sizei( 500, 500 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 500, 500 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TileMapProperties::WindowClose ) ); + mUIWindow->title( "Map Properties" ); Uint32 DiffIfLights = 0; @@ -28,104 +28,104 @@ TileMapProperties::TileMapProperties( TileMap * Map ) : if ( mMap->LightsEnabled() ) { DiffIfLights = 100; - UITextBox * Txt = mUITheme->CreateTextBox( "Map Base Color:", mUIWindow->Container(), Sizei(), Vector2i( 50, 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + UITextBox * Txt = mUITheme->createTextBox( "Map Base Color:", mUIWindow->getContainer(), Sizei(), Vector2i( 50, 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; - ComParams.Parent( mUIWindow->Container() ); - ComParams.PosSet( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 4 ); + ComParams.Parent( mUIWindow->getContainer() ); + ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); ComParams.SizeSet( 64, 64 ); - ComParams.Background.Color( mMap->BaseColor() ); - ComParams.Border.Color( ColorA( 100, 100, 100, 200 ) ); + ComParams.Background.color( mMap->BaseColor() ); + ComParams.Border.color( ColorA( 100, 100, 100, 200 ) ); ComParams.Flags |= UI_FILL_BACKGROUND | UI_BORDER; mUIBaseColor = eeNew( UIComplexControl, ( ComParams ) ); - mUIBaseColor->Visible( true ); - mUIBaseColor->Enabled( true ); + mUIBaseColor->visible( true ); + mUIBaseColor->enabled( true ); - Txt = mUITheme->CreateTextBox( "Red Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIBaseColor->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIRedSlider = mUITheme->CreateSlider( mUIWindow->Container(), Sizei( 255, 20 ), Vector2i( Txt->Pos().x + Txt->Size().width() + 16, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIRedSlider->MaxValue( 255 ); - mUIRedSlider->Value( mMap->BaseColor().r() ); - mUIRedSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnRedChange ) ); + Txt = mUITheme->createTextBox( "Red Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIBaseColor->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedSlider = mUITheme->createSlider( mUIWindow->getContainer(), Sizei( 255, 20 ), Vector2i( Txt->position().x + Txt->size().width() + 16, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIRedSlider->maxValue( 255 ); + mUIRedSlider->value( mMap->BaseColor().r() ); + mUIRedSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnRedChange ) ); - mUIRedTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().r() ), mUIWindow->Container(), Sizei(), Vector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mUITheme->createTextBox( String::toStr( (Uint32)mMap->BaseColor().r() ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIRedSlider->position().x + mUIRedSlider->size().width() + 4, mUIRedSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mUITheme->CreateTextBox( "Green Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIGreenSlider = mUITheme->CreateSlider( mUIWindow->Container(), Sizei( 255, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIGreenSlider->MaxValue( 255 ); - mUIGreenSlider->Value( mMap->BaseColor().g() ); - mUIGreenSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnGreenChange ) ); + Txt = mUITheme->createTextBox( "Green Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIRedSlider->position().y + mUIRedSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenSlider = mUITheme->createSlider( mUIWindow->getContainer(), Sizei( 255, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIGreenSlider->maxValue( 255 ); + mUIGreenSlider->value( mMap->BaseColor().g() ); + mUIGreenSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnGreenChange ) ); - mUIGreenTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().g() ), mUIWindow->Container(), Sizei(), Vector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mUITheme->createTextBox( String::toStr( (Uint32)mMap->BaseColor().g() ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIGreenSlider->position().x + mUIGreenSlider->size().width() + 4, mUIGreenSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mUITheme->CreateTextBox( "Blue Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIBlueSlider = mUITheme->CreateSlider( mUIWindow->Container(), Sizei( 255, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIBlueSlider->MaxValue( 255 ); - mUIBlueSlider->Value( mMap->BaseColor().b() ); - mUIBlueSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnBlueChange ) ); + Txt = mUITheme->createTextBox( "Blue Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIGreenSlider->position().y + mUIGreenSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueSlider = mUITheme->createSlider( mUIWindow->getContainer(), Sizei( 255, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIBlueSlider->maxValue( 255 ); + mUIBlueSlider->value( mMap->BaseColor().b() ); + mUIBlueSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TileMapProperties::OnBlueChange ) ); - mUIBlueTxt = mUITheme->CreateTextBox( String::toStr( (Uint32)mMap->BaseColor().b() ), mUIWindow->Container(), Sizei(), Vector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mUITheme->createTextBox( String::toStr( (Uint32)mMap->BaseColor().b() ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIBlueSlider->position().x + mUIBlueSlider->size().width() + 4, mUIBlueSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); } Uint32 TxtBoxFlags = UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_HALIGN_CENTER | UI_VALIGN_CENTER; - UITextBox * TxtBox = mUITheme->CreateTextBox( "Property Name", mUIWindow->Container(), Sizei(192, 24), Vector2i( 50, 10 + DiffIfLights ), TxtBoxFlags ); - mUITheme->CreateTextBox( "Property Value", mUIWindow->Container(), Sizei(192, 24), Vector2i(50+192, TxtBox->Pos().y ), TxtBoxFlags ); + UITextBox * TxtBox = mUITheme->createTextBox( "Property Name", mUIWindow->getContainer(), Sizei(192, 24), Vector2i( 50, 10 + DiffIfLights ), TxtBoxFlags ); + mUITheme->createTextBox( "Property Value", mUIWindow->getContainer(), Sizei(192, 24), Vector2i(50+192, TxtBox->position().y ), TxtBoxFlags ); - UIPushButton * OKButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "ok" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::OKClick ) ); + UIPushButton * OKButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "ok" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::OKClick ) ); - OKButton->Text( "OK" ); + OKButton->text( "OK" ); - UIPushButton * CancelButton = mUITheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mUITheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::CancelClick ) ); + CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->Container() ); - GridParams.PosSet( 50, TxtBox->Pos().y + 20 ); + GridParams.Parent( mUIWindow->getContainer() ); + GridParams.PosSet( 50, TxtBox->position().y + 20 ); GridParams.SizeSet( 400, 400 - DiffIfLights ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; mGenGrid = eeNew( UIGenericGrid, ( GridParams ) ); - mGenGrid->Visible( true ); - mGenGrid->Enabled( true ); - mGenGrid->CollumnWidth( 0, 10 ); - mGenGrid->CollumnWidth( 1, 175 ); - mGenGrid->CollumnWidth( 2, 10 ); - mGenGrid->CollumnWidth( 3, 175 ); - mGenGrid->CollumnWidth( 4, 10 ); + mGenGrid->visible( true ); + mGenGrid->enabled( true ); + mGenGrid->collumnWidth( 0, 10 ); + mGenGrid->collumnWidth( 1, 175 ); + mGenGrid->collumnWidth( 2, 10 ); + mGenGrid->collumnWidth( 3, 175 ); + mGenGrid->collumnWidth( 4, 10 ); - Vector2i Pos( mGenGrid->Pos().x + mGenGrid->Size().width() + 10, mGenGrid->Pos().y ); + Vector2i Pos( mGenGrid->position().x + mGenGrid->size().width() + 10, mGenGrid->position().y ); - UIPushButton * AddButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "add" ) ); - AddButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::AddCellClick ) ); + UIPushButton * AddButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "add" ) ); + AddButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::AddCellClick ) ); - if ( NULL == AddButton->Icon()->SubTexture() ) - AddButton->Text( "+" ); + if ( NULL == AddButton->icon()->subTexture() ) + AddButton->text( "+" ); - Pos.y += AddButton->Size().height() + 5; + Pos.y += AddButton->size().height() + 5; - UIPushButton * RemoveButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->GetIconByName( "remove" ) ); - RemoveButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::RemoveCellClick ) ); + UIPushButton * RemoveButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei(24,21), Pos, UI_CONTROL_ALIGN_CENTER | UI_AUTO_SIZE | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP, mUITheme->getIconByName( "remove" ) ); + RemoveButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TileMapProperties::RemoveCellClick ) ); - if ( NULL == RemoveButton->Icon()->SubTexture() ) - RemoveButton->Text( "-" ); + if ( NULL == RemoveButton->icon()->subTexture() ) + RemoveButton->text( "-" ); CreateGridElems(); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); } TileMapProperties::~TileMapProperties() { } void TileMapProperties::OnRedChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Red = (Uint8)mUIRedSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Red = (Uint8)mUIRedSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIRedTxt->text( String::toStr( (Int32)mUIRedSlider->value() ) ); ColorA MapCol = mMap->BaseColor(); MapCol.Red = Col.Red; @@ -133,10 +133,10 @@ void TileMapProperties::OnRedChange( const UIEvent * Event ) { } void TileMapProperties::OnGreenChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Green = (Uint8)mUIGreenSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Green = (Uint8)mUIGreenSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIGreenTxt->text( String::toStr( (Uint32)mUIGreenSlider->value() ) ); ColorA MapCol = mMap->BaseColor(); MapCol.Green = Col.Green; @@ -144,10 +144,10 @@ void TileMapProperties::OnGreenChange( const UIEvent * Event ) { } void TileMapProperties::OnBlueChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Blue = (Uint8)mUIBlueSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Blue = (Uint8)mUIBlueSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIBlueTxt->text( String::toStr( (Uint32)mUIBlueSlider->value() ) ); ColorA MapCol = mMap->BaseColor(); MapCol.Blue = Col.Blue; @@ -158,14 +158,14 @@ void TileMapProperties::OnBlueChange( const UIEvent * Event ) { void TileMapProperties::SaveProperties() { mMap->ClearProperties(); - for ( Uint32 i = 0; i < mGenGrid->Count(); i++ ) { - UIGridCell * Cell = mGenGrid->GetCell( i ); + for ( Uint32 i = 0; i < mGenGrid->getCount(); i++ ) { + UIGridCell * Cell = mGenGrid->getCell( i ); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - if ( NULL != Cell && Input->Text().size() && Input2->Text().size() ) { - mMap->AddProperty( Input->Text(), Input2->Text() ); + if ( NULL != Cell && Input->text().size() && Input2->text().size() ) { + mMap->AddProperty( Input->text(), Input2->text() ); } } } @@ -176,13 +176,13 @@ void TileMapProperties::LoadProperties() { for ( TileMap::PropertiesMap::iterator it = Proper.begin(); it != Proper.end(); it++ ) { UIGridCell * Cell = CreateCell(); - UITextInput * Input = reinterpret_cast( Cell->Cell( 1 ) ); - UITextInput * Input2 = reinterpret_cast( Cell->Cell( 3 ) ); + UITextInput * Input = reinterpret_cast( Cell->cell( 1 ) ); + UITextInput * Input2 = reinterpret_cast( Cell->cell( 3 ) ); - Input->Text( it->first ); - Input2->Text( it->second ); + Input->text( it->first ); + Input2->text( it->second ); - mGenGrid->Add( Cell ); + mGenGrid->add( Cell ); } } @@ -201,27 +201,27 @@ void TileMapProperties::WindowClose( const UIEvent * Event ) { } void TileMapProperties::AddCellClick( const UIEvent * Event ) { - mGenGrid->Add( CreateCell() ); + mGenGrid->add( CreateCell() ); - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND == Index ) { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } void TileMapProperties::RemoveCellClick( const UIEvent * Event ) { - Uint32 Index = mGenGrid->GetItemSelectedIndex(); + Uint32 Index = mGenGrid->getItemSelectedIndex(); if ( eeINDEX_NOT_FOUND != Index ) { - mGenGrid->Remove( Index ); + mGenGrid->remove( Index ); - if ( Index < mGenGrid->Count() ) { - mGenGrid->GetCell( Index )->Select(); + if ( Index < mGenGrid->getCount() ) { + mGenGrid->getCell( Index )->select(); } else { - if ( mGenGrid->Count() ) { + if ( mGenGrid->getCount() ) { if ( Index > 0 ) - mGenGrid->GetCell( Index - 1 )->Select(); + mGenGrid->getCell( Index - 1 )->select(); } } } @@ -230,16 +230,16 @@ void TileMapProperties::RemoveCellClick( const UIEvent * Event ) { void TileMapProperties::CreateGridElems() { LoadProperties(); - if ( 0 == mGenGrid->Count() ) { + if ( 0 == mGenGrid->getCount() ) { AddCellClick( NULL ); } else { - mGenGrid->GetCell( 0 )->Select(); + mGenGrid->getCell( 0 )->select(); } } UIGridCell * TileMapProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->Container() ); + CellParams.Parent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; @@ -251,15 +251,15 @@ UIGridCell * TileMapProperties::CreateCell() { UITextInput * TxtInput = eeNew( UITextInput, ( TxtInputParams ) ); UITextInput * TxtInput2 = eeNew( UITextInput, ( TxtInputParams ) ); - Cell->Cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 0, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 1, TxtInput ); + Cell->cell( 1, TxtInput ); - Cell->Cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 2, eeNew( UIComplexControl, ( CControl ) ) ); - Cell->Cell( 3, TxtInput2 ); + Cell->cell( 3, TxtInput2 ); - Cell->Cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); + Cell->cell( 4, eeNew( UIComplexControl, ( CControl ) ) ); return Cell; } diff --git a/src/eepp/gaming/mapeditor/uigotypenew.cpp b/src/eepp/gaming/mapeditor/uigotypenew.cpp index 203f8e868..546ded4e5 100644 --- a/src/eepp/gaming/mapeditor/uigotypenew.cpp +++ b/src/eepp/gaming/mapeditor/uigotypenew.cpp @@ -9,37 +9,37 @@ UIGOTypeNew::UIGOTypeNew( cb::Callback2 Cb ) : mUIInput( NULL ), mCb( Cb ) { - mUITheme = UIThemeManager::instance()->DefaultTheme(); + mUITheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mUITheme ) return; - mUIWindow = mUITheme->CreateWindow( NULL, Sizei( 278, 114 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 278, 114 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIGOTypeNew::WindowClose ) ); - mUIWindow->Title( "Add GameObject Type" ); + mUIWindow = mUITheme->createWindow( NULL, Sizei( 278, 114 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 278, 114 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIGOTypeNew::WindowClose ) ); + mUIWindow->title( "Add GameObject Type" ); Int32 InitialY = 16; Int32 DistFromTitle = 18; - UITextBox * Txt = mUITheme->CreateTextBox( "GameObject Type Name", mUIWindow->Container(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + UITextBox * Txt = mUITheme->createTextBox( "GameObject Type Name", mUIWindow->getContainer(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIInput = mUITheme->CreateTextInput( mUIWindow->Container(), Sizei( 120, 22 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); + mUIInput = mUITheme->createTextInput( mUIWindow->getContainer(), Sizei( 120, 22 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - UIPushButton * OKButton = mUITheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "add" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIGOTypeNew::OKClick ) ); - mUIInput->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UIGOTypeNew::OKClick ) ); + UIPushButton * OKButton = mUITheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "add" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIGOTypeNew::OKClick ) ); + mUIInput->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UIGOTypeNew::OKClick ) ); - OKButton->Text( "Add" ); + OKButton->text( "Add" ); - UIPushButton * CancelButton = mUITheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIGOTypeNew::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mUITheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mUITheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIGOTypeNew::CancelClick ) ); + CancelButton->text( "Cancel" ); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); - mUIInput->SetFocus(); + mUIInput->setFocus(); } UIGOTypeNew::~UIGOTypeNew() { @@ -47,9 +47,9 @@ UIGOTypeNew::~UIGOTypeNew() { } void UIGOTypeNew::OKClick( const UIEvent * Event ) { - if ( mUIInput->Text().size() ) { + if ( mUIInput->text().size() ) { if ( mCb.IsSet() ) - mCb( mUIInput->Text().toUtf8(), String::hash( mUIInput->Text().toUtf8() ) ); + mCb( mUIInput->text().toUtf8(), String::hash( mUIInput->text().toUtf8() ) ); } mUIWindow->CloseWindow(); diff --git a/src/eepp/gaming/mapeditor/uimap.cpp b/src/eepp/gaming/mapeditor/uimap.cpp index 703626560..a813338c3 100644 --- a/src/eepp/gaming/mapeditor/uimap.cpp +++ b/src/eepp/gaming/mapeditor/uimap.cpp @@ -35,9 +35,9 @@ UIMap::UIMap( const UIComplexControl::CreateParams& Params, UITheme * Theme, Til mMap->SetDrawCallback( cb::Make0( this, &UIMap::MapDraw ) ); mDragButton = EE_BUTTON_MMASK; - DragEnable( true ); + dragEnable( true ); - UpdateScreenPos(); + updateScreenPos(); } UIMap::~UIMap() { @@ -69,37 +69,37 @@ Uint32 UIMap::OnDrag( const Vector2i& Pos ) { void UIMap::ReplaceMap( TileMap * newMap ) { eeSAFE_DELETE( mMap ); mMap = newMap; - UpdateScreenPos(); + updateScreenPos(); } TileMap * UIMap::Map() const { return mMap; } -void UIMap::Draw() { - UIComplexControl::Draw(); +void UIMap::draw() { + UIComplexControl::draw(); if ( NULL != mMap ) { mMap->Draw(); } } -void UIMap::UpdateScreenPos() { - UIComplexControl::UpdateScreenPos(); +void UIMap::updateScreenPos() { + UIComplexControl::updateScreenPos(); if ( NULL != mMap ) { mMap->Position( mScreenPos ); } } -void UIMap::Update() { - UIComplexControl::Update(); +void UIMap::update() { + UIComplexControl::update(); if ( NULL != mMap ) { mMap->Update(); - if ( mEnabled && mVisible && IsMouseOver() ) { - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + if ( mEnabled && mVisible && isMouseOver() ) { + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); if ( EDITING_LIGHT == mEditingMode ) { if ( NULL != mSelLight ) { @@ -134,7 +134,7 @@ void UIMap::Update() { } } - Flags = UIManager::instance()->GetInput()->pressTrigger(); + Flags = UIManager::instance()->getInput()->pressTrigger(); if ( Flags & EE_BUTTON_MMASK ) { mSelLight->Position( mMap->GetMouseMapPosf() ); @@ -183,7 +183,7 @@ void UIMap::SelectPolyObj() { } } else { if ( mAlertCb.IsSet() ) { - mAlertCb( "No layer found", "An Object Layer must be selected first." )->SetFocus(); + mAlertCb( "No layer found", "An Object Layer must be selected first." )->setFocus(); } } } @@ -220,8 +220,8 @@ void UIMap::DragPoly( Uint32 Flags, Uint32 PFlags ) { } void UIMap::ManageObject( Uint32 Flags ) { - Uint32 PFlags = UIManager::instance()->GetInput()->pressTrigger(); - Uint32 LPFlags = UIManager::instance()->GetInput()->lastPressTrigger(); + Uint32 PFlags = UIManager::instance()->getInput()->pressTrigger(); + Uint32 LPFlags = UIManager::instance()->getInput()->lastPressTrigger(); switch ( mEditingObjMode ) { @@ -316,16 +316,16 @@ void UIMap::TryToSelectLight() { } } -void UIMap::OnSizeChange() { +void UIMap::onSizeChange() { if ( NULL != mMap ) { mMap->Position( mScreenPos ); mMap->ViewSize( mSize ); } - UIComplexControl::OnSizeChange(); + UIComplexControl::onSizeChange(); } -Uint32 UIMap::OnMouseMove( const Vector2i& Pos, const Uint32 Flags ) { +Uint32 UIMap::onMouseMove( const Vector2i& Pos, const Uint32 Flags ) { if ( NULL != mMap ) { if ( EDITING_LIGHT == mEditingMode && NULL != mAddLight ) { mAddLight->Position( mMap->GetMouseMapPosf() ); @@ -337,11 +337,11 @@ Uint32 UIMap::OnMouseMove( const Vector2i& Pos, const Uint32 Flags ) { if ( mLastMouseTilePos != mp ) { mLastMouseTilePos = mp; - mTileBox->Text( String::toStr( mp.x ) + "," + String::toStr( mp.y ) ); + mTileBox->text( String::toStr( mp.x ) + "," + String::toStr( mp.y ) ); } } - return UIComplexControl::OnMouseMove( Pos, Flags ); + return UIComplexControl::onMouseMove( Pos, Flags ); } void UIMap::AddLight( MapLight * Light ) { @@ -497,8 +497,8 @@ void UIMap::ClearLights() { mAddLight = NULL; } -void UIMap::OnAlphaChange() { - UIComplexControl::OnAlphaChange(); +void UIMap::onAlphaChange() { + UIComplexControl::onAlphaChange(); if ( NULL != mMap ) { mMap->BackAlpha( (Uint8)mAlpha ); @@ -532,8 +532,8 @@ void UIMap::SetUpdateScrollCb( UpdateScrollCb Cb ) { mUpdateScrollCb = Cb; } -Uint32 UIMap::OnMessage( const UIMessage * Msg ) { - if ( Msg->Msg() == UIMessage::MsgClick && Msg->Sender() == this && ( Msg->Flags() & EE_BUTTON_RMASK ) ) { +Uint32 UIMap::onMessage( const UIMessage * Msg ) { + if ( Msg->getMsg() == UIMessage::MsgClick && Msg->getSender() == this && ( Msg->getFlags() & EE_BUTTON_RMASK ) ) { if ( SELECT_OBJECTS == mEditingObjMode && NULL != mSelObj && mSelObj->PointInside( mMap->GetMouseMapPosf() ) ) { CreateObjPopUpMenu(); } @@ -543,11 +543,11 @@ Uint32 UIMap::OnMessage( const UIMessage * Msg ) { } void UIMap::ObjItemClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; if ( NULL != mSelObj && NULL != mCurLayer && mCurLayer->Type() == MAP_LAYER_OBJECT && mSelObj->Layer() == mCurLayer ) { - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); MapObjectLayer * tLayer = reinterpret_cast( mCurLayer ); @@ -565,18 +565,18 @@ void UIMap::ObjItemClick( const UIEvent * Event ) { } void UIMap::CreateObjPopUpMenu() { - UIPopUpMenu * Menu = mTheme->CreatePopUpMenu(); + UIPopUpMenu * Menu = mTheme->createPopUpMenu(); Menu->Add( "Duplicate Object" ); Menu->Add( "Remove Object" ); Menu->AddSeparator(); Menu->Add( "Object Properties..." ); - Menu->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &UIMap::ObjItemClick ) ); + Menu->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &UIMap::ObjItemClick ) ); - if ( Menu->Show() ) { - Vector2i Pos = UIManager::instance()->GetInput()->getMousePos(); + if ( Menu->show() ) { + Vector2i Pos = UIManager::instance()->getInput()->getMousePos(); UIMenu::FixMenuPos( Pos , Menu ); - Menu->Pos( Pos ); + Menu->position( Pos ); } } diff --git a/src/eepp/gaming/mapeditor/uimap.hpp b/src/eepp/gaming/mapeditor/uimap.hpp index da7b9de5e..944dc3074 100644 --- a/src/eepp/gaming/mapeditor/uimap.hpp +++ b/src/eepp/gaming/mapeditor/uimap.hpp @@ -39,9 +39,9 @@ class EE_API UIMap : public UIComplexControl { virtual ~UIMap(); - virtual void Draw(); + virtual void draw(); - virtual void Update(); + virtual void update(); TileMap * Map() const; @@ -131,17 +131,17 @@ class EE_API UIMap : public UIComplexControl { UpdateScrollCb mUpdateScrollCb; - virtual Uint32 OnMessage( const UIMessage * Msg ); + virtual Uint32 onMessage( const UIMessage * Msg ); - virtual Uint32 OnMouseMove( const Vector2i& Pos, const Uint32 Flags ); + virtual Uint32 onMouseMove( const Vector2i& position, const Uint32 flags ); - virtual void OnSizeChange(); + virtual void onSizeChange(); - virtual void UpdateScreenPos(); + virtual void updateScreenPos(); - virtual void OnAlphaChange(); + virtual void onAlphaChange(); - virtual Uint32 OnDrag( const Vector2i& Pos ); + virtual Uint32 OnDrag( const Vector2i& position ); void ObjItemClick( const UIEvent * Event ); @@ -149,7 +149,7 @@ class EE_API UIMap : public UIComplexControl { void TryToSelectLight(); - void ManageObject( Uint32 Flags ); + void ManageObject( Uint32 flags ); Vector2f GetMouseMapPos(); @@ -159,7 +159,7 @@ class EE_API UIMap : public UIComplexControl { void SetPointRect( Vector2f p ); - void DragPoly( Uint32 Flags, Uint32 PFlags ); + void DragPoly( Uint32 flags, Uint32 PFlags ); }; }}} diff --git a/src/eepp/gaming/mapeditor/uimaplayernew.cpp b/src/eepp/gaming/mapeditor/uimaplayernew.cpp index 431cad807..caa8d1aa6 100644 --- a/src/eepp/gaming/mapeditor/uimaplayernew.cpp +++ b/src/eepp/gaming/mapeditor/uimaplayernew.cpp @@ -11,44 +11,44 @@ UIMapLayerNew::UIMapLayerNew( UIMap * Map, EE_LAYER_TYPE Type, NewLayerCb newLay mUIWindow( NULL ), mLayer( NULL ) { - mTheme = UIThemeManager::instance()->DefaultTheme(); + mTheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mTheme ) return; - mUIWindow = mTheme->CreateWindow( NULL, Sizei( 278, 114 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 278, 114 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIMapLayerNew::WindowClose ) ); + mUIWindow = mTheme->createWindow( NULL, Sizei( 278, 114 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL, Sizei( 278, 114 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIMapLayerNew::WindowClose ) ); if ( MAP_LAYER_TILED == mType ) - mUIWindow->Title( "New Tile Layer" ); + mUIWindow->title( "New Tile Layer" ); else if ( MAP_LAYER_OBJECT == mType ) - mUIWindow->Title( "New Object Layer" ); + mUIWindow->title( "New Object Layer" ); Int32 InitialY = 16; Int32 DistFromTitle = 18; - UITextBox * Txt = mTheme->CreateTextBox( "Layer Name", mUIWindow->Container(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + UITextBox * Txt = mTheme->createTextBox( "Layer Name", mUIWindow->getContainer(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUILayerName = mTheme->CreateTextInput( mUIWindow->Container(), Sizei( 120, 22 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); - mUILayerName->Text( "Layer " + String::toStr( mUIMap->Map()->LayerCount() + 1 ) ); + mUILayerName = mTheme->createTextInput( mUIWindow->getContainer(), Sizei( 120, 22 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE, true, 64 ); + mUILayerName->text( "Layer " + String::toStr( mUIMap->Map()->LayerCount() + 1 ) ); - UIPushButton * OKButton = mTheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "add" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapLayerNew::OKClick ) ); - mUILayerName->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UIMapLayerNew::OKClick ) ); + UIPushButton * OKButton = mTheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "add" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapLayerNew::OKClick ) ); + mUILayerName->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UIMapLayerNew::OKClick ) ); - OKButton->Text( "Add" ); + OKButton->text( "Add" ); - UIPushButton * CancelButton = mTheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapLayerNew::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mTheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapLayerNew::CancelClick ) ); + CancelButton->text( "Cancel" ); - mUIWindow->AddEventListener( UIEvent::EventKeyUp, cb::Make1( this, &UIMapLayerNew::OnKeyUp ) ); + mUIWindow->addEventListener( UIEvent::EventKeyUp, cb::Make1( this, &UIMapLayerNew::OnKeyUp ) ); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); - mUILayerName->SetFocus(); + mUILayerName->setFocus(); } UIMapLayerNew::~UIMapLayerNew() { @@ -58,14 +58,14 @@ UIMapLayerNew::~UIMapLayerNew() { void UIMapLayerNew::OnKeyUp( const UIEvent * Event ) { const UIEventKey * KeyEvent = reinterpret_cast ( Event ); - if ( KeyEvent->KeyCode() == KEY_ESCAPE ) { + if ( KeyEvent->getKeyCode() == KEY_ESCAPE ) { CancelClick( Event ); } } void UIMapLayerNew::OKClick( const UIEvent * Event ) { - if ( mUILayerName->Text().size() ) { - mLayer = mUIMap->Map()->AddLayer( mType, LAYER_FLAG_VISIBLE | LAYER_FLAG_LIGHTS_ENABLED, mUILayerName->Text() ); + if ( mUILayerName->text().size() ) { + mLayer = mUIMap->Map()->AddLayer( mType, LAYER_FLAG_VISIBLE | LAYER_FLAG_LIGHTS_ENABLED, mUILayerName->text() ); if ( mNewLayerCb.IsSet() ) mNewLayerCb( this ); @@ -91,7 +91,7 @@ UITextInput * UIMapLayerNew::UILayerName() const { } const String& UIMapLayerNew::Name() const { - return mUILayerName->Text(); + return mUILayerName->text(); } MapLayer * UIMapLayerNew::Layer() const { diff --git a/src/eepp/gaming/mapeditor/uimapnew.cpp b/src/eepp/gaming/mapeditor/uimapnew.cpp index 6ea40ca69..3d4b01de0 100644 --- a/src/eepp/gaming/mapeditor/uimapnew.cpp +++ b/src/eepp/gaming/mapeditor/uimapnew.cpp @@ -12,222 +12,222 @@ UIMapNew::UIMapNew( UIMap * Map, cb::Callback0 NewMapCb, bool ResizeMap ) mNewMapCb( NewMapCb ), mResizeMap( ResizeMap ) { - mTheme = UIThemeManager::instance()->DefaultTheme(); + mTheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mTheme ) return; - mUIWindow = mTheme->CreateWindow( NULL, Sizei( 320, 380 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_SHARE_ALPHA_WITH_CHILDS | UI_WIN_MODAL, Sizei( 320, 380 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIMapNew::WindowClose ) ); + mUIWindow = mTheme->createWindow( NULL, Sizei( 320, 380 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_CLOSE_BUTTON | UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS | UI_WIN_SHARE_ALPHA_WITH_CHILDS | UI_WIN_MODAL, Sizei( 320, 380 ) ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &UIMapNew::WindowClose ) ); if ( !mResizeMap ) { - mUIWindow->Title( "New Map" ); + mUIWindow->title( "New Map" ); } else { - mUIWindow->Title( "Resize Map" ); + mUIWindow->title( "Resize Map" ); } Int32 InitialY = 16; Int32 DistFromTitle = 18; - UITextBox * Txt = mTheme->CreateTextBox( "Map Size", mUIWindow->Container(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + UITextBox * Txt = mTheme->createTextBox( "Map Size", mUIWindow->getContainer(), Sizei(), Vector2i( 16, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mTheme->CreateTextBox( "Width:", mUIWindow->Container(), Sizei( 46, 24 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); + Txt = mTheme->createTextBox( "Width:", mUIWindow->getContainer(), Sizei( 46, 24 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); - mUIMapWidth = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 53, 24 ), Vector2i( Txt->Pos().x + Txt->Size().width(), Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 100, false ); - mUIMapWidth->MinValue(1); + mUIMapWidth = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 53, 24 ), Vector2i( Txt->position().x + Txt->size().width(), Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 100, false ); + mUIMapWidth->minValue(1); if ( ResizeMap ) { - mUIMapWidth->Value( mUIMap->Map()->Size().width() ); + mUIMapWidth->value( mUIMap->Map()->Size().width() ); } - Txt = mTheme->CreateTextBox( "Height:", mUIWindow->Container(), Sizei( 46, 24 ), Vector2i( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); + Txt = mTheme->createTextBox( "Height:", mUIWindow->getContainer(), Sizei( 46, 24 ), Vector2i( Txt->position().x, Txt->position().y + Txt->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); - mUIMapHeight = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 53, 24 ), Vector2i( Txt->Pos().x + Txt->Size().width(), Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 100, false ); - mUIMapHeight->MinValue(1); + mUIMapHeight = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 53, 24 ), Vector2i( Txt->position().x + Txt->size().width(), Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 100, false ); + mUIMapHeight->minValue(1); if ( ResizeMap ) { - mUIMapHeight->Value( mUIMap->Map()->Size().height() ); + mUIMapHeight->value( mUIMap->Map()->Size().height() ); } - Txt = mTheme->CreateTextBox( "Tile Size", mUIWindow->Container(), Sizei(), Vector2i( mUIWindow->Container()->Size().width() / 2, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Tile Size", mUIWindow->getContainer(), Sizei(), Vector2i( mUIWindow->getContainer()->size().width() / 2, InitialY ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - Txt = mTheme->CreateTextBox( "Width:", mUIWindow->Container(), Sizei( 46, 24 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); + Txt = mTheme->createTextBox( "Width:", mUIWindow->getContainer(), Sizei( 46, 24 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); - mUIMapTWidth = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 53, 24 ), Vector2i( Txt->Pos().x + Txt->Size().width(), Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 32, false ); - mUIMapTWidth->MinValue(1); + mUIMapTWidth = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 53, 24 ), Vector2i( Txt->position().x + Txt->size().width(), Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 32, false ); + mUIMapTWidth->minValue(1); if ( ResizeMap ) { - mUIMapTWidth->Value( mUIMap->Map()->TileSize().width() ); + mUIMapTWidth->value( mUIMap->Map()->TileSize().width() ); } - Txt = mTheme->CreateTextBox( "Height:", mUIWindow->Container(), Sizei( 46, 24 ), Vector2i( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); + Txt = mTheme->createTextBox( "Height:", mUIWindow->getContainer(), Sizei( 46, 24 ), Vector2i( Txt->position().x, Txt->position().y + Txt->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW ); - mUIMapTHeight = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 53, 24 ), Vector2i( Txt->Pos().x + Txt->Size().width(), Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 32, false ); - mUIMapTHeight->MinValue(1); + mUIMapTHeight = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 53, 24 ), Vector2i( Txt->position().x + Txt->size().width(), Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 32, false ); + mUIMapTHeight->minValue(1); if ( ResizeMap ) { - mUIMapTHeight->Value( mUIMap->Map()->TileSize().height() ); + mUIMapTHeight->value( mUIMap->Map()->TileSize().height() ); } - Txt = mTheme->CreateTextBox( "Max Layers", mUIWindow->Container(), Sizei(), Vector2i( 16, mUIMapTHeight->Pos().y + mUIMapTHeight->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Max Layers", mUIWindow->getContainer(), Sizei(), Vector2i( 16, mUIMapTHeight->position().y + mUIMapTHeight->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIMapMaxLayers = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 53, 24 ), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 8, false ); - mUIMapMaxLayers->MaxValue( 32 ); + mUIMapMaxLayers = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 53, 24 ), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + DistFromTitle ), UI_CONTROL_DEFAULT_FLAGS | UI_TEXT_SELECTION_ENABLED, 8, false ); + mUIMapMaxLayers->maxValue( 32 ); - Txt = mTheme->CreateTextBox( "Map Flags:", mUIWindow->Container(), Sizei(), Vector2i( Txt->Pos().x, mUIMapMaxLayers->Pos().y + mUIMapMaxLayers->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Map Flags:", mUIWindow->getContainer(), Sizei(), Vector2i( Txt->position().x, mUIMapMaxLayers->position().y + mUIMapMaxLayers->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUILightsEnabled = mTheme->CreateCheckBox( mUIWindow->Container(), Sizei(), Vector2i( Txt->Pos().x + DistFromTitle, Txt->Pos().y + Txt->Size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUILightsEnabled->Text( "Lights Enabled" ); - mUILightsEnabled->Active( true ); + mUILightsEnabled = mTheme->createCheckBox( mUIWindow->getContainer(), Sizei(), Vector2i( Txt->position().x + DistFromTitle, Txt->position().y + Txt->size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUILightsEnabled->text( "Lights Enabled" ); + mUILightsEnabled->active( true ); if ( ResizeMap ) { - mUILightsEnabled->Active( 0 != mUIMap->Map()->LightsEnabled() ); + mUILightsEnabled->active( 0 != mUIMap->Map()->LightsEnabled() ); } - mUILightsByVertex = mTheme->CreateCheckBox( mUIWindow->Container(), Sizei(), Vector2i( mUIWindow->Container()->Size().width() / 2, mUILightsEnabled->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUILightsByVertex->Text( "Lights By Vertex" ); - mUILightsByVertex->Active( true ); + mUILightsByVertex = mTheme->createCheckBox( mUIWindow->getContainer(), Sizei(), Vector2i( mUIWindow->getContainer()->size().width() / 2, mUILightsEnabled->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUILightsByVertex->text( "Lights By Vertex" ); + mUILightsByVertex->active( true ); if ( ResizeMap ) { - mUILightsByVertex->Active( 0 != mUIMap->Map()->LightsByVertex() ); + mUILightsByVertex->active( 0 != mUIMap->Map()->LightsByVertex() ); } - mUIClampBorders = mTheme->CreateCheckBox( mUIWindow->Container(), Sizei(), Vector2i( Txt->Pos().x + DistFromTitle, mUILightsEnabled->Pos().y + mUILightsEnabled->Size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIClampBorders->Text( "Clamp Borders" ); - mUIClampBorders->Active( true ); + mUIClampBorders = mTheme->createCheckBox( mUIWindow->getContainer(), Sizei(), Vector2i( Txt->position().x + DistFromTitle, mUILightsEnabled->position().y + mUILightsEnabled->size().height() + 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIClampBorders->text( "Clamp Borders" ); + mUIClampBorders->active( true ); if ( ResizeMap ) { - mUIClampBorders->Active( 0 != mUIMap->Map()->ClampBorders() ); + mUIClampBorders->active( 0 != mUIMap->Map()->ClampBorders() ); } - mUIClipArea = mTheme->CreateCheckBox( mUIWindow->Container(), Sizei(), Vector2i( mUIWindow->Container()->Size().width() / 2, mUIClampBorders->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIClipArea->Text( "Clip View Area" ); - mUIClipArea->Active( true ); + mUIClipArea = mTheme->createCheckBox( mUIWindow->getContainer(), Sizei(), Vector2i( mUIWindow->getContainer()->size().width() / 2, mUIClampBorders->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIClipArea->text( "Clip View Area" ); + mUIClipArea->active( true ); if ( ResizeMap ) { - mUIClipArea->Active( 0 != mUIMap->Map()->ClipedArea() ); + mUIClipArea->active( 0 != mUIMap->Map()->ClipedArea() ); } - Txt = mTheme->CreateTextBox( "Map Base Color:", mUIWindow->Container(), Sizei(), Vector2i( Txt->Pos().x, mUIClipArea->Pos().y + mUIClipArea->Size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Map Base Color:", mUIWindow->getContainer(), Sizei(), Vector2i( Txt->position().x, mUIClipArea->position().y + mUIClipArea->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; - ComParams.Parent( mUIWindow->Container() ); - ComParams.PosSet( Txt->Pos().x, Txt->Pos().y + Txt->Size().height() + 4 ); + ComParams.Parent( mUIWindow->getContainer() ); + ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); ComParams.SizeSet( 64, 64 ); - ComParams.Background.Color( ColorA( 255, 255, 255, 255 ) ); + ComParams.Background.color( ColorA( 255, 255, 255, 255 ) ); if ( ResizeMap ) { - ComParams.Background.Color( mUIMap->Map()->BaseColor() ); + ComParams.Background.color( mUIMap->Map()->BaseColor() ); } - ComParams.Border.Color( ColorA( 100, 100, 100, 200 ) ); + ComParams.Border.color( ColorA( 100, 100, 100, 200 ) ); ComParams.Flags |= UI_FILL_BACKGROUND | UI_BORDER; mUIBaseColor = eeNew( UIComplexControl, ( ComParams ) ); - mUIBaseColor->Visible( true ); - mUIBaseColor->Enabled( true ); + mUIBaseColor->visible( true ); + mUIBaseColor->enabled( true ); - Txt = mTheme->CreateTextBox( "Red Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIBaseColor->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Red Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIBaseColor->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIRedSlider = mTheme->CreateSlider( mUIWindow->Container(), Sizei( 128, 20 ), Vector2i( Txt->Pos().x + Txt->Size().width() + 16, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIRedSlider->MaxValue( 255 ); - mUIRedSlider->Value( 255 ); - mUIRedSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnRedChange ) ); + mUIRedSlider = mTheme->createSlider( mUIWindow->getContainer(), Sizei( 128, 20 ), Vector2i( Txt->position().x + Txt->size().width() + 16, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIRedSlider->maxValue( 255 ); + mUIRedSlider->value( 255 ); + mUIRedSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnRedChange ) ); - mUIRedTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), Sizei(), Vector2i( mUIRedSlider->Pos().x + mUIRedSlider->Size().width() + 4, mUIRedSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIRedTxt = mTheme->createTextBox( String::toStr( 255 ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIRedSlider->position().x + mUIRedSlider->size().width() + 4, mUIRedSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); if ( ResizeMap ) { - mUIRedSlider->Value( mUIMap->Map()->BaseColor().r() ); + mUIRedSlider->value( mUIMap->Map()->BaseColor().r() ); } - Txt = mTheme->CreateTextBox( "Green Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIRedSlider->Pos().y + mUIRedSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Green Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIRedSlider->position().y + mUIRedSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIGreenSlider = mTheme->CreateSlider( mUIWindow->Container(), Sizei( 128, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIGreenSlider->MaxValue( 255 ); - mUIGreenSlider->Value( 255 ); + mUIGreenSlider = mTheme->createSlider( mUIWindow->getContainer(), Sizei( 128, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIGreenSlider->maxValue( 255 ); + mUIGreenSlider->value( 255 ); - mUIGreenSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnGreenChange ) ); + mUIGreenSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnGreenChange ) ); - mUIGreenTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), Sizei(), Vector2i( mUIGreenSlider->Pos().x + mUIGreenSlider->Size().width() + 4, mUIGreenSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIGreenTxt = mTheme->createTextBox( String::toStr( 255 ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIGreenSlider->position().x + mUIGreenSlider->size().width() + 4, mUIGreenSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); if ( ResizeMap ) { - mUIGreenSlider->Value( mUIMap->Map()->BaseColor().g() ); + mUIGreenSlider->value( mUIMap->Map()->BaseColor().g() ); } - Txt = mTheme->CreateTextBox( "Blue Color:", mUIWindow->Container(), Sizei(), Vector2i( mUIBaseColor->Pos().x + mUIBaseColor->Size().width() + 4, mUIGreenSlider->Pos().y + mUIGreenSlider->Size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + Txt = mTheme->createTextBox( "Blue Color:", mUIWindow->getContainer(), Sizei(), Vector2i( mUIBaseColor->position().x + mUIBaseColor->size().width() + 4, mUIGreenSlider->position().y + mUIGreenSlider->size().height() + 4 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); - mUIBlueSlider = mTheme->CreateSlider( mUIWindow->Container(), Sizei( 128, 20 ), Vector2i( mUIRedSlider->Pos().x, Txt->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); - mUIBlueSlider->MaxValue( 255 ); - mUIBlueSlider->Value( 255 ); - mUIBlueSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnBlueChange ) ); + mUIBlueSlider = mTheme->createSlider( mUIWindow->getContainer(), Sizei( 128, 20 ), Vector2i( mUIRedSlider->position().x, Txt->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_AUTO_SIZE ); + mUIBlueSlider->maxValue( 255 ); + mUIBlueSlider->value( 255 ); + mUIBlueSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIMapNew::OnBlueChange ) ); - mUIBlueTxt = mTheme->CreateTextBox( String::toStr( 255 ), mUIWindow->Container(), Sizei(), Vector2i( mUIBlueSlider->Pos().x + mUIBlueSlider->Size().width() + 4, mUIBlueSlider->Pos().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); + mUIBlueTxt = mTheme->createTextBox( String::toStr( 255 ), mUIWindow->getContainer(), Sizei(), Vector2i( mUIBlueSlider->position().x + mUIBlueSlider->size().width() + 4, mUIBlueSlider->position().y ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); if ( ResizeMap ) { - mUIBlueSlider->Value( mUIMap->Map()->BaseColor().b() ); + mUIBlueSlider->value( mUIMap->Map()->BaseColor().b() ); } - UIPushButton * OKButton = mTheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "ok" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapNew::OKClick ) ); - OKButton->Text( "OK" ); + UIPushButton * OKButton = mTheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "ok" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapNew::OKClick ) ); + OKButton->text( "OK" ); - UIPushButton * CancelButton = mTheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapNew::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mTheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIMapNew::CancelClick ) ); + CancelButton->text( "Cancel" ); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); } UIMapNew::~UIMapNew() { } void UIMapNew::OnRedChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Red = (Uint8)mUIRedSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIRedTxt->Text( String::toStr( (Int32)mUIRedSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Red = (Uint8)mUIRedSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIRedTxt->text( String::toStr( (Int32)mUIRedSlider->value() ) ); } void UIMapNew::OnGreenChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Green = (Uint8)mUIGreenSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIGreenTxt->Text( String::toStr( (Uint32)mUIGreenSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Green = (Uint8)mUIGreenSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIGreenTxt->text( String::toStr( (Uint32)mUIGreenSlider->value() ) ); } void UIMapNew::OnBlueChange( const UIEvent * Event ) { - ColorA Col = mUIBaseColor->Background()->Color(); - Col.Blue = (Uint8)mUIBlueSlider->Value(); - mUIBaseColor->Background()->Color( Col ); - mUIBlueTxt->Text( String::toStr( (Uint32)mUIBlueSlider->Value() ) ); + ColorA Col = mUIBaseColor->background()->color(); + Col.Blue = (Uint8)mUIBlueSlider->value(); + mUIBaseColor->background()->color( Col ); + mUIBlueTxt->text( String::toStr( (Uint32)mUIBlueSlider->value() ) ); } void UIMapNew::OKClick( const UIEvent * Event ) { - Int32 w = static_cast( mUIMapWidth->Value() ); - Int32 h = static_cast( mUIMapHeight->Value() ); - Int32 tw = static_cast( mUIMapTWidth->Value() ); - Int32 th = static_cast( mUIMapTHeight->Value() ); - Int32 ml = static_cast( mUIMapMaxLayers->Value() ); + Int32 w = static_cast( mUIMapWidth->value() ); + Int32 h = static_cast( mUIMapHeight->value() ); + Int32 tw = static_cast( mUIMapTWidth->value() ); + Int32 th = static_cast( mUIMapTHeight->value() ); + Int32 ml = static_cast( mUIMapMaxLayers->value() ); Uint32 Flags = MAP_EDITOR_DEFAULT_FLAGS; - if ( mUILightsEnabled->Active() ) + if ( mUILightsEnabled->active() ) Flags |= MAP_FLAG_LIGHTS_ENABLED; - if ( mUILightsByVertex->Active() ) + if ( mUILightsByVertex->active() ) Flags |= MAP_FLAG_LIGHTS_BYVERTEX; - if ( mUIClampBorders->Active() ) + if ( mUIClampBorders->active() ) Flags |= MAP_FLAG_CLAMP_BORDERS; - if ( mUIClipArea->Active() ) + if ( mUIClipArea->active() ) Flags |= MAP_FLAG_CLIP_AREA; if ( w > 0 && h > 0 && tw > 0 && th > 0 && ml > 0 ) { if ( !mResizeMap ) { mUIMap->Map()->Create( Sizei( w, h ), ml, Sizei( tw, th ), Flags, mUIMap->Map()->ViewSize() ); - mUIMap->Map()->BaseColor( mUIBaseColor->Background()->Color() ); + mUIMap->Map()->BaseColor( mUIBaseColor->background()->color() ); } else { std::string oldPath( mUIMap->Map()->Path() ); std::string mapPath( Sys::getTempPath() + "temp.eepp.map.eem" ); diff --git a/src/eepp/gaming/tilemap.cpp b/src/eepp/gaming/tilemap.cpp index ec9535836..a1aa61aae 100644 --- a/src/eepp/gaming/tilemap.cpp +++ b/src/eepp/gaming/tilemap.cpp @@ -1379,7 +1379,7 @@ std::vector TileMap::GetTextureAtlases() { //! Ugly ugly ugly, but i don't see another way Uint32 Restricted1 = String::hash( std::string( "global" ) ); - Uint32 Restricted2 = String::hash( UI::UIThemeManager::instance()->DefaultTheme()->TextureAtlas()->getName() ); + Uint32 Restricted2 = String::hash( UI::UIThemeManager::instance()->defaultTheme()->getTextureAtlas()->getName() ); for ( std::list::iterator it = Res.begin(); it != Res.end(); it++ ) { if ( (*it)->getId() != Restricted1 && (*it)->getId() != Restricted2 ) diff --git a/src/eepp/ui/tools/textureatlaseditor.cpp b/src/eepp/ui/tools/textureatlaseditor.cpp index 9a96d929f..e06ae87e4 100644 --- a/src/eepp/ui/tools/textureatlaseditor.cpp +++ b/src/eepp/ui/tools/textureatlaseditor.cpp @@ -17,107 +17,107 @@ TextureAtlasEditor::TextureAtlasEditor( UIWindow * AttatchTo, const TGEditorClos mTextureAtlasLoader( NULL ), mCurSubTexture( NULL ) { - if ( NULL == UIThemeManager::instance()->DefaultTheme() ) { + if ( NULL == UIThemeManager::instance()->defaultTheme() ) { eePRINTL( "TextureAtlasEditor needs a default theme assigned to work." ); return; } - mTheme = UIThemeManager::instance()->DefaultTheme(); + mTheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mUIWindow ) { - mUIWindow = UIManager::instance()->MainControl(); - mUIWindow->SetSkinFromTheme( mTheme, "winback" ); + mUIWindow = UIManager::instance()->mainControl(); + mUIWindow->setSkinFromTheme( mTheme, "winback" ); } - if ( UIManager::instance()->MainControl() == mUIWindow ) { + if ( UIManager::instance()->mainControl() == mUIWindow ) { mUIContainer = mUIWindow; } else { - mUIContainer = mUIWindow->Container(); + mUIContainer = mUIWindow->getContainer(); } UITextBox * TxtBox; Uint32 Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED; Uint32 InitY = 230; - CreateTxtBox( Vector2i( mUIContainer->Size().width() - 205, 30 ), "SubTexture List:" ); + createTextBox( Vector2i( mUIContainer->size().width() - 205, 30 ), "SubTexture List:" ); - mSubTextureList = mTheme->CreateListBox( mUIContainer, Sizei( 200, 156 ), Vector2i( mUIContainer->Size().width() - 205, 50 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); - mSubTextureList->Size( mSubTextureList->Size().width(), mSubTextureList->RowHeight() * 9 + mSubTextureList->PaddingContainer().Top + mSubTextureList->PaddingContainer().Bottom ); - mSubTextureList->AddEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &TextureAtlasEditor::OnSubTextureChange ) ); + mSubTextureList = mTheme->createListBox( mUIContainer, Sizei( 200, 156 ), Vector2i( mUIContainer->size().width() - 205, 50 ), UI_CONTROL_DEFAULT_ALIGN | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP ); + mSubTextureList->size( mSubTextureList->size().width(), mSubTextureList->rowHeight() * 9 + mSubTextureList->paddingContainer().Top + mSubTextureList->paddingContainer().Bottom ); + mSubTextureList->addEventListener( UIEvent::EventOnItemSelected, cb::Make1( this, &TextureAtlasEditor::onSubTextureChange ) ); - CreateTxtBox( Vector2i( mUIContainer->Size().width() - 205, InitY ), "Current SubTexture:" ); + createTextBox( Vector2i( mUIContainer->size().width() - 205, InitY ), "Current SubTexture:" ); InitY +=30; - mSpinOffX = mTheme->CreateSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); - mSpinOffX->MinValue( -32000 ); - mSpinOffX->MaxValue( 32000 ); - mSpinOffX->Pos( mUIContainer->Size().width() - mSpinOffX->Size().width() - 10, InitY ); - mSpinOffX->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::OnOffXChange ) ); + mSpinOffX = mTheme->createSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); + mSpinOffX->minValue( -32000 ); + mSpinOffX->maxValue( 32000 ); + mSpinOffX->position( mUIContainer->size().width() - mSpinOffX->size().width() - 10, InitY ); + mSpinOffX->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::onOffXChange ) ); - TxtBox = CreateTxtBox( Vector2i(), "Offset X:" ); - TxtBox->Pos( mSpinOffX->Pos().x - 10 - TxtBox->Size().width(), InitY ); + TxtBox = createTextBox( Vector2i(), "Offset X:" ); + TxtBox->position( mSpinOffX->position().x - 10 - TxtBox->size().width(), InitY ); InitY +=30; - mSpinOffY = mTheme->CreateSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); - mSpinOffY->MinValue( -32000 ); - mSpinOffY->MaxValue( 32000 ); - mSpinOffY->Pos( mUIContainer->Size().width() - mSpinOffY->Size().width() - 10, InitY ); - mSpinOffY->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::OnOffYChange ) ); - TxtBox = CreateTxtBox( Vector2i(), "Offset Y:" ); - TxtBox->Pos( mSpinOffY->Pos().x - 10 - TxtBox->Size().width(), InitY ); + mSpinOffY = mTheme->createSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); + mSpinOffY->minValue( -32000 ); + mSpinOffY->maxValue( 32000 ); + mSpinOffY->position( mUIContainer->size().width() - mSpinOffY->size().width() - 10, InitY ); + mSpinOffY->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::onOffYChange ) ); + TxtBox = createTextBox( Vector2i(), "Offset Y:" ); + TxtBox->position( mSpinOffY->position().x - 10 - TxtBox->size().width(), InitY ); InitY +=30; - mSpinDestW = mTheme->CreateSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); - mSpinDestW->MaxValue( 32000 ); - mSpinDestW->Pos( mUIContainer->Size().width() - mSpinDestW->Size().width() - 10, InitY ); - mSpinDestW->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::OnDestWChange ) ); - TxtBox = CreateTxtBox( Vector2i(), "Dest. Width:" ); - TxtBox->Pos( mSpinDestW->Pos().x - 10 - TxtBox->Size().width(), InitY ); + mSpinDestW = mTheme->createSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); + mSpinDestW->maxValue( 32000 ); + mSpinDestW->position( mUIContainer->size().width() - mSpinDestW->size().width() - 10, InitY ); + mSpinDestW->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::onDestWChange ) ); + TxtBox = createTextBox( Vector2i(), "Dest. Width:" ); + TxtBox->position( mSpinDestW->position().x - 10 - TxtBox->size().width(), InitY ); InitY +=30; - mSpinDestH = mTheme->CreateSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); - mSpinDestH->MaxValue( 32000 ); - mSpinDestH->Pos( mUIContainer->Size().width() - mSpinDestH->Size().width() - 10, InitY ); - mSpinDestH->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::OnDestHChange ) ); - TxtBox = CreateTxtBox( Vector2i(), "Dest. Height:" ); - TxtBox->Pos( mSpinDestH->Pos().x - 10 - TxtBox->Size().width(), InitY ); + mSpinDestH = mTheme->createSpinBox( mUIContainer, Sizei( 100, 22 ), Vector2i(), Flags, 0, false ); + mSpinDestH->maxValue( 32000 ); + mSpinDestH->position( mUIContainer->size().width() - mSpinDestH->size().width() - 10, InitY ); + mSpinDestH->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &TextureAtlasEditor::onDestHChange ) ); + TxtBox = createTextBox( Vector2i(), "Dest. Height:" ); + TxtBox->position( mSpinDestH->position().x - 10 - TxtBox->size().width(), InitY ); Uint32 ButFlags = UI_CONTROL_ALIGN_CENTER | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_AUTO_SIZE; - UIPushButton * ResetButton = mTheme->CreatePushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( mUIContainer->Size().width() - 120 - 5 , mSpinDestH->Pos().y + mSpinDestH->Size().height() + 8 ), ButFlags ); - ResetButton->Text( "Reset Dest. Size" ); - ResetButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::OnResetDestSize ) ); + UIPushButton * ResetButton = mTheme->createPushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( mUIContainer->size().width() - 120 - 5 , mSpinDestH->position().y + mSpinDestH->size().height() + 8 ), ButFlags ); + ResetButton->text( "Reset Dest. Size" ); + ResetButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::onResetDestSize ) ); - UIPushButton * ResetOffsetButton = mTheme->CreatePushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( ResetButton->Pos().x, ResetButton->Pos().y + ResetButton->Size().height() + 8 ), ButFlags ); - ResetOffsetButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::OnResetOffset ) ); - ResetOffsetButton->Text( "Reset Offset" ); + UIPushButton * ResetOffsetButton = mTheme->createPushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( ResetButton->position().x, ResetButton->position().y + ResetButton->size().height() + 8 ), ButFlags ); + ResetOffsetButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::onResetOffset ) ); + ResetOffsetButton->text( "Reset Offset" ); - UIPushButton * CenterOffsetButton = mTheme->CreatePushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( ResetOffsetButton->Pos().x, ResetOffsetButton->Pos().y + ResetOffsetButton->Size().height() + 8 ), ButFlags ); - CenterOffsetButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::OnCenterOffset ) ); - CenterOffsetButton->Text( "Centered Offset" ); + UIPushButton * CenterOffsetButton = mTheme->createPushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( ResetOffsetButton->position().x, ResetOffsetButton->position().y + ResetOffsetButton->size().height() + 8 ), ButFlags ); + CenterOffsetButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::onCenterOffset ) ); + CenterOffsetButton->text( "Centered Offset" ); - UIPushButton * HBOffsetButton = mTheme->CreatePushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( CenterOffsetButton->Pos().x, CenterOffsetButton->Pos().y + CenterOffsetButton->Size().height() + 8 ), ButFlags ); - HBOffsetButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::OnHBOffset ) ); - HBOffsetButton->Text( "Half-Bottom Offset" ); + UIPushButton * HBOffsetButton = mTheme->createPushButton( mUIContainer, Sizei( 120, 22 ), Vector2i( CenterOffsetButton->position().x, CenterOffsetButton->position().y + CenterOffsetButton->size().height() + 8 ), ButFlags ); + HBOffsetButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasEditor::onHBOffset ) ); + HBOffsetButton->text( "Half-Bottom Offset" ); - mUIWindow->Title( "Texture Atlas Editor" ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TextureAtlasEditor::WindowClose ) ); + mUIWindow->title( "Texture Atlas Editor" ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TextureAtlasEditor::windowClose ) ); - CreateTGEditor(); + createTGEditor(); UIComplexControl::CreateParams Params; Params.Parent( mUIContainer ); - Params.PosSet( 0, mWinMenu->Size().height() ); + Params.PosSet( 0, mWinMenu->size().height() ); Params.SizeSet( 800, 600 ); - Params.Background.Color( ColorA( 0, 0, 0, 50 ) ); + Params.Background.color( ColorA( 0, 0, 0, 50 ) ); Params.Flags |= UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT | UI_CLIP_ENABLE | UI_BORDER | UI_FILL_BACKGROUND; mSubTextureEditor = eeNew( TextureAtlasSubTextureEditor, ( Params, this ) ); - mSubTextureEditor->Visible( true ); - mSubTextureEditor->Enabled( true ); + mSubTextureEditor->visible( true ); + mSubTextureEditor->enabled( true ); mTGEU = eeNew( UITGEUpdater, ( UITGEUpdater::CreateParams(), this ) ); } @@ -126,150 +126,150 @@ TextureAtlasEditor::~TextureAtlasEditor() { eeSAFE_DELETE( mTexturePacker ); eeSAFE_DELETE( mTextureAtlasLoader ); - if ( !UIManager::instance()->IsShootingDown() ) { - mTGEU->Close(); + if ( !UIManager::instance()->isShootingDown() ) { + mTGEU->close(); } } -void TextureAtlasEditor::OnResetDestSize( const UIEvent * Event ) { +void TextureAtlasEditor::onResetDestSize( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( NULL != mCurSubTexture && MouseEvent->Flags() & EE_BUTTON_LMASK ) { + if ( NULL != mCurSubTexture && MouseEvent->getFlags() & EE_BUTTON_LMASK ) { Sizei RealSize = mCurSubTexture->realSize(); mCurSubTexture->resetDestSize(); - mSpinDestW->Value( RealSize.width() ); - mSpinDestH->Value( RealSize.height() ); + mSpinDestW->value( RealSize.width() ); + mSpinDestH->value( RealSize.height() ); } } -void TextureAtlasEditor::OnResetOffset( const UIEvent * Event ) { +void TextureAtlasEditor::onResetOffset( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( NULL != mCurSubTexture && MouseEvent->Flags() & EE_BUTTON_LMASK ) { - mSpinOffX->Value( 0 ); - mSpinOffY->Value( 0 ); + if ( NULL != mCurSubTexture && MouseEvent->getFlags() & EE_BUTTON_LMASK ) { + mSpinOffX->value( 0 ); + mSpinOffY->value( 0 ); } } -void TextureAtlasEditor::OnCenterOffset( const UIEvent * Event ) { +void TextureAtlasEditor::onCenterOffset( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( NULL != mCurSubTexture && MouseEvent->Flags() & EE_BUTTON_LMASK ) { + if ( NULL != mCurSubTexture && MouseEvent->getFlags() & EE_BUTTON_LMASK ) { Sizei NSize( -( (Int32)mCurSubTexture->destSize().x / 2 ), -( (Int32)mCurSubTexture->destSize().y / 2 ) ); - mSpinOffX->Value( NSize.x ); - mSpinOffY->Value( NSize.y ); + mSpinOffX->value( NSize.x ); + mSpinOffY->value( NSize.y ); } } -void TextureAtlasEditor::OnHBOffset( const UIEvent * Event ) { +void TextureAtlasEditor::onHBOffset( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( NULL != mCurSubTexture && MouseEvent->Flags() & EE_BUTTON_LMASK ) { + if ( NULL != mCurSubTexture && MouseEvent->getFlags() & EE_BUTTON_LMASK ) { Sizei NSize( -( (Int32)mCurSubTexture->destSize().x / 2 ), -(Int32)mCurSubTexture->destSize().y ); - mSpinOffX->Value( NSize.x ); - mSpinOffY->Value( NSize.y ); + mSpinOffX->value( NSize.x ); + mSpinOffY->value( NSize.y ); } } -void TextureAtlasEditor::OnOffXChange( const UIEvent * Event ) { +void TextureAtlasEditor::onOffXChange( const UIEvent * Event ) { if ( NULL != mCurSubTexture ) { - mCurSubTexture->offset( Vector2i( (Int32)mSpinOffX->Value(), mCurSubTexture->offset().y ) ); + mCurSubTexture->offset( Vector2i( (Int32)mSpinOffX->value(), mCurSubTexture->offset().y ) ); } } -void TextureAtlasEditor::OnOffYChange( const UIEvent * Event ) { +void TextureAtlasEditor::onOffYChange( const UIEvent * Event ) { if ( NULL != mCurSubTexture ) { - mCurSubTexture->offset( Vector2i( mCurSubTexture->offset().x, (Int32)mSpinOffY->Value() ) ); + mCurSubTexture->offset( Vector2i( mCurSubTexture->offset().x, (Int32)mSpinOffY->value() ) ); } } -void TextureAtlasEditor::OnDestWChange( const UIEvent * Event ) { +void TextureAtlasEditor::onDestWChange( const UIEvent * Event ) { if ( NULL != mCurSubTexture ) { - mCurSubTexture->destSize( Sizef( (Int32)mSpinDestW->Value(), mCurSubTexture->destSize().y ) ); + mCurSubTexture->destSize( Sizef( (Int32)mSpinDestW->value(), mCurSubTexture->destSize().y ) ); } } -void TextureAtlasEditor::OnDestHChange( const UIEvent * Event ) { +void TextureAtlasEditor::onDestHChange( const UIEvent * Event ) { if ( NULL != mCurSubTexture ) { - mCurSubTexture->destSize( Sizef( mCurSubTexture->destSize().x, (Int32)mSpinDestH->Value() ) ); + mCurSubTexture->destSize( Sizef( mCurSubTexture->destSize().x, (Int32)mSpinDestH->value() ) ); } } -UITextBox * TextureAtlasEditor::CreateTxtBox( Vector2i Pos, const String& Text ) { - return mTheme->CreateTextBox( Text, mUIContainer, Sizei(), Pos, UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_DRAW_SHADOW | UI_AUTO_SIZE ); +UITextBox * TextureAtlasEditor::createTextBox( Vector2i Pos, const String& Text ) { + return mTheme->createTextBox( Text, mUIContainer, Sizei(), Pos, UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_DRAW_SHADOW | UI_AUTO_SIZE ); } -void TextureAtlasEditor::WindowClose( const UIEvent * Event ) { +void TextureAtlasEditor::windowClose( const UIEvent * Event ) { if ( mCloseCb.IsSet() ) mCloseCb(); eeDelete( this ); } -void TextureAtlasEditor::CreateTGEditor() { - CreateWinMenu(); +void TextureAtlasEditor::createTGEditor() { + createWinMenu(); } -void TextureAtlasEditor::CreateWinMenu() { - mWinMenu = mTheme->CreateWinMenu( mUIContainer ); +void TextureAtlasEditor::createWinMenu() { + mWinMenu = mTheme->createWinMenu( mUIContainer ); - UIPopUpMenu * PU = mTheme->CreatePopUpMenu(); - PU->Add( "New...", mTheme->GetIconByName( "document-new" ) ); - PU->Add( "Open...", mTheme->GetIconByName( "document-open" ) ); + UIPopUpMenu * PU = mTheme->createPopUpMenu(); + PU->Add( "New...", mTheme->getIconByName( "document-new" ) ); + PU->Add( "Open...", mTheme->getIconByName( "document-open" ) ); PU->AddSeparator(); - PU->Add( "Save", mTheme->GetIconByName( "document-save" ) ); + PU->Add( "Save", mTheme->getIconByName( "document-save" ) ); PU->AddSeparator(); - PU->Add( "Close", mTheme->GetIconByName( "document-close" ) ); + PU->Add( "Close", mTheme->getIconByName( "document-close" ) ); PU->AddSeparator(); - PU->Add( "Quit", mTheme->GetIconByName( "quit" ) ); + PU->Add( "Quit", mTheme->getIconByName( "quit" ) ); - PU->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &TextureAtlasEditor::FileMenuClick ) ); - mWinMenu->AddMenuButton( "File", PU ); + PU->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &TextureAtlasEditor::fileMenuClick ) ); + mWinMenu->addMenuButton( "File", PU ); } -void TextureAtlasEditor::FileMenuClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) +void TextureAtlasEditor::fileMenuClick( const UIEvent * Event ) { + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "New..." == txt ) { - eeNew( TextureAtlasNew, ( cb::Make1( this, &TextureAtlasEditor::OnTextureAtlasCreate ) ) ); + eeNew( TextureAtlasNew, ( cb::Make1( this, &TextureAtlasEditor::onTextureAtlasCreate ) ) ); } else if ( "Open..." == txt ) { - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, std::string( "*" ) + EE_TEXTURE_ATLAS_EXTENSION ); + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS, std::string( "*" ) + EE_TEXTURE_ATLAS_EXTENSION ); - TGDialog->Title( "Open Texture Atlas" ); - TGDialog->AddEventListener( UIEvent::EventOpenFile, cb::Make1( this, &TextureAtlasEditor::OpenTextureAtlas ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Open Texture Atlas" ); + TGDialog->addEventListener( UIEvent::EventOpenFile, cb::Make1( this, &TextureAtlasEditor::openTextureAtlas ) ); + TGDialog->center(); + TGDialog->show(); } else if ( "Save" == txt ) { if ( NULL != mTextureAtlasLoader && mTextureAtlasLoader->isLoaded() ) { mTextureAtlasLoader->updateTextureAtlas(); } } else if ( "Close" == txt ) { if ( NULL != mTextureAtlasLoader && mTextureAtlasLoader->isLoaded() ) { - UIMessageBox * MsgBox = mTheme->CreateMessageBox( MSGBOX_OKCANCEL, "Do you really want to close the current texture atlas?\nAll changes will be lost." ); - MsgBox->AddEventListener( UIEvent::EventMsgBoxConfirmClick, cb::Make1( this, &TextureAtlasEditor::OnTextureAtlasClose ) ); - MsgBox->Title( "Close Texture Atlas?" ); - MsgBox->Center(); - MsgBox->Show(); + UIMessageBox * MsgBox = mTheme->createMessageBox( MSGBOX_OKCANCEL, "Do you really want to close the current texture atlas?\nAll changes will be lost." ); + MsgBox->addEventListener( UIEvent::EventMsgBoxConfirmClick, cb::Make1( this, &TextureAtlasEditor::onTextureAtlasClose ) ); + MsgBox->title( "Close Texture Atlas?" ); + MsgBox->center(); + MsgBox->show(); } else { - OnTextureAtlasClose( NULL ); + onTextureAtlasClose( NULL ); } } else if ( "Quit" == txt ) { - if ( mUIWindow == UIManager::instance()->MainControl() ) { - UIManager::instance()->GetWindow()->close(); + if ( mUIWindow == UIManager::instance()->mainControl() ) { + UIManager::instance()->getWindow()->close(); } else { mUIWindow->CloseWindow(); } } } -void TextureAtlasEditor::OnTextureAtlasCreate( TexturePacker * TexPacker ) { +void TextureAtlasEditor::onTextureAtlasCreate( TexturePacker * TexPacker ) { eeSAFE_DELETE( mTexturePacker ); mTexturePacker = TexPacker; @@ -277,22 +277,22 @@ void TextureAtlasEditor::OnTextureAtlasCreate( TexturePacker * TexPacker ) { std::string FPath( FileSystem::fileRemoveExtension( mTexturePacker->getFilepath() + EE_TEXTURE_ATLAS_EXTENSION ) ); - mTextureAtlasLoader = eeNew( TextureAtlasLoader, ( FPath, true, cb::Make1( this, &TextureAtlasEditor::OnTextureAtlasLoaded ) ) ); + mTextureAtlasLoader = eeNew( TextureAtlasLoader, ( FPath, true, cb::Make1( this, &TextureAtlasEditor::onTextureAtlasLoaded ) ) ); } -void TextureAtlasEditor::UpdateControls() { +void TextureAtlasEditor::updateControls() { if ( NULL != mTextureAtlasLoader && mTextureAtlasLoader->isLoaded() ) { - FillSubTextureList(); + fillSubTextureList(); } } -void TextureAtlasEditor::FillSubTextureList() { +void TextureAtlasEditor::fillSubTextureList() { if ( NULL == mTextureAtlasLoader || NULL == mTextureAtlasLoader->getTextureAtlas() || !mTextureAtlasLoader->isLoaded() ) return; std::list& Res = mTextureAtlasLoader->getTextureAtlas()->getResources(); - mSubTextureList->Clear(); + mSubTextureList->clear(); std::vector items; @@ -303,35 +303,35 @@ void TextureAtlasEditor::FillSubTextureList() { if ( items.size() ) { std::sort( items.begin(), items.end() ); - mSubTextureList->AddListBoxItems( items ); - mSubTextureList->SetSelected( 0 ); + mSubTextureList->addListBoxItems( items ); + mSubTextureList->setSelected( 0 ); } - mSubTextureList->VerticalScrollBar()->ClickStep( 8.f / (Float)mSubTextureList->Count() ); + mSubTextureList->verticalScrollBar()->clickStep( 8.f / (Float)mSubTextureList->count() ); } -void TextureAtlasEditor::OnSubTextureChange( const UIEvent * Event ) { +void TextureAtlasEditor::onSubTextureChange( const UIEvent * Event ) { if ( NULL != mTextureAtlasLoader && NULL != mTextureAtlasLoader->getTextureAtlas() ) { - mCurSubTexture = mTextureAtlasLoader->getTextureAtlas()->getByName( mSubTextureList->GetItemSelectedText() ); + mCurSubTexture = mTextureAtlasLoader->getTextureAtlas()->getByName( mSubTextureList->getItemSelectedText() ); if ( NULL != mCurSubTexture ) { - mSubTextureEditor->SubTexture( mCurSubTexture ); - mSpinOffX->Value( mCurSubTexture->offset().x ); - mSpinOffY->Value( mCurSubTexture->offset().y ); - mSpinDestW->Value( mCurSubTexture->destSize().x ); - mSpinDestH->Value( mCurSubTexture->destSize().y ); + mSubTextureEditor->subTexture( mCurSubTexture ); + mSpinOffX->value( mCurSubTexture->offset().x ); + mSpinOffY->value( mCurSubTexture->offset().y ); + mSpinDestW->value( mCurSubTexture->destSize().x ); + mSpinDestH->value( mCurSubTexture->destSize().y ); } } } -void TextureAtlasEditor::Update() { +void TextureAtlasEditor::update() { if ( NULL != mTextureAtlasLoader && !mTextureAtlasLoader->isLoaded() ) { mTextureAtlasLoader->update(); } } -void TextureAtlasEditor::OpenTextureAtlas( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); +void TextureAtlasEditor::openTextureAtlas( const UIEvent * Event ) { + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); eeSAFE_DELETE( mTextureAtlasLoader ); bool threaded = true; @@ -339,29 +339,29 @@ void TextureAtlasEditor::OpenTextureAtlas( const UIEvent * Event ) { threaded = false; #endif - mTextureAtlasLoader = eeNew( TextureAtlasLoader, ( CDL->GetFullPath(), threaded, cb::Make1( this, &TextureAtlasEditor::OnTextureAtlasLoaded ) ) ); + mTextureAtlasLoader = eeNew( TextureAtlasLoader, ( CDL->getFullPath(), threaded, cb::Make1( this, &TextureAtlasEditor::onTextureAtlasLoaded ) ) ); } -void TextureAtlasEditor::OnTextureAtlasLoaded( TextureAtlasLoader * TGLoader ) { +void TextureAtlasEditor::onTextureAtlasLoaded( TextureAtlasLoader * TGLoader ) { if ( NULL != mTextureAtlasLoader && mTextureAtlasLoader->isLoaded() ) { - UpdateControls(); + updateControls(); } } -void TextureAtlasEditor::SaveTextureAtlas( const UIEvent * Event ) { +void TextureAtlasEditor::saveTextureAtlas( const UIEvent * Event ) { if ( NULL != mTextureAtlasLoader && mTextureAtlasLoader->isLoaded() ) { mTextureAtlasLoader->updateTextureAtlas(); } } -void TextureAtlasEditor::OnTextureAtlasClose( const UIEvent * Event ) { +void TextureAtlasEditor::onTextureAtlasClose( const UIEvent * Event ) { eeSAFE_DELETE( mTextureAtlasLoader ); - mSubTextureList->Clear(); - mSpinOffX->Value( 0 ); - mSpinOffY->Value( 0 ); - mSpinDestW->Value( 0 ); - mSpinDestH->Value( 0 ); - mSubTextureEditor->SubTexture( NULL ); + mSubTextureList->clear(); + mSpinOffX->value( 0 ); + mSpinOffY->value( 0 ); + mSpinDestW->value( 0 ); + mSpinDestH->value( 0 ); + mSubTextureEditor->subTexture( NULL ); mCurSubTexture = NULL; } diff --git a/src/eepp/ui/tools/textureatlasnew.cpp b/src/eepp/ui/tools/textureatlasnew.cpp index 31cfba54a..fe6725f25 100644 --- a/src/eepp/ui/tools/textureatlasnew.cpp +++ b/src/eepp/ui/tools/textureatlasnew.cpp @@ -11,19 +11,19 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : mUIWindow( NULL ), mNewTGCb( NewTGCb ) { - mTheme = UIThemeManager::instance()->DefaultTheme(); + mTheme = UIThemeManager::instance()->defaultTheme(); if ( NULL == mTheme ) return; - mUIWindow = mTheme->CreateWindow( NULL, Sizei( 378, 244 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TextureAtlasNew::WindowClose ) ); - mUIWindow->Title( "New Texture Atlas" ); + mUIWindow = mTheme->createWindow( NULL, Sizei( 378, 244 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MODAL ); + mUIWindow->addEventListener( UIEvent::EventOnWindowClose, cb::Make1( this, &TextureAtlasNew::windowClose ) ); + mUIWindow->title( "New Texture Atlas" ); - Int32 PosX = mUIWindow->Container()->Size().width() - 110; + Int32 PosX = mUIWindow->getContainer()->size().width() - 110; - CreateTxtBox( Vector2i( 10, 20 ), "Save File Format:" ); - mSaveFileType = mTheme->CreateDropDownList( mUIWindow->Container(), Sizei( 100, 22 ), Vector2i( PosX, 20 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); + createTxtBox( Vector2i( 10, 20 ), "Save File Format:" ); + mSaveFileType = mTheme->createDropDownList( mUIWindow->getContainer(), Sizei( 100, 22 ), Vector2i( PosX, 20 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); std::vector FileTypes; FileTypes.push_back( "TGA" ); @@ -31,14 +31,14 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : FileTypes.push_back( "PNG" ); FileTypes.push_back( "DDS" ); - mSaveFileType->ListBox()->AddListBoxItems( FileTypes ); - mSaveFileType->ListBox()->SetSelected( "PNG" ); + mSaveFileType->getListBox()->addListBoxItems( FileTypes ); + mSaveFileType->getListBox()->setSelected( "PNG" ); - CreateTxtBox( Vector2i( 10, 50 ), "Max. Texture Atlas Width:" ); - mComboWidth = mTheme->CreateComboBox( mUIWindow->Container(), Sizei( 100, 22 ), Vector2i( PosX, 50 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); + createTxtBox( Vector2i( 10, 50 ), "Max. Texture Atlas Width:" ); + mComboWidth = mTheme->createComboBox( mUIWindow->getContainer(), Sizei( 100, 22 ), Vector2i( PosX, 50 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); - CreateTxtBox( Vector2i( 10, 80 ), "Max. Texture Atlas Height:" ); - mComboHeight = mTheme->CreateComboBox( mUIWindow->Container(), Sizei( 100, 22 ), Vector2i( PosX, 80 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); + createTxtBox( Vector2i( 10, 80 ), "Max. Texture Atlas Height:" ); + mComboHeight = mTheme->createComboBox( mUIWindow->getContainer(), Sizei( 100, 22 ), Vector2i( PosX, 80 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE ); std::vector Sizes; @@ -46,69 +46,69 @@ TextureAtlasNew::TextureAtlasNew( TGCreateCb NewTGCb ) : Sizes.push_back( String::toStr( 1 << i ) ); } - mComboWidth->ListBox()->AddListBoxItems( Sizes ); - mComboHeight->ListBox()->AddListBoxItems( Sizes ); - mComboWidth->GetInputTextBuffer()->allowOnlyNumbers( true ); - mComboHeight->GetInputTextBuffer()->allowOnlyNumbers( true ); - mComboWidth->ListBox()->SetSelected( "512" ); - mComboHeight->ListBox()->SetSelected( "512" ); + mComboWidth->getListBox()->addListBoxItems( Sizes ); + mComboHeight->getListBox()->addListBoxItems( Sizes ); + mComboWidth->getInputTextBuffer()->allowOnlyNumbers( true ); + mComboHeight->getInputTextBuffer()->allowOnlyNumbers( true ); + mComboWidth->getListBox()->setSelected( "512" ); + mComboHeight->getListBox()->setSelected( "512" ); - CreateTxtBox( Vector2i( 10, 110 ), "Space between sub textures (pixels):" ); - mPixelSpace = mTheme->CreateSpinBox( mUIWindow->Container(), Sizei( 100, 22 ), Vector2i( PosX, 110 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, 0, false ); + createTxtBox( Vector2i( 10, 110 ), "Space between sub textures (pixels):" ); + mPixelSpace = mTheme->createSpinBox( mUIWindow->getContainer(), Sizei( 100, 22 ), Vector2i( PosX, 110 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED, 0, false ); - CreateTxtBox( Vector2i( 10, 140 ), "Texture Atlas Folder Path:" ); - mTGPath = mTheme->CreateTextInput( mUIWindow->Container(), Sizei( mUIWindow->Container()->Size().width() - 60, 22 ), Vector2i( 10, 160 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE , false, 512 ); - mTGPath->AllowEditing( false ); + createTxtBox( Vector2i( 10, 140 ), "Texture Atlas Folder Path:" ); + mTGPath = mTheme->createTextInput( mUIWindow->getContainer(), Sizei( mUIWindow->getContainer()->size().width() - 60, 22 ), Vector2i( 10, 160 ), UI_CONTROL_DEFAULT_FLAGS | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_AUTO_SIZE , false, 512 ); + mTGPath->allowEditing( false ); - mSetPathButton = mTheme->CreatePushButton( mUIWindow->Container(), Sizei( 32, 32 ), Vector2i( mUIWindow->Container()->Size().width() - 10 - 32, 160 ) ); - mSetPathButton->Text( "..." ); - mSetPathButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::OnDialogFolderSelect ) ); + mSetPathButton = mTheme->createPushButton( mUIWindow->getContainer(), Sizei( 32, 32 ), Vector2i( mUIWindow->getContainer()->size().width() - 10 - 32, 160 ) ); + mSetPathButton->text( "..." ); + mSetPathButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::onDialogFolderSelect ) ); - UIPushButton * OKButton = mTheme->CreatePushButton( mUIWindow->Container(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "ok" ) ); - OKButton->Pos( mUIWindow->Container()->Size().width() - OKButton->Size().width() - 4, mUIWindow->Container()->Size().height() - OKButton->Size().height() - 4 ); - OKButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::OKClick ) ); - OKButton->Text( "OK" ); + UIPushButton * OKButton = mTheme->createPushButton( mUIWindow->getContainer(), Sizei( 80, 22 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "ok" ) ); + OKButton->position( mUIWindow->getContainer()->size().width() - OKButton->size().width() - 4, mUIWindow->getContainer()->size().height() - OKButton->size().height() - 4 ); + OKButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::okClick ) ); + OKButton->text( "OK" ); - UIPushButton * CancelButton = mTheme->CreatePushButton( mUIWindow->Container(), OKButton->Size(), Vector2i( OKButton->Pos().x - OKButton->Size().width() - 4, OKButton->Pos().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->GetIconByName( "cancel" ) ); - CancelButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::CancelClick ) ); - CancelButton->Text( "Cancel" ); + UIPushButton * CancelButton = mTheme->createPushButton( mUIWindow->getContainer(), OKButton->size(), Vector2i( OKButton->position().x - OKButton->size().width() - 4, OKButton->position().y ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_AUTO_SIZE, mTheme->getIconByName( "cancel" ) ); + CancelButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &TextureAtlasNew::cancelClick ) ); + CancelButton->text( "Cancel" ); - mUIWindow->Center(); - mUIWindow->Show(); + mUIWindow->center(); + mUIWindow->show(); } TextureAtlasNew::~TextureAtlasNew() { } -UITextBox * TextureAtlasNew::CreateTxtBox( Vector2i Pos, const String& Text ) { - return mTheme->CreateTextBox( Text, mUIWindow->Container(), Sizei(), Pos, UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); +UITextBox * TextureAtlasNew::createTxtBox( Vector2i Pos, const String& Text ) { + return mTheme->createTextBox( Text, mUIWindow->getContainer(), Sizei(), Pos, UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); } -void TextureAtlasNew::OKClick( const UIEvent * Event ) { +void TextureAtlasNew::okClick( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast( Event ); - if ( MouseEvent->Flags() & EE_BUTTON_LMASK ) { - std::string ext( mSaveFileType->Text() ); + if ( MouseEvent->getFlags() & EE_BUTTON_LMASK ) { + std::string ext( mSaveFileType->text() ); String::toLowerInPlace( ext ); - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_SAVE_DIALOG, "*." + ext ); + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_SAVE_DIALOG, "*." + ext ); - TGDialog->Title( "Save Texture Atlas" ); - TGDialog->AddEventListener( UIEvent::EventSaveFile, cb::Make1( this, &TextureAtlasNew::TextureAtlasSave ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Save Texture Atlas" ); + TGDialog->addEventListener( UIEvent::EventSaveFile, cb::Make1( this, &TextureAtlasNew::textureAtlasSave ) ); + TGDialog->center(); + TGDialog->show(); } } -void TextureAtlasNew::CancelClick( const UIEvent * Event ) { +void TextureAtlasNew::cancelClick( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast( Event ); - if ( MouseEvent->Flags() & EE_BUTTON_LMASK ) { + if ( MouseEvent->getFlags() & EE_BUTTON_LMASK ) { mUIWindow->CloseWindow(); } } -void TextureAtlasNew::WindowClose( const UIEvent * Event ) { +void TextureAtlasNew::windowClose( const UIEvent * Event ) { eeDelete( this ); } @@ -116,20 +116,20 @@ static bool IsValidExtension( const std::string& ext ) { return ext == "png" || ext == "bmp" || ext == "dds" || ext == "tga"; } -void TextureAtlasNew::TextureAtlasSave( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); - std::string FPath( CDL->GetFullPath() ); +void TextureAtlasNew::textureAtlasSave( const UIEvent * Event ) { + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); + std::string FPath( CDL->getFullPath() ); if ( !FileSystem::isDirectory( FPath ) ) { Int32 w = 0, h = 0, b; - bool Res1 = String::fromString( w, mComboWidth->Text() ); - bool Res2 = String::fromString( h, mComboHeight->Text() ); - b = static_cast( mPixelSpace->Value() ); + bool Res1 = String::fromString( w, mComboWidth->text() ); + bool Res2 = String::fromString( h, mComboHeight->text() ); + b = static_cast( mPixelSpace->value() ); if ( Res1 && Res2 ) { Graphics::TexturePacker * TexturePacker = eeNew( Graphics::TexturePacker, ( w, h, false, b ) ); - TexturePacker->addTexturesPath( mTGPath->Text() ); + TexturePacker->addTexturesPath( mTGPath->text() ); TexturePacker->packTextures(); @@ -138,14 +138,14 @@ void TextureAtlasNew::TextureAtlasSave( const UIEvent * Event ) { if ( !IsValidExtension( ext ) ) { FPath = FileSystem::fileRemoveExtension( FPath ); - ext = mSaveFileType->Text(); + ext = mSaveFileType->text(); String::toLowerInPlace( ext ); FPath += "." + ext; } - TexturePacker->save( FPath, static_cast ( mSaveFileType->ListBox()->GetItemSelectedIndex() ) ); + TexturePacker->save( FPath, static_cast ( mSaveFileType->getListBox()->getItemSelectedIndex() ) ); if ( mNewTGCb.IsSet() ) mNewTGCb( TexturePacker ); @@ -155,27 +155,27 @@ void TextureAtlasNew::TextureAtlasSave( const UIEvent * Event ) { } } -void TextureAtlasNew::OnDialogFolderSelect( const UIEvent * Event ) { +void TextureAtlasNew::onDialogFolderSelect( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast( Event ); - if ( MouseEvent->Flags() & EE_BUTTON_LMASK ) { - UICommonDialog * TGDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_ALLOW_FOLDER_SELECT, "*" ); + if ( MouseEvent->getFlags() & EE_BUTTON_LMASK ) { + UICommonDialog * TGDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_MODAL, Sizei(), 255, UI_CDL_DEFAULT_FLAGS | CDL_FLAG_ALLOW_FOLDER_SELECT, "*" ); - TGDialog->Title( "Create Texture Atlas ( Select Folder Containing Textures )" ); - TGDialog->AddEventListener( UIEvent::EventOpenFile, cb::Make1( this, &TextureAtlasNew::OnSelectFolder ) ); - TGDialog->Center(); - TGDialog->Show(); + TGDialog->title( "Create Texture Atlas ( Select Folder Containing Textures )" ); + TGDialog->addEventListener( UIEvent::EventOpenFile, cb::Make1( this, &TextureAtlasNew::onSelectFolder ) ); + TGDialog->center(); + TGDialog->show(); } } -void TextureAtlasNew::OnSelectFolder( const UIEvent * Event ) { - UICommonDialog * CDL = reinterpret_cast ( Event->Ctrl() ); +void TextureAtlasNew::onSelectFolder( const UIEvent * Event ) { + UICommonDialog * CDL = reinterpret_cast ( Event->getControl() ); UIMessageBox * MsgBox; - std::string FPath( CDL->GetFullPath() ); + std::string FPath( CDL->getFullPath() ); FileSystem::dirPathAddSlashAtEnd( FPath ); if ( !FileSystem::isDirectory( FPath ) ) { - FPath = CDL->GetCurPath(); + FPath = CDL->getCurPath(); FileSystem::dirPathAddSlashAtEnd( FPath ); } @@ -198,18 +198,18 @@ void TextureAtlasNew::OnSelectFolder( const UIEvent * Event ) { //! All OK if ( count ) { - mTGPath->Text( FPath ); + mTGPath->text( FPath ); } else { - MsgBox = mTheme->CreateMessageBox( MSGBOX_OK, "The folder must contain at least one image!" ); - MsgBox->Title( "Error" ); - MsgBox->Center(); - MsgBox->Show(); + MsgBox = mTheme->createMessageBox( MSGBOX_OK, "The folder must contain at least one image!" ); + MsgBox->title( "Error" ); + MsgBox->center(); + MsgBox->show(); } } else { - MsgBox = mTheme->CreateMessageBox( MSGBOX_OK, "You must select a folder!" ); - MsgBox->Title( "Error" ); - MsgBox->Center(); - MsgBox->Show(); + MsgBox = mTheme->createMessageBox( MSGBOX_OK, "You must select a folder!" ); + MsgBox->title( "Error" ); + MsgBox->center(); + MsgBox->show(); } } diff --git a/src/eepp/ui/tools/textureatlasnew.hpp b/src/eepp/ui/tools/textureatlasnew.hpp index ecc2c2a2d..e53087e61 100644 --- a/src/eepp/ui/tools/textureatlasnew.hpp +++ b/src/eepp/ui/tools/textureatlasnew.hpp @@ -28,19 +28,19 @@ class EE_API TextureAtlasNew { UIPushButton * mSetPathButton; UIDropDownList * mSaveFileType; - void WindowClose( const UIEvent * Event ); + void windowClose( const UIEvent * Event ); - void CancelClick( const UIEvent * Event ); + void cancelClick( const UIEvent * Event ); - void OKClick( const UIEvent * Event ); + void okClick( const UIEvent * Event ); - UITextBox * CreateTxtBox( Vector2i Pos, const String& Text ); + UITextBox * createTxtBox( Vector2i Pos, const String& Text ); - void OnDialogFolderSelect( const UIEvent * Event ); + void onDialogFolderSelect( const UIEvent * Event ); - void OnSelectFolder( const UIEvent * Event ); + void onSelectFolder( const UIEvent * Event ); - void TextureAtlasSave( const UIEvent * Event ); + void textureAtlasSave( const UIEvent * Event ); }; }}} diff --git a/src/eepp/ui/tools/textureatlassubtextureeditor.cpp b/src/eepp/ui/tools/textureatlassubtextureeditor.cpp index 55c5d0480..45e012d07 100644 --- a/src/eepp/ui/tools/textureatlassubtextureeditor.cpp +++ b/src/eepp/ui/tools/textureatlassubtextureeditor.cpp @@ -10,71 +10,71 @@ TextureAtlasSubTextureEditor::TextureAtlasSubTextureEditor( const UIComplexContr mGfx( NULL ), mEditor( Editor ) { - if ( NULL == UIThemeManager::instance()->DefaultTheme() ) { + if ( NULL == UIThemeManager::instance()->defaultTheme() ) { return; } - mTheme = UIThemeManager::instance()->DefaultTheme(); + mTheme = UIThemeManager::instance()->defaultTheme(); - mGfx = mTheme->CreateGfx( NULL, this ); + mGfx = mTheme->createGfx( NULL, this ); UIDragable::CreateParams DragParams; DragParams.Parent( this ); DragParams.SizeSet( 500000, 500000 ); mDrag = eeNew( UIDragable, ( DragParams ) ); - mDrag->Enabled( true ); - mDrag->Visible( true ); - mDrag->DragEnable( true ); + mDrag->enabled( true ); + mDrag->visible( true ); + mDrag->dragEnable( true ); - GetCenter(); + getCenter(); } TextureAtlasSubTextureEditor::~TextureAtlasSubTextureEditor() { } -void TextureAtlasSubTextureEditor::Draw() { +void TextureAtlasSubTextureEditor::draw() { Primitives P; P.setColor( ColorA( 255, 0, 0, mAlpha ) ); P.drawLine( Line2f( Vector2f( mScreenPos.x, mScreenPos.y + mUICenter.y ), Vector2f( mScreenPos.x + mSize.width(), mScreenPos.y + mUICenter.y ) ) ); P.drawLine( Line2f( Vector2f( mScreenPos.x + mUICenter.x, mScreenPos.y ), Vector2f( mScreenPos.x + mUICenter.x, mScreenPos.y + mSize.height() ) ) ); - UIComplexControl::Draw(); + UIComplexControl::draw(); } -void TextureAtlasSubTextureEditor::Update() { - Vector2i Pos = mDrag->Pos(); +void TextureAtlasSubTextureEditor::update() { + Vector2i Pos = mDrag->position(); - UIComplexControl::Update(); + UIComplexControl::update(); - if ( NULL != mGfx->SubTexture() && mDrag->DragEnable() && mDrag->Dragging() && Pos != mDrag->Pos() ) { - Vector2i Diff = -( Pos - mDrag->Pos() ); + if ( NULL != mGfx->subTexture() && mDrag->dragEnable() && mDrag->dragging() && Pos != mDrag->position() ) { + Vector2i Diff = -( Pos - mDrag->position() ); - mGfx->SubTexture()->offset( Vector2i( mGfx->SubTexture()->offset().x + Diff.x, mGfx->SubTexture()->offset().y + Diff.y ) ); + mGfx->subTexture()->offset( Vector2i( mGfx->subTexture()->offset().x + Diff.x, mGfx->subTexture()->offset().y + Diff.y ) ); - mEditor->SpinOffX()->Value( mGfx->SubTexture()->offset().x ); - mEditor->SpinOffY()->Value( mGfx->SubTexture()->offset().y ); + mEditor->spinOffX()->value( mGfx->subTexture()->offset().x ); + mEditor->spinOffY()->value( mGfx->subTexture()->offset().y ); } - mGfx->Pos( mUICenter ); + mGfx->position( mUICenter ); } -void TextureAtlasSubTextureEditor::OnSizeChange() { - GetCenter(); +void TextureAtlasSubTextureEditor::onSizeChange() { + getCenter(); } -Graphics::SubTexture * TextureAtlasSubTextureEditor::SubTexture() const { - return mGfx->SubTexture(); +Graphics::SubTexture * TextureAtlasSubTextureEditor::subTexture() const { + return mGfx->subTexture(); } -void TextureAtlasSubTextureEditor::SubTexture( Graphics::SubTexture * subTexture ) { - mGfx->SubTexture( subTexture ); +void TextureAtlasSubTextureEditor::subTexture( Graphics::SubTexture * subTexture ) { + mGfx->subTexture( subTexture ); } -UIGfx * TextureAtlasSubTextureEditor::Gfx() const { +UIGfx * TextureAtlasSubTextureEditor::getGfx() const { return mGfx; } -void TextureAtlasSubTextureEditor::GetCenter() { +void TextureAtlasSubTextureEditor::getCenter() { mUICenter = Vector2i( mSize.width() / 2, mSize.height() / 2 ); } diff --git a/src/eepp/ui/tools/textureatlassubtextureeditor.hpp b/src/eepp/ui/tools/textureatlassubtextureeditor.hpp index 1b085d680..4922c1ad6 100644 --- a/src/eepp/ui/tools/textureatlassubtextureeditor.hpp +++ b/src/eepp/ui/tools/textureatlassubtextureeditor.hpp @@ -16,15 +16,15 @@ class EE_API TextureAtlasSubTextureEditor : public UIComplexControl { virtual ~TextureAtlasSubTextureEditor(); - virtual void Draw(); + virtual void draw(); - virtual void Update(); + virtual void update(); - Graphics::SubTexture * SubTexture() const; + Graphics::SubTexture * subTexture() const; - void SubTexture( Graphics::SubTexture * subTexture ); + void subTexture( Graphics::SubTexture * subTexture ); - UIGfx * Gfx() const; + UIGfx * getGfx() const; protected: UITheme * mTheme; UIGfx * mGfx; @@ -32,9 +32,9 @@ class EE_API TextureAtlasSubTextureEditor : public UIComplexControl { Vector2i mUICenter; TextureAtlasEditor * mEditor; - virtual void OnSizeChange(); + virtual void onSizeChange(); - void GetCenter(); + void getCenter(); }; }}} diff --git a/src/eepp/ui/uibackground.cpp b/src/eepp/ui/uibackground.cpp index 3c294faad..29b0eaa36 100644 --- a/src/eepp/ui/uibackground.cpp +++ b/src/eepp/ui/uibackground.cpp @@ -11,10 +11,10 @@ UIBackground::UIBackground() : UIBackground::UIBackground( const UIBackground& Back ) : mBlendMode( ALPHA_NORMAL ), - mCorners( Back.Corners() ) + mCorners( Back.corners() ) { UIBackground * b = const_cast ( &Back ); // cheating - mColor = b->Colors(); + mColor = b->colors(); } UIBackground::UIBackground( const ColorA& Color, const unsigned int& Corners, const EE_BLEND_MODE& BlendMode ) : @@ -28,22 +28,22 @@ UIBackground::UIBackground( const ColorA& TopLeftColor, const ColorA& BottomLeft mBlendMode( BlendMode ), mCorners( Corners ) { - Colors( TopLeftColor, BottomLeftColor, BottomRightColor, TopRightColor ); + colors( TopLeftColor, BottomLeftColor, BottomRightColor, TopRightColor ); } -ColorA& UIBackground::Color( const unsigned int& index ) { +ColorA& UIBackground::color( const unsigned int& index ) { if ( index < mColor.size() ) return mColor[ index ]; return mColor[ 0 ]; } -void UIBackground::ColorsTo( const ColorA& Color ) { +void UIBackground::colorsTo( const ColorA& Color ) { for ( unsigned int i = 0; i < mColor.size(); i++ ) mColor[i] = Color; } -void UIBackground::Colors( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor ) { +void UIBackground::colors( const ColorA& TopLeftColor, const ColorA& BottomLeftColor, const ColorA& BottomRightColor, const ColorA& TopRightColor ) { mColor[0] = TopLeftColor; if ( mColor.size() < 2 ) @@ -62,27 +62,27 @@ void UIBackground::Colors( const ColorA& TopLeftColor, const ColorA& BottomLeftC mColor[3] = TopRightColor; } -const std::vector& UIBackground::Colors() { +const std::vector& UIBackground::colors() { return mColor; } -void UIBackground::Color( const ColorA& Col ) { +void UIBackground::color( const ColorA& Col ) { mColor[0] = Col; } -const EE_BLEND_MODE& UIBackground::Blend() const { +const EE_BLEND_MODE& UIBackground::blend() const { return mBlendMode; } -void UIBackground::Blend( const EE_BLEND_MODE& blend ) { +void UIBackground::blend( const EE_BLEND_MODE& blend ) { mBlendMode = blend; } -const unsigned int& UIBackground::Corners() const { +const unsigned int& UIBackground::corners() const { return mCorners; } -void UIBackground::Corners( const unsigned int& corners ) { +void UIBackground::corners( const unsigned int& corners ) { mCorners = corners; } diff --git a/src/eepp/ui/uiborder.cpp b/src/eepp/ui/uiborder.cpp index 6e70ae2f8..2a6e765e7 100644 --- a/src/eepp/ui/uiborder.cpp +++ b/src/eepp/ui/uiborder.cpp @@ -3,21 +3,21 @@ namespace EE { namespace UI { UIBorder::UIBorder() : mColor( 0xFF404040 ), mWidth( 1 ) {} -UIBorder::UIBorder( const UIBorder& border ) : mColor( border.Color() ), mWidth( border.Width() ) {} +UIBorder::UIBorder( const UIBorder& border ) : mColor( border.color() ), mWidth( border.width() ) {} -const ColorA& UIBorder::Color() const { +const ColorA& UIBorder::color() const { return mColor; } -void UIBorder::Color( const ColorA& Col ) { +void UIBorder::color( const ColorA& Col ) { mColor = Col; } -const unsigned int& UIBorder::Width() const { +const unsigned int& UIBorder::width() const { return mWidth; } -void UIBorder::Width( const unsigned int& width ) { +void UIBorder::width( const unsigned int& width ) { mWidth = width; } diff --git a/src/eepp/ui/uicheckbox.cpp b/src/eepp/ui/uicheckbox.cpp index bb6a5dc73..960d36b82 100644 --- a/src/eepp/ui/uicheckbox.cpp +++ b/src/eepp/ui/uicheckbox.cpp @@ -16,92 +16,92 @@ UICheckBox::UICheckBox( const UITextBox::CreateParams& Params ) : ButtonParams.Size = Sizei( 16, 16 ); mActiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); - mActiveButton->Visible( false ); - mActiveButton->Enabled( true ); + mActiveButton->visible( false ); + mActiveButton->enabled( true ); mInactiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); - mInactiveButton->Visible( true ); - mInactiveButton->Enabled( true ); + mInactiveButton->visible( true ); + mInactiveButton->enabled( true ); - Padding( Recti(0,0,0,0) ); + padding( Recti(0,0,0,0) ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UICheckBox::~UICheckBox() { } -Uint32 UICheckBox::Type() const { +Uint32 UICheckBox::getType() const { return UI_TYPE_CHECKBOX; } -bool UICheckBox::IsType( const Uint32& type ) const { - return UICheckBox::Type() == type ? true : UITextBox::IsType( type ); +bool UICheckBox::isType( const Uint32& type ) const { + return UICheckBox::getType() == type ? true : UITextBox::isType( type ); } -void UICheckBox::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "checkbox" ); +void UICheckBox::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "checkbox" ); - mActiveButton->SetThemeControl ( Theme, "checkbox_active" ); - mInactiveButton->SetThemeControl( Theme, "checkbox_inactive" ); + mActiveButton->setThemeControl ( Theme, "checkbox_active" ); + mInactiveButton->setThemeControl( Theme, "checkbox_inactive" ); - DoAfterSetTheme(); + doAftersetTheme(); } -void UICheckBox::DoAfterSetTheme() { +void UICheckBox::doAftersetTheme() { SubTexture * tSubTexture = NULL; - UISkin * tSkin = mActiveButton->GetSkin(); + UISkin * tSkin = mActiveButton->getSkin(); if ( tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mActiveButton->Size( tSubTexture->realSize() ); - mActiveButton->CenterVertical(); + mActiveButton->size( tSubTexture->realSize() ); + mActiveButton->centerVertical(); } } - tSkin = mInactiveButton->GetSkin(); + tSkin = mInactiveButton->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mInactiveButton->Size( tSubTexture->realSize() ); - mInactiveButton->CenterVertical(); + mInactiveButton->size( tSubTexture->realSize() ); + mInactiveButton->centerVertical(); } } - Padding( Recti(0,0,0,0) ); + padding( Recti(0,0,0,0) ); } -void UICheckBox::AutoSize() { - UITextBox::AutoSize(); +void UICheckBox::autoSize() { + UITextBox::autoSize(); if ( mFlags & UI_AUTO_SIZE ) { - mActiveButton->CenterVertical(); - mInactiveButton->CenterVertical(); + mActiveButton->centerVertical(); + mInactiveButton->centerVertical(); - mSize.width( (int)mTextCache->getTextWidth() + mActiveButton->Size().width() ); + mSize.width( (int)mTextCache->getTextWidth() + mActiveButton->size().width() ); } } -void UICheckBox::OnSizeChange() { - UITextBox::OnSizeChange(); +void UICheckBox::onSizeChange() { + UITextBox::onSizeChange(); - mActiveButton->CenterVertical(); - mInactiveButton->CenterVertical(); + mActiveButton->centerVertical(); + mInactiveButton->centerVertical(); } -Uint32 UICheckBox::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UICheckBox::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - SwitchState(); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + switchState(); } - if ( Msg->Sender() == mActiveButton || Msg->Sender() == mInactiveButton ) { - SendMouseEvent( UIEvent::EventMouseClick, UIManager::instance()->GetMousePos(), UIManager::instance()->PressTrigger() ); + if ( Msg->getSender() == mActiveButton || Msg->getSender() == mInactiveButton ) { + sendMouseEvent( UIEvent::EventMouseClick, UIManager::instance()->getMousePos(), UIManager::instance()->pressTrigger() ); } return 1; @@ -111,66 +111,66 @@ Uint32 UICheckBox::OnMessage( const UIMessage * Msg ) { return 0; } -void UICheckBox::SwitchState() { - Active( !mActive ); +void UICheckBox::switchState() { + active( !mActive ); } -void UICheckBox::Active( const bool& active ) { +void UICheckBox::active( const bool& active ) { if ( !active ) { - mActiveButton->Visible( false ); - mInactiveButton->Visible( true ); + mActiveButton->visible( false ); + mInactiveButton->visible( true ); mActive = false; } else { - mActiveButton->Visible( true ); - mInactiveButton->Visible( false ); + mActiveButton->visible( true ); + mInactiveButton->visible( false ); mActive = true; } - OnValueChange(); + onValueChange(); } -const bool& UICheckBox::Active() const { +const bool& UICheckBox::active() const { return mActive; } -const bool& UICheckBox::IsActive() const { - return Active(); +const bool& UICheckBox::isActive() const { + return active(); } -void UICheckBox::Padding( const Recti& padding ) { +void UICheckBox::padding( const Recti& padding ) { mPadding = padding; - mPadding.Left = mPadding.Left + mActiveButton->Size().width(); + mPadding.Left = mPadding.Left + mActiveButton->size().width(); } -UIControlAnim * UICheckBox::ActiveButton() const { +UIControlAnim * UICheckBox::activeButton() const { return mActiveButton; } -UIControlAnim * UICheckBox::InactiveButton() const { +UIControlAnim * UICheckBox::inactiveButton() const { return mInactiveButton; } -Uint32 UICheckBox::OnKeyDown( const UIEventKey& Event ) { - UITextBox::OnKeyDown( Event ); +Uint32 UICheckBox::onKeyDown( const UIEventKey& Event ) { + UITextBox::onKeyDown( Event ); - if ( Event.KeyCode() == KEY_SPACE ) { + if ( Event.getKeyCode() == KEY_SPACE ) { if ( Sys::getTicks() - mLastTick > 250 ) { mLastTick = Sys::getTicks(); - Active( !mActive ); + active( !mActive ); } } return 1; } -void UICheckBox::OnAlphaChange() { - UITextBox::OnAlphaChange(); +void UICheckBox::onAlphaChange() { + UITextBox::onAlphaChange(); - mActiveButton->Alpha( mAlpha ); - mInactiveButton->Alpha( mAlpha ); + mActiveButton->alpha( mAlpha ); + mInactiveButton->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uicombobox.cpp b/src/eepp/ui/uicombobox.cpp index dc6ec14e7..7328050d2 100644 --- a/src/eepp/ui/uicombobox.cpp +++ b/src/eepp/ui/uicombobox.cpp @@ -7,44 +7,44 @@ UIComboBox::UIComboBox( UIComboBox::CreateParams& Params ) : UIDropDownList( Params ), mButton( NULL ) { - AllowEditing( true ); + allowEditing( true ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIComboBox::~UIComboBox() { } -Uint32 UIComboBox::Type() const { +Uint32 UIComboBox::getType() const { return UI_TYPE_COMBOBOX; } -bool UIComboBox::IsType( const Uint32& type ) const { - return UIComboBox::Type() == type ? true : UIDropDownList::IsType( type ); +bool UIComboBox::isType( const Uint32& type ) const { + return UIComboBox::getType() == type ? true : UIDropDownList::isType( type ); } -void UIComboBox::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "combobox" ); +void UIComboBox::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "combobox" ); - AutoSizeControl(); + autoSizeControl(); - CreateButton(); + createButton(); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UIComboBox::CreateButton() { +void UIComboBox::createButton() { eeSAFE_DELETE( mButton ); Int32 btnWidth = 0; - if ( NULL != mSkinState && NULL != mSkinState->GetSkin() ) { - if ( mSkinState->GetSkin()->GetType() == UISkin::SkinComplex ) { - UISkinComplex * tComplex = reinterpret_cast ( mSkinState->GetSkin() ); + if ( NULL != mSkinState && NULL != mSkinState->getSkin() ) { + if ( mSkinState->getSkin()->getType() == UISkin::SkinComplex ) { + UISkinComplex * tComplex = reinterpret_cast ( mSkinState->getSkin() ); - SubTexture * tSubTexture = tComplex->GetSubTextureSide( UISkinState::StateNormal, UISkinComplex::Right ); + SubTexture * tSubTexture = tComplex->getSubTextureSide( UISkinState::StateNormal, UISkinComplex::Right ); if ( NULL != tSubTexture ) btnWidth = tSubTexture->realSize().width(); @@ -56,42 +56,42 @@ void UIComboBox::CreateButton() { Params.Size = Sizei( btnWidth, mSize.height() ); Params.PosSet( mSize.width() - btnWidth, 0 ); mButton = eeNew( UIControl, ( Params ) ); - mButton->Visible( true ); - mButton->Enabled( true ); - mButton->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIComboBox::OnButtonClick ) ); - mButton->AddEventListener( UIEvent::EventMouseEnter, cb::Make1( this, &UIComboBox::OnButtonEnter ) ); - mButton->AddEventListener( UIEvent::EventMouseExit, cb::Make1( this, &UIComboBox::OnButtonExit ) ); + mButton->visible( true ); + mButton->enabled( true ); + mButton->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIComboBox::onButtonClick ) ); + mButton->addEventListener( UIEvent::EventMouseEnter, cb::Make1( this, &UIComboBox::onButtonEnter ) ); + mButton->addEventListener( UIEvent::EventMouseExit, cb::Make1( this, &UIComboBox::onButtonExit ) ); } -void UIComboBox::OnButtonClick( const UIEvent * Event ) { +void UIComboBox::onButtonClick( const UIEvent * Event ) { const UIEventMouse * MEvent = reinterpret_cast ( Event ); - if ( MEvent->Flags() & EE_BUTTON_LMASK ) { - ShowListBox(); + if ( MEvent->getFlags() & EE_BUTTON_LMASK ) { + showListBox(); } } -void UIComboBox::OnButtonEnter( const UIEvent * Event ) { - SetSkinState( UISkinState::StateMouseEnter ); +void UIComboBox::onButtonEnter( const UIEvent * Event ) { + setSkinState( UISkinState::StateMouseEnter ); } -void UIComboBox::OnButtonExit( const UIEvent * Event ) { - SetSkinState( UISkinState::StateMouseExit ); +void UIComboBox::onButtonExit( const UIEvent * Event ) { + setSkinState( UISkinState::StateMouseExit ); } -Uint32 UIComboBox::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { +Uint32 UIComboBox::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { if ( Flags & EE_BUTTON_LMASK ) { - UITextInput::OnMouseClick( Pos, Flags ); + UITextInput::onMouseClick( Pos, Flags ); - if ( mListBox->Visible() ) { - Hide(); + if ( mListBox->visible() ) { + hide(); } } return 1; } -void UIComboBox::OnControlClear( const UIEvent *Event ) { +void UIComboBox::onControlClear( const UIEvent *Event ) { } }} diff --git a/src/eepp/ui/uicommondialog.cpp b/src/eepp/ui/uicommondialog.cpp index 2b99f4e46..074f2fca9 100644 --- a/src/eepp/ui/uicommondialog.cpp +++ b/src/eepp/ui/uicommondialog.cpp @@ -27,149 +27,149 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : if ( mMinWindowSize.height() < CDLG_MIN_HEIGHT ) mMinWindowSize.height( CDLG_MIN_HEIGHT ); - if ( AllowFolderSelect() ) { - Title( "Select a folder" ); + if ( allowFolderSelect() ) { + title( "Select a folder" ); } else { - Title( "Select a file" ); + title( "Select a file" ); } UITextBox::CreateParams TxtBoxParams; - TxtBoxParams.Parent( Container() ); + TxtBoxParams.Parent( getContainer() ); TxtBoxParams.PosSet( 6, 13 ); TxtBoxParams.Flags |= UI_AUTO_SIZE; UITextBox * TBox = eeNew( UITextBox, ( TxtBoxParams ) ); - TBox->Visible( true ); - TBox->Enabled( false ); - TBox->Text( "Look in:" ); + TBox->visible( true ); + TBox->enabled( false ); + TBox->text( "Look in:" ); UIPushButton::CreateParams ButtonParams; ButtonParams.Flags = UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_VALIGN_CENTER | UI_AUTO_SIZE; - ButtonParams.Parent( Container() ); - ButtonParams.PosSet( Container()->Size().width() - 86, Container()->Size().height() - 24 ); + ButtonParams.Parent( getContainer() ); + ButtonParams.PosSet( getContainer()->size().width() - 86, getContainer()->size().height() - 24 ); ButtonParams.SizeSet( 80, 22 ); mButtonCancel = eeNew( UIPushButton, ( ButtonParams ) ); - mButtonCancel->Visible( true ); - mButtonCancel->Enabled( true ); - mButtonCancel->Text( "Cancel" ); - mButtonCancel->Pos( Vector2i( mButtonCancel->Pos().x, Container()->Size().height() - mButtonCancel->Size().height() - 2 ) ); - mButtonCancel->UpdateAnchorsDistances(); + mButtonCancel->visible( true ); + mButtonCancel->enabled( true ); + mButtonCancel->text( "Cancel" ); + mButtonCancel->position( Vector2i( mButtonCancel->position().x, getContainer()->size().height() - mButtonCancel->size().height() - 2 ) ); + mButtonCancel->updateAnchorsDistances(); - ButtonParams.PosSet( mButtonCancel->Pos().x, mButtonCancel->Pos().y - mButtonCancel->Size().height() ); + ButtonParams.PosSet( mButtonCancel->position().x, mButtonCancel->position().y - mButtonCancel->size().height() ); mButtonOpen = eeNew( UIPushButton, ( ButtonParams ) ); - mButtonOpen->Visible( true ); - mButtonOpen->Enabled( true ); + mButtonOpen->visible( true ); + mButtonOpen->enabled( true ); - if ( IsSaveDialog() ) - mButtonOpen->Text( "Save" ); + if ( isSaveDialog() ) + mButtonOpen->text( "Save" ); else - mButtonOpen->Text( "Open" ); + mButtonOpen->text( "Open" ); UITextInput::CreateParams TInputParams; - TInputParams.Parent( Container() ); + TInputParams.Parent( getContainer() ); TInputParams.Flags = UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_ANCHOR_RIGHT | UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_VALIGN_CENTER | UI_TEXT_SELECTION_ENABLED; TInputParams.PosSet( 70, 6 ); - TInputParams.SizeSet( Container()->Size().width() - TInputParams.Pos.x - 42, 22 ); + TInputParams.SizeSet( getContainer()->size().width() - TInputParams.Pos.x - 42, 22 ); mPath = eeNew( UITextInput, ( TInputParams ) ); - mPath->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::OnPressEnter ) ); - mPath->Visible( true ); - mPath->Enabled( true ); - mPath->Text( mCurPath ); + mPath->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::onPressEnter ) ); + mPath->visible( true ); + mPath->enabled( true ); + mPath->text( mCurPath ); ButtonParams.PosSet( TInputParams.Pos.x + TInputParams.Size.width() + 6, TInputParams.Pos.y ); ButtonParams.SizeSet( 24, 22 ); ButtonParams.Flags |= UI_ANCHOR_TOP; mButtonUp = eeNew( UIPushButton, ( ButtonParams ) ); - mButtonUp->Visible( true ); - mButtonUp->Enabled( true ); - mButtonUp->Text( "Up" ); + mButtonUp->visible( true ); + mButtonUp->enabled( true ); + mButtonUp->text( "Up" ); UIListBox::CreateParams LBParams; - LBParams.Parent( Container() ); - LBParams.PosSet( 6, mButtonUp->Pos().y + mButtonUp->Size().height() + 4 ); - LBParams.Size = Sizei( Container()->Size().width() - 12, - Container()->Size().height() - - mButtonUp->Size().height() - - mButtonUp->Pos().y - - mButtonOpen->Size().height() - - mButtonCancel->Size().height() - + LBParams.Parent( getContainer() ); + LBParams.PosSet( 6, mButtonUp->position().y + mButtonUp->size().height() + 4 ); + LBParams.Size = Sizei( getContainer()->size().width() - 12, + getContainer()->size().height() - + mButtonUp->size().height() - + mButtonUp->position().y - + mButtonOpen->size().height() - + mButtonCancel->size().height() - 8 ); LBParams.Flags = UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_CLIP_ENABLE; LBParams.FontSelectedColor = ColorA( 255, 255, 255, 255 ); - if ( NULL != UIThemeManager::instance()->DefaultTheme() ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + if ( NULL != UIThemeManager::instance()->defaultTheme() ) { + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); - LBParams.FontSelectedColor = Theme->FontSelectedColor(); + LBParams.FontSelectedColor = Theme->fontSelectedColor(); } mList = eeNew( UIListBox, ( LBParams ) ); - mList->Visible( true ); - mList->Enabled( true ); + mList->visible( true ); + mList->enabled( true ); - TxtBoxParams.PosSet( 6, Container()->Size().height() - 54 ); + TxtBoxParams.PosSet( 6, getContainer()->size().height() - 54 ); TxtBoxParams.SizeSet( 74, 19 ); TxtBoxParams.Flags = UI_ANCHOR_LEFT | UI_VALIGN_CENTER; TBox = eeNew( UITextBox, ( TxtBoxParams ) ); - TBox->Visible( true ); - TBox->Enabled( false ); - TBox->Text( "File Name:" ); + TBox->visible( true ); + TBox->enabled( false ); + TBox->text( "File Name:" ); - TxtBoxParams.PosSet( TBox->Pos().x, TBox->Pos().y + TBox->Size().height()+ 6 ); + TxtBoxParams.PosSet( TBox->position().x, TBox->position().y + TBox->size().height()+ 6 ); UITextBox * TBox2 = eeNew( UITextBox, ( TxtBoxParams ) ); - TBox2->Visible( true ); - TBox2->Enabled( false ); - TBox2->Text( "Files of type:" ); + TBox2->visible( true ); + TBox2->enabled( false ); + TBox2->text( "Files of type:" ); TInputParams.Flags &= ~UI_ANCHOR_TOP; - TInputParams.PosSet( TBox->Pos().x + TBox->Size().width(), TBox->Pos().y ); - TInputParams.SizeSet( Container()->Size().width() - mButtonOpen->Size().width() - TInputParams.Pos.x - 20, TInputParams.Size.height() ); + TInputParams.PosSet( TBox->position().x + TBox->size().width(), TBox->position().y ); + TInputParams.SizeSet( getContainer()->size().width() - mButtonOpen->size().width() - TInputParams.Pos.x - 20, TInputParams.Size.height() ); mFile = eeNew( UITextInput, ( TInputParams ) ); - mFile->Visible( true ); - mFile->Enabled( true ); - mFile->AddEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::OnPressFileEnter ) ); + mFile->visible( true ); + mFile->enabled( true ); + mFile->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::onPressFileEnter ) ); UIDropDownList::CreateParams DDLParams; - DDLParams.Parent( Container() ); - DDLParams.PosSet( TBox2->Pos().x + TBox2->Size().width(), TBox2->Pos().y ); - DDLParams.SizeSet( Container()->Size().width() - mButtonCancel->Size().width() - DDLParams.Pos.x - 20, 22 ); + DDLParams.Parent( getContainer() ); + DDLParams.PosSet( TBox2->position().x + TBox2->size().width(), TBox2->position().y ); + DDLParams.SizeSet( getContainer()->size().width() - mButtonCancel->size().width() - DDLParams.Pos.x - 20, 22 ); DDLParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_AUTO_SIZE; DDLParams.PopUpToMainControl = true; mFiletype = eeNew( UIDropDownList, ( DDLParams ) ); - mFiletype->Visible( true ); - mFiletype->Enabled( true ); - mFiletype->ListBox()->AddListBoxItem( Params.DefaultFilePattern ); - mFiletype->ListBox()->SetSelected(0); + mFiletype->visible( true ); + mFiletype->enabled( true ); + mFiletype->getListBox()->addListBoxItem( Params.DefaultFilePattern ); + mFiletype->getListBox()->setSelected(0); - ApplyDefaultTheme(); + applyDefaultTheme(); - RefreshFolder(); + refreshFolder(); } UICommonDialog::~UICommonDialog() { } -Uint32 UICommonDialog::Type() const { +Uint32 UICommonDialog::getType() const { return UI_TYPE_COMMONDIALOG; } -bool UICommonDialog::IsType( const Uint32& type ) const { - return UICommonDialog::Type() == type ? true : UIWindow::IsType( type ); +bool UICommonDialog::isType( const Uint32& type ) const { + return UICommonDialog::getType() == type ? true : UIWindow::isType( type ); } -void UICommonDialog::SetTheme( UITheme * Theme ) { - UIWindow::SetTheme( Theme ); +void UICommonDialog::setTheme( UITheme * Theme ) { + UIWindow::setTheme( Theme ); - SubTexture * Icon = Theme->GetIconByName( "go-up" ); + SubTexture * Icon = Theme->getIconByName( "go-up" ); if ( NULL != Icon ) { - mButtonUp->Text( "" ); - mButtonUp->Icon( Icon ); + mButtonUp->text( "" ); + mButtonUp->icon( Icon ); } } -void UICommonDialog::RefreshFolder() { +void UICommonDialog::refreshFolder() { std::vector flist = FileSystem::filesGetInPath( String( mCurPath ) ); std::vector files; std::vector folders; @@ -177,15 +177,15 @@ void UICommonDialog::RefreshFolder() { bool accepted; Uint32 i, z; - if ( "*" != mFiletype->Text() ) { - patterns = String::split( mFiletype->Text().toUtf8(), ';' ); + if ( "*" != mFiletype->text() ) { + patterns = String::split( mFiletype->text().toUtf8(), ';' ); for ( i = 0; i < patterns.size(); i++ ) patterns[i] = FileSystem::fileExtension( patterns[i] ); } for ( i = 0; i < flist.size(); i++ ) { - if ( FoldersFirst() && FileSystem::isDirectory( mCurPath + flist[i] ) ) { + if ( foldersFirst() && FileSystem::isDirectory( mCurPath + flist[i] ) ) { folders.push_back( flist[i] ); } else { accepted = false; @@ -206,66 +206,66 @@ void UICommonDialog::RefreshFolder() { } } - if ( SortAlphabetically() ) { + if ( sortAlphabetically() ) { std::sort( folders.begin(), folders.end() ); std::sort( files.begin(), files.end() ); } - mList->Clear(); + mList->clear(); - if ( FoldersFirst() ) { - mList->AddListBoxItems( folders ); + if ( foldersFirst() ) { + mList->addListBoxItems( folders ); } - mList->AddListBoxItems( files ); + mList->addListBoxItems( files ); - if ( NULL != mList->VerticalScrollBar() ) { - mList->VerticalScrollBar()->ClickStep( 1.f / ( ( mList->Count() * mList->RowHeight() ) / (Float)mList->Size().height() ) ); + if ( NULL != mList->verticalScrollBar() ) { + mList->verticalScrollBar()->clickStep( 1.f / ( ( mList->count() * mList->rowHeight() ) / (Float)mList->size().height() ) ); } } -void UICommonDialog::OpenSaveClick() { - if ( IsSaveDialog() ) { - Save(); +void UICommonDialog::openSaveClick() { + if ( isSaveDialog() ) { + save(); } else { - Open(); + open(); } } -void UICommonDialog::OnPressFileEnter( const UIEvent * Event ) { - OpenSaveClick(); +void UICommonDialog::onPressFileEnter( const UIEvent * Event ) { + openSaveClick(); } -void UICommonDialog::DisableButtons() { - mButtonOpen->Enabled( false ); - mButtonCancel->Enabled( false ); - mButtonUp->Enabled( false ); +void UICommonDialog::disableButtons() { + mButtonOpen->enabled( false ); + mButtonCancel->enabled( false ); + mButtonUp->enabled( false ); if ( NULL != mButtonClose ) - mButtonClose->Enabled( false ); + mButtonClose->enabled( false ); if ( NULL != mButtonMinimize ) - mButtonMinimize->Enabled( false ); + mButtonMinimize->enabled( false ); if ( NULL != mButtonMaximize ) - mButtonMaximize->Enabled( false ); + mButtonMaximize->enabled( false ); } -Uint32 UICommonDialog::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UICommonDialog::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - if ( Msg->Sender() == mButtonOpen ) { - OpenSaveClick(); - } else if ( Msg->Sender() == mButtonCancel ) { - DisableButtons(); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + if ( Msg->getSender() == mButtonOpen ) { + openSaveClick(); + } else if ( Msg->getSender() == mButtonCancel ) { + disableButtons(); CloseWindow(); - } else if ( Msg->Sender() == mButtonUp ) { + } else if ( Msg->getSender() == mButtonUp ) { mCurPath = FileSystem::removeLastFolderFromPath( mCurPath ); - mPath->Text( mCurPath ); - RefreshFolder(); + mPath->text( mCurPath ); + refreshFolder(); } } @@ -273,16 +273,16 @@ Uint32 UICommonDialog::OnMessage( const UIMessage * Msg ) { } case UIMessage::MsgDoubleClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - if ( Msg->Sender()->IsType( UI_TYPE_LISTBOXITEM ) ) { - std::string newPath = mCurPath + mList->GetItemSelectedText(); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + if ( Msg->getSender()->isType( UI_TYPE_LISTBOXITEM ) ) { + std::string newPath = mCurPath + mList->getItemSelectedText(); if ( FileSystem::isDirectory( newPath ) ) { mCurPath = newPath + FileSystem::getOSlash(); - mPath->Text( mCurPath ); - RefreshFolder(); + mPath->text( mCurPath ); + refreshFolder(); } else { - Open(); + open(); } } } @@ -291,163 +291,163 @@ Uint32 UICommonDialog::OnMessage( const UIMessage * Msg ) { } case UIMessage::MsgSelected: { - if ( Msg->Sender() == mList ) { - if ( !IsSaveDialog() ) { - if ( AllowFolderSelect() ) { - mFile->Text( mList->GetItemSelectedText() ); + if ( Msg->getSender() == mList ) { + if ( !isSaveDialog() ) { + if ( allowFolderSelect() ) { + mFile->text( mList->getItemSelectedText() ); } else { - if ( !FileSystem::isDirectory( GetTempFullPath() ) ) { - mFile->Text( mList->GetItemSelectedText() ); + if ( !FileSystem::isDirectory( getTempFullPath() ) ) { + mFile->text( mList->getItemSelectedText() ); } } } else { - if ( !FileSystem::isDirectory( GetTempFullPath() ) ) { - mFile->Text( mList->GetItemSelectedText() ); + if ( !FileSystem::isDirectory( getTempFullPath() ) ) { + mFile->text( mList->getItemSelectedText() ); } } - } else if ( Msg->Sender() == mFiletype ) { - RefreshFolder(); + } else if ( Msg->getSender() == mFiletype ) { + refreshFolder(); } break; } } - return UIWindow::OnMessage( Msg ); + return UIWindow::onMessage( Msg ); } -void UICommonDialog::Save() { - SendCommonEvent( UIEvent::EventSaveFile ); +void UICommonDialog::save() { + sendCommonEvent( UIEvent::EventSaveFile ); - DisableButtons(); + disableButtons(); CloseWindow(); } -void UICommonDialog::Open() { - if ( "" != mList->GetItemSelectedText() || AllowFolderSelect() ) { - if ( !AllowFolderSelect() ) { - if ( FileSystem::isDirectory( GetFullPath() ) ) +void UICommonDialog::open() { + if ( "" != mList->getItemSelectedText() || allowFolderSelect() ) { + if ( !allowFolderSelect() ) { + if ( FileSystem::isDirectory( getFullPath() ) ) return; } else { - if ( !FileSystem::isDirectory( GetFullPath() ) && !FileSystem::isDirectory( GetCurPath() ) ) + if ( !FileSystem::isDirectory( getFullPath() ) && !FileSystem::isDirectory( getCurPath() ) ) return; } - SendCommonEvent( UIEvent::EventOpenFile ); + sendCommonEvent( UIEvent::EventOpenFile ); - DisableButtons(); + disableButtons(); CloseWindow(); } } -void UICommonDialog::OnPressEnter( const UIEvent * Event ) { - if ( FileSystem::isDirectory( mPath->Text() ) ) { - std::string tpath = mPath->Text(); +void UICommonDialog::onPressEnter( const UIEvent * Event ) { + if ( FileSystem::isDirectory( mPath->text() ) ) { + std::string tpath = mPath->text(); FileSystem::dirPathAddSlashAtEnd( tpath ); - mPath->Text( tpath ); - mCurPath = mPath->Text(); - RefreshFolder(); + mPath->text( tpath ); + mCurPath = mPath->text(); + refreshFolder(); } } -void UICommonDialog::AddFilePattern( std::string pattern, bool select ) { - Uint32 index = mFiletype->ListBox()->AddListBoxItem( pattern ); +void UICommonDialog::addFilePattern( std::string pattern, bool select ) { + Uint32 index = mFiletype->getListBox()->addListBoxItem( pattern ); if ( select ) { - mFiletype->ListBox()->SetSelected( index ); + mFiletype->getListBox()->setSelected( index ); - RefreshFolder(); + refreshFolder(); } } -bool UICommonDialog::IsSaveDialog() { +bool UICommonDialog::isSaveDialog() { return 0 != ( mCDLFlags & CDL_FLAG_SAVE_DIALOG ); } -bool UICommonDialog::SortAlphabetically() { +bool UICommonDialog::sortAlphabetically() { return 0 != ( mCDLFlags & CDL_FLAG_SORT_ALPHABETICALLY ); } -bool UICommonDialog::FoldersFirst() { +bool UICommonDialog::foldersFirst() { return 0 != ( mCDLFlags & CDL_FLAG_FOLDERS_FISRT ); } -bool UICommonDialog::AllowFolderSelect() { +bool UICommonDialog::allowFolderSelect() { return 0 != ( mCDLFlags & CDL_FLAG_ALLOW_FOLDER_SELECT ); } -void UICommonDialog::SortAlphabetically( const bool& sortAlphabetically ) { +void UICommonDialog::sortAlphabetically( const bool& sortAlphabetically ) { BitOp::setBitFlagValue( &mCDLFlags, CDL_FLAG_SORT_ALPHABETICALLY, sortAlphabetically ? 1 : 0 ); - RefreshFolder(); + refreshFolder(); } -void UICommonDialog::FoldersFirst( const bool& foldersFirst ) { +void UICommonDialog::foldersFirst( const bool& foldersFirst ) { BitOp::setBitFlagValue( &mCDLFlags, CDL_FLAG_FOLDERS_FISRT , foldersFirst ? 1 : 0 ); - RefreshFolder(); + refreshFolder(); } -void UICommonDialog::AllowFolderSelect( const bool& allowFolderSelect ) { +void UICommonDialog::allowFolderSelect( const bool& allowFolderSelect ) { BitOp::setBitFlagValue( &mCDLFlags, CDL_FLAG_ALLOW_FOLDER_SELECT, allowFolderSelect ? 1 : 0 ); } -std::string UICommonDialog::GetFullPath() { +std::string UICommonDialog::getFullPath() { std::string tPath = mCurPath; FileSystem::dirPathAddSlashAtEnd( tPath ); - tPath += GetCurFile(); + tPath += getCurFile(); return tPath; } -std::string UICommonDialog::GetTempFullPath() { +std::string UICommonDialog::getTempFullPath() { std::string tPath = mCurPath; FileSystem::dirPathAddSlashAtEnd( tPath ); - tPath += mList->GetItemSelectedText().toUtf8(); + tPath += mList->getItemSelectedText().toUtf8(); return tPath; } -std::string UICommonDialog::GetCurPath() const { +std::string UICommonDialog::getCurPath() const { return mCurPath; } -std::string UICommonDialog::GetCurFile() const { +std::string UICommonDialog::getCurFile() const { if ( mCDLFlags & CDL_FLAG_SAVE_DIALOG ) - return mFile->Text(); + return mFile->text(); - return mList->GetItemSelectedText().toUtf8(); + return mList->getItemSelectedText().toUtf8(); } -UIPushButton * UICommonDialog::GetButtonOpen() const { +UIPushButton * UICommonDialog::getButtonOpen() const { return mButtonOpen; } -UIPushButton * UICommonDialog::GetButtonCancel() const { +UIPushButton * UICommonDialog::getButtonCancel() const { return mButtonCancel; } -UIPushButton * UICommonDialog::GetButtonUp() const { +UIPushButton * UICommonDialog::getButtonUp() const { return mButtonUp; } -UIListBox * UICommonDialog::GetList() const { +UIListBox * UICommonDialog::getList() const { return mList; } -UITextInput * UICommonDialog::GetPathInput() const { +UITextInput * UICommonDialog::getPathInput() const { return mPath; } -UITextInput * UICommonDialog::GetFileInput() const { +UITextInput * UICommonDialog::getFileInput() const { return mFile; } -UIDropDownList * UICommonDialog::GetFiletypeList() const { +UIDropDownList * UICommonDialog::getFiletypeList() const { return mFiletype; } diff --git a/src/eepp/ui/uicomplexcontrol.cpp b/src/eepp/ui/uicomplexcontrol.cpp index 9e9492cf5..6b024b2f8 100644 --- a/src/eepp/ui/uicomplexcontrol.cpp +++ b/src/eepp/ui/uicomplexcontrol.cpp @@ -10,121 +10,121 @@ UIComplexControl::UIComplexControl( const UIComplexControl::CreateParams& Params { mControlFlags |= UI_CTRL_FLAG_COMPLEX; - UpdateAnchorsDistances(); + updateAnchorsDistances(); - TooltipText( Params.TooltipText ); + tooltipText( Params.TooltipText ); } UIComplexControl::~UIComplexControl() { eeSAFE_DELETE( mTooltip ); } -Uint32 UIComplexControl::Type() const { +Uint32 UIComplexControl::getType() const { return UI_TYPE_CONTROL_COMPLEX; } -bool UIComplexControl::IsType( const Uint32& type ) const { - return UIComplexControl::Type() == type ? true : UIControlAnim::IsType( type ); +bool UIComplexControl::isType( const Uint32& type ) const { + return UIComplexControl::getType() == type ? true : UIControlAnim::isType( type ); } -void UIComplexControl::UpdateAnchorsDistances() { +void UIComplexControl::updateAnchorsDistances() { if ( NULL != mParentCtrl ) { - mDistToBorder = Recti( mPos.x, mPos.y, mParentCtrl->Size().x - ( mPos.x + mSize.x ), mParentCtrl->Size().y - ( mPos.y + mSize.y ) ); + mDistToBorder = Recti( mPos.x, mPos.y, mParentCtrl->size().x - ( mPos.x + mSize.x ), mParentCtrl->size().y - ( mPos.y + mSize.y ) ); } } -void UIComplexControl::Update() { - if ( mVisible && NULL != mTooltip && mTooltip->Text().size() ) { - if ( IsMouseOverMeOrChilds() ) { - Vector2i Pos = UIManager::instance()->GetMousePos(); - Pos.x += UIThemeManager::instance()->CursorSize().x; - Pos.y += UIThemeManager::instance()->CursorSize().y; +void UIComplexControl::update() { + if ( mVisible && NULL != mTooltip && mTooltip->text().size() ) { + if ( isMouseOverMeOrChilds() ) { + Vector2i Pos = UIManager::instance()->getMousePos(); + Pos.x += UIThemeManager::instance()->cursorSize().x; + Pos.y += UIThemeManager::instance()->cursorSize().y; - if ( Pos.x + mTooltip->Size().width() > UIManager::instance()->MainControl()->Size().width() ) { - Pos.x = UIManager::instance()->GetMousePos().x - mTooltip->Size().width(); + if ( Pos.x + mTooltip->size().width() > UIManager::instance()->mainControl()->size().width() ) { + Pos.x = UIManager::instance()->getMousePos().x - mTooltip->size().width(); } - if ( Pos.y + mTooltip->Size().height() > UIManager::instance()->MainControl()->Size().height() ) { - Pos.y = UIManager::instance()->GetMousePos().y - mTooltip->Size().height(); + if ( Pos.y + mTooltip->size().height() > UIManager::instance()->mainControl()->size().height() ) { + Pos.y = UIManager::instance()->getMousePos().y - mTooltip->size().height(); } - if ( Time::Zero == UIThemeManager::instance()->TooltipTimeToShow() ) { - if ( !mTooltip->Visible() || UIThemeManager::instance()->TooltipFollowMouse() ) - mTooltip->Pos( Pos ); + if ( Time::Zero == UIThemeManager::instance()->tooltipTimeToShow() ) { + if ( !mTooltip->visible() || UIThemeManager::instance()->tooltipFollowMouse() ) + mTooltip->position( Pos ); - mTooltip->Show(); + mTooltip->show(); } else { - if ( -1.f != mTooltip->TooltipTime().asMilliseconds() ) { - mTooltip->TooltipTimeAdd( UIManager::instance()->Elapsed() ); + if ( -1.f != mTooltip->tooltipTime().asMilliseconds() ) { + mTooltip->tooltipTimeAdd( UIManager::instance()->elapsed() ); } - if ( mTooltip->TooltipTime() >= UIThemeManager::instance()->TooltipTimeToShow() ) { - if ( mTooltip->TooltipTime().asMilliseconds() != -1.f ) { - mTooltip->Pos( Pos ); + if ( mTooltip->tooltipTime() >= UIThemeManager::instance()->tooltipTimeToShow() ) { + if ( mTooltip->tooltipTime().asMilliseconds() != -1.f ) { + mTooltip->position( Pos ); - mTooltip->Show(); + mTooltip->show(); - mTooltip->TooltipTime( Milliseconds( -1.f ) ); + mTooltip->tooltipTime( Milliseconds( -1.f ) ); } } } - if ( UIThemeManager::instance()->TooltipFollowMouse() ) { - mTooltip->Pos( Pos ); + if ( UIThemeManager::instance()->tooltipFollowMouse() ) { + mTooltip->position( Pos ); } } else { - mTooltip->TooltipTime( Milliseconds( 0.f ) ); + mTooltip->tooltipTime( Milliseconds( 0.f ) ); - if ( mTooltip->Visible() ) - mTooltip->Hide(); + if ( mTooltip->visible() ) + mTooltip->hide(); } } - UIControlAnim::Update(); + UIControlAnim::update(); } -void UIComplexControl::CreateTooltip() { +void UIComplexControl::createTooltip() { if ( NULL != mTooltip ) return; - UITheme * tTheme = UIThemeManager::instance()->DefaultTheme(); + UITheme * tTheme = UIThemeManager::instance()->defaultTheme(); if ( NULL != tTheme ) { - mTooltip = tTheme->CreateTooltip( this, UIManager::instance()->MainControl() ); - mTooltip->Visible( false ); - mTooltip->Enabled( false ); + mTooltip = tTheme->createTooltip( this, UIManager::instance()->mainControl() ); + mTooltip->visible( false ); + mTooltip->enabled( false ); } else { UITooltip::CreateParams Params; - Params.Parent( UIManager::instance()->MainControl() ); + Params.Parent( UIManager::instance()->mainControl() ); Params.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_AUTO_PADDING | UI_AUTO_SIZE; mTooltip = eeNew( UITooltip, ( Params, this ) ); } } -void UIComplexControl::TooltipText( const String& Text ) { +void UIComplexControl::tooltipText( const String& Text ) { if ( NULL == mTooltip ) { // If the tooltip wasn't created it will avoid to create a new one if the string is "" if ( Text.size() ) { - CreateTooltip(); + createTooltip(); - mTooltip->Text( Text ); + mTooltip->text( Text ); } } else { // but if it's created, i will allow it - mTooltip->Text( Text ); + mTooltip->text( Text ); } } -String UIComplexControl::TooltipText() { +String UIComplexControl::tooltipText() { if ( NULL != mTooltip ) - return mTooltip->Text(); + return mTooltip->text(); return String(); } -void UIComplexControl::TooltipRemove() { +void UIComplexControl::tooltipRemove() { mTooltip = NULL; } -void UIComplexControl::Size( const Sizei &Size ) { +void UIComplexControl::size( const Sizei &Size ) { Sizei s( Size ); if ( s.x < mMinControlSize.x ) @@ -133,29 +133,29 @@ void UIComplexControl::Size( const Sizei &Size ) { if ( s.y < mMinControlSize.y ) s.y = mMinControlSize.y; - UIControlAnim::Size( s ); + UIControlAnim::size( s ); } -void UIComplexControl::Size( const Int32& Width, const Int32& Height ) { - UIControlAnim::Size( Width, Height ); +void UIComplexControl::size( const Int32& Width, const Int32& Height ) { + UIControlAnim::size( Width, Height ); } -const Sizei& UIComplexControl::Size() { - return UIControlAnim::Size(); +const Sizei& UIComplexControl::size() { + return UIControlAnim::size(); } -void UIComplexControl::OnParentSizeChange( const Vector2i& SizeChange ) { +void UIComplexControl::onParentSizeChange( const Vector2i& SizeChange ) { Sizei newSize( mSize ); if ( mFlags & UI_ANCHOR_LEFT ) { // Nothing ? } else { - Pos( mPos.x += SizeChange.x, mPos.y ); + position( mPos.x += SizeChange.x, mPos.y ); } if ( mFlags & UI_ANCHOR_RIGHT ) { if ( NULL != mParentCtrl ) { - newSize.x = mParentCtrl->Size().width() - mPos.x - mDistToBorder.Right; + newSize.x = mParentCtrl->size().width() - mPos.x - mDistToBorder.Right; if ( newSize.x < mMinControlSize.width() ) newSize.x = mMinControlSize.width(); @@ -165,12 +165,12 @@ void UIComplexControl::OnParentSizeChange( const Vector2i& SizeChange ) { if ( mFlags & UI_ANCHOR_TOP ) { // Nothing ? } else { - Pos( mPos.x, mPos.y += SizeChange.y ); + position( mPos.x, mPos.y += SizeChange.y ); } if ( mFlags & UI_ANCHOR_BOTTOM ) { if ( NULL != mParentCtrl ) { - newSize.y = mParentCtrl->Size().y - mPos.y - mDistToBorder.Bottom; + newSize.y = mParentCtrl->size().y - mPos.y - mDistToBorder.Bottom; if ( newSize.y < mMinControlSize.height() ) newSize.y = mMinControlSize.height(); @@ -178,9 +178,9 @@ void UIComplexControl::OnParentSizeChange( const Vector2i& SizeChange ) { } if ( newSize != mSize ) - Size( newSize ); + size( newSize ); - UIControlAnim::OnParentSizeChange( SizeChange ); + UIControlAnim::onParentSizeChange( SizeChange ); } }} diff --git a/src/eepp/ui/uicontrol.cpp b/src/eepp/ui/uicontrol.cpp index 1a2ca810c..70f60ff0c 100644 --- a/src/eepp/ui/uicontrol.cpp +++ b/src/eepp/ui/uicontrol.cpp @@ -26,12 +26,12 @@ UIControl::UIControl( const CreateParams& Params ) : mVisible( false ), mEnabled( false ) { - if ( NULL == mParentCtrl && NULL != UIManager::instance()->MainControl() ) { - mParentCtrl = UIManager::instance()->MainControl(); + if ( NULL == mParentCtrl && NULL != UIManager::instance()->mainControl() ) { + mParentCtrl = UIManager::instance()->mainControl(); } if ( NULL != mParentCtrl ) - mParentCtrl->ChildAdd( this ); + mParentCtrl->childAdd( this ); if ( mFlags & UI_FILL_BACKGROUND ) mBackground = eeNew( UIBackground, ( Params.Background ) ); @@ -39,392 +39,392 @@ UIControl::UIControl( const CreateParams& Params ) : if ( mFlags & UI_BORDER ) mBorder = eeNew( UIBorder, ( Params.Border ) ); - UpdateScreenPos(); - UpdateQuad(); + updateScreenPos(); + updateQuad(); } UIControl::~UIControl() { - SafeDeleteSkinState(); + safeDeleteSkinState(); eeSAFE_DELETE( mBackground ); eeSAFE_DELETE( mBorder ); - ChildDeleteAll(); + childDeleteAll(); if ( NULL != mParentCtrl ) - mParentCtrl->ChildRemove( this ); + mParentCtrl->childRemove( this ); - if ( UIManager::instance()->FocusControl() == this && UIManager::instance()->MainControl() != this ) { - UIManager::instance()->FocusControl( UIManager::instance()->MainControl() ); + if ( UIManager::instance()->focusControl() == this && UIManager::instance()->mainControl() != this ) { + UIManager::instance()->focusControl( UIManager::instance()->mainControl() ); } - if ( UIManager::instance()->OverControl() == this && UIManager::instance()->MainControl() != this ) { - UIManager::instance()->OverControl( UIManager::instance()->MainControl() ); + if ( UIManager::instance()->overControl() == this && UIManager::instance()->mainControl() != this ) { + UIManager::instance()->overControl( UIManager::instance()->mainControl() ); } } -void UIControl::ScreenToControl( Vector2i& Pos ) const { +void UIControl::screenToControl( Vector2i& Pos ) const { UIControl * ParentLoop = mParentCtrl; Pos.x -= mPos.x; Pos.y -= mPos.y; while ( NULL != ParentLoop ) { - const Vector2i& ParentPos = ParentLoop->Pos(); + const Vector2i& ParentPos = ParentLoop->position(); Pos.x -= ParentPos.x; Pos.y -= ParentPos.y; - ParentLoop = ParentLoop->Parent(); + ParentLoop = ParentLoop->parent(); } } -void UIControl::ControlToScreen( Vector2i& Pos ) const { +void UIControl::controlToScreen( Vector2i& Pos ) const { UIControl * ParentLoop = mParentCtrl; while ( NULL != ParentLoop ) { - const Vector2i& ParentPos = ParentLoop->Pos(); + const Vector2i& ParentPos = ParentLoop->position(); Pos.x += ParentPos.x; Pos.y += ParentPos.y; - ParentLoop = ParentLoop->Parent(); + ParentLoop = ParentLoop->parent(); } } -Uint32 UIControl::Type() const { +Uint32 UIControl::getType() const { return UI_TYPE_CONTROL; } -bool UIControl::IsType( const Uint32& type ) const { - return UIControl::Type() == type; +bool UIControl::isType( const Uint32& type ) const { + return UIControl::getType() == type; } -void UIControl::MessagePost( const UIMessage * Msg ) { +void UIControl::messagePost( const UIMessage * Msg ) { UIControl * Ctrl = this; while( NULL != Ctrl ) { - if ( Ctrl->OnMessage( Msg ) ) + if ( Ctrl->onMessage( Msg ) ) break; - Ctrl = Ctrl->Parent(); + Ctrl = Ctrl->parent(); } } -Uint32 UIControl::OnMessage( const UIMessage * Msg ) { +Uint32 UIControl::onMessage( const UIMessage * Msg ) { return 0; } -bool UIControl::IsInside( const Vector2i& Pos ) const { +bool UIControl::isInside( const Vector2i& Pos ) const { return ( Pos.x >= 0 && Pos.y >= 0 && Pos.x < mSize.width() && Pos.y < mSize.height() ); } -void UIControl::Pos( const Vector2i& Pos ) { +void UIControl::position( const Vector2i& Pos ) { mPos = Pos; - OnPosChange(); + onPositionChange(); } -void UIControl::Pos( const Int32& x, const Int32& y ) { +void UIControl::position( const Int32& x, const Int32& y ) { mPos = Vector2i( x, y ); - OnPosChange(); + onPositionChange(); } -const Vector2i& UIControl::Pos() const { +const Vector2i& UIControl::position() const { return mPos; } -void UIControl::Size( const Sizei& Size ) { +void UIControl::size( const Sizei& Size ) { if ( Size != mSize ) { Vector2i sizeChange( Size.x - mSize.x, Size.y - mSize.y ); mSize = Size; - OnSizeChange(); + onSizeChange(); if ( mFlags & UI_REPORT_SIZE_CHANGE_TO_CHILDS ) { - SendParentSizeChange( sizeChange ); + sendParentSizeChange( sizeChange ); } } } -void UIControl::Size( const Int32& Width, const Int32& Height ) { - Size( Sizei( Width, Height ) ); +void UIControl::size( const Int32& Width, const Int32& Height ) { + size( Sizei( Width, Height ) ); } -Recti UIControl::Rect() const { +Recti UIControl::getRect() const { return Recti( mPos, mSize ); } -const Sizei& UIControl::Size() { +const Sizei& UIControl::size() { return mSize; } -void UIControl::Visible( const bool& visible ) { +void UIControl::visible( const bool& visible ) { mVisible = visible; - OnVisibleChange(); + onVisibleChange(); } -bool UIControl::Visible() const { +bool UIControl::visible() const { return mVisible; } -bool UIControl::Hided() const { +bool UIControl::isHided() const { return !mVisible; } -void UIControl::Enabled( const bool& enabled ) { +void UIControl::enabled( const bool& enabled ) { mEnabled = enabled; - OnEnabledChange(); + onEnabledChange(); } -bool UIControl::Enabled() const { +bool UIControl::enabled() const { return mEnabled; } -bool UIControl::Disabled() const { +bool UIControl::isDisabled() const { return !mEnabled; } -UIControl * UIControl::Parent() const { +UIControl * UIControl::parent() const { return mParentCtrl; } -void UIControl::Parent( UIControl * parent ) { +void UIControl::parent( UIControl * parent ) { if ( parent == mParentCtrl ) return; if ( NULL != mParentCtrl ) - mParentCtrl->ChildRemove( this ); + mParentCtrl->childRemove( this ); mParentCtrl = parent; if ( NULL != mParentCtrl ) - mParentCtrl->ChildAdd( this ); + mParentCtrl->childAdd( this ); } -bool UIControl::IsParentOf( UIControl * Ctrl ) { +bool UIControl::isParentOf( UIControl * Ctrl ) { eeASSERT( NULL != Ctrl ); - UIControl * tParent = Ctrl->Parent(); + UIControl * tParent = Ctrl->parent(); while ( NULL != tParent ) { if ( this == tParent ) return true; - tParent = tParent->Parent(); + tParent = tParent->parent(); } return false; } -void UIControl::CenterHorizontal() { - UIControl * Ctrl = Parent(); +void UIControl::centerHorizontal() { + UIControl * Ctrl = parent(); if ( NULL != Ctrl ) - Pos( Vector2i( ( Ctrl->Size().width() / 2 ) - ( mSize.width() / 2 ), mPos.y ) ); + position( Vector2i( ( Ctrl->size().width() / 2 ) - ( mSize.width() / 2 ), mPos.y ) ); } -void UIControl::CenterVertical(){ - UIControl * Ctrl = Parent(); +void UIControl::centerVertical(){ + UIControl * Ctrl = parent(); if ( NULL != Ctrl ) - Pos( Vector2i( mPos.x, ( Ctrl->Size().height() / 2 ) - ( mSize.height() / 2 ) ) ); + position( Vector2i( mPos.x, ( Ctrl->size().height() / 2 ) - ( mSize.height() / 2 ) ) ); } -void UIControl::Center() { - CenterHorizontal(); - CenterVertical(); +void UIControl::center() { + centerHorizontal(); + centerVertical(); } -void UIControl::Close() { +void UIControl::close() { mControlFlags |= UI_CTRL_FLAG_CLOSE; - UIManager::instance()->AddToCloseQueue( this ); + UIManager::instance()->addToCloseQueue( this ); } -void UIControl::Draw() { +void UIControl::draw() { if ( mVisible ) { if ( mFlags & UI_FILL_BACKGROUND ) - BackgroundDraw(); + backgroundDraw(); if ( mFlags & UI_BORDER ) - BorderDraw(); + borderDraw(); if ( NULL != mSkinState ) - mSkinState->Draw( mScreenPosf.x, mScreenPosf.y, (Float)mSize.width(), (Float)mSize.height(), 255 ); + mSkinState->draw( mScreenPosf.x, mScreenPosf.y, (Float)mSize.width(), (Float)mSize.height(), 255 ); - if ( UIManager::instance()->HighlightFocus() && UIManager::instance()->FocusControl() == this ) { + if ( UIManager::instance()->highlightFocus() && UIManager::instance()->focusControl() == this ) { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.setColor( UIManager::instance()->HighlightFocusColor() ); - P.drawRectangle( GetRectf() ); + P.blendMode( blend() ); + P.setColor( UIManager::instance()->highlightFocusColor() ); + P.drawRectangle( getRectf() ); } - if ( UIManager::instance()->HighlightOver() && UIManager::instance()->OverControl() == this ) { + if ( UIManager::instance()->highlightOver() && UIManager::instance()->overControl() == this ) { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.setColor( UIManager::instance()->HighlightOverColor() ); - P.drawRectangle( GetRectf() ); + P.blendMode( blend() ); + P.setColor( UIManager::instance()->highlightOverColor() ); + P.drawRectangle( getRectf() ); } } } -void UIControl::Update() { +void UIControl::update() { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { - ChildLoop->Update(); + ChildLoop->update(); ChildLoop = ChildLoop->mNext; } if ( mControlFlags & UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD ) - WriteCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 0 ); + writeCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 0 ); } -void UIControl::SendMouseEvent( const Uint32& Event, const Vector2i& Pos, const Uint32& Flags ) { +void UIControl::sendMouseEvent( const Uint32& Event, const Vector2i& Pos, const Uint32& Flags ) { UIEventMouse MouseEvent( this, Event, Pos, Flags ); - SendEvent( &MouseEvent ); + sendEvent( &MouseEvent ); } -void UIControl::SendCommonEvent( const Uint32& Event ) { +void UIControl::sendCommonEvent( const Uint32& Event ) { UIEvent CommonEvent( this, Event ); - SendEvent( &CommonEvent ); + sendEvent( &CommonEvent ); } -Uint32 UIControl::OnKeyDown( const UIEventKey& Event ) { - SendEvent( &Event ); +Uint32 UIControl::onKeyDown( const UIEventKey& Event ) { + sendEvent( &Event ); return 0; } -Uint32 UIControl::OnKeyUp( const UIEventKey& Event ) { - SendEvent( &Event ); +Uint32 UIControl::onKeyUp( const UIEventKey& Event ) { + sendEvent( &Event ); return 0; } -Uint32 UIControl::OnMouseMove( const Vector2i& Pos, const Uint32 Flags ) { - SendMouseEvent( UIEvent::EventMouseMove, Pos, Flags ); +Uint32 UIControl::onMouseMove( const Vector2i& Pos, const Uint32 Flags ) { + sendMouseEvent( UIEvent::EventMouseMove, Pos, Flags ); return 1; } -Uint32 UIControl::OnMouseDown( const Vector2i& Pos, const Uint32 Flags ) { - SendMouseEvent( UIEvent::EventMouseDown, Pos, Flags ); +Uint32 UIControl::onMouseDown( const Vector2i& Pos, const Uint32 Flags ) { + sendMouseEvent( UIEvent::EventMouseDown, Pos, Flags ); - SetSkinState( UISkinState::StateMouseDown ); + setSkinState( UISkinState::StateMouseDown ); return 1; } -Uint32 UIControl::OnMouseUp( const Vector2i& Pos, const Uint32 Flags ) { - SendMouseEvent( UIEvent::EventMouseUp, Pos, Flags ); +Uint32 UIControl::onMouseUp( const Vector2i& Pos, const Uint32 Flags ) { + sendMouseEvent( UIEvent::EventMouseUp, Pos, Flags ); - SetPrevSkinState(); + setPrevSkinState(); return 1; } -Uint32 UIControl::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { - SendMouseEvent( UIEvent::EventMouseClick, Pos, Flags ); +Uint32 UIControl::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { + sendMouseEvent( UIEvent::EventMouseClick, Pos, Flags ); return 1; } -bool UIControl::IsMouseOver() { +bool UIControl::isMouseOver() { return 0 != ( mControlFlags & UI_CTRL_FLAG_MOUSEOVER ); } -bool UIControl::IsMouseOverMeOrChilds() { +bool UIControl::isMouseOverMeOrChilds() { return 0 != ( mControlFlags & UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD ); } -Uint32 UIControl::OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { - SendMouseEvent( UIEvent::EventMouseDoubleClick, Pos, Flags ); +Uint32 UIControl::onMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { + sendMouseEvent( UIEvent::EventMouseDoubleClick, Pos, Flags ); return 1; } -Uint32 UIControl::OnMouseEnter( const Vector2i& Pos, const Uint32 Flags ) { - WriteCtrlFlag( UI_CTRL_FLAG_MOUSEOVER, 1 ); +Uint32 UIControl::onMouseEnter( const Vector2i& Pos, const Uint32 Flags ) { + writeCtrlFlag( UI_CTRL_FLAG_MOUSEOVER, 1 ); - SendMouseEvent( UIEvent::EventMouseEnter, Pos, Flags ); + sendMouseEvent( UIEvent::EventMouseEnter, Pos, Flags ); - SetSkinState( UISkinState::StateMouseEnter ); + setSkinState( UISkinState::StateMouseEnter ); return 1; } -Uint32 UIControl::OnMouseExit( const Vector2i& Pos, const Uint32 Flags ) { - WriteCtrlFlag( UI_CTRL_FLAG_MOUSEOVER, 0 ); +Uint32 UIControl::onMouseExit( const Vector2i& Pos, const Uint32 Flags ) { + writeCtrlFlag( UI_CTRL_FLAG_MOUSEOVER, 0 ); - SendMouseEvent( UIEvent::EventMouseExit, Pos, Flags ); + sendMouseEvent( UIEvent::EventMouseExit, Pos, Flags ); - SetSkinState( UISkinState::StateMouseExit ); + setSkinState( UISkinState::StateMouseExit ); return 1; } -Uint32 UIControl::OnFocus() { +Uint32 UIControl::onFocus() { mControlFlags |= UI_CTRL_FLAG_HAS_FOCUS; - SendCommonEvent( UIEvent::EventOnFocus ); + sendCommonEvent( UIEvent::EventOnFocus ); - SetSkinState( UISkinState::StateFocus ); + setSkinState( UISkinState::StateFocus ); return 1; } -Uint32 UIControl::OnFocusLoss() { +Uint32 UIControl::onFocusLoss() { mControlFlags &= ~UI_CTRL_FLAG_HAS_FOCUS; - SendCommonEvent( UIEvent::EventOnFocusLoss ); + sendCommonEvent( UIEvent::EventOnFocusLoss ); return 1; } -void UIControl::OnComplexControlFocusLoss() { - SendCommonEvent( UIEvent::EventOnComplexControlFocusLoss ); +void UIControl::onComplexControlFocusLoss() { + sendCommonEvent( UIEvent::EventOnComplexControlFocusLoss ); } -bool UIControl::HasFocus() const { +bool UIControl::hasFocus() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_HAS_FOCUS ); } -Uint32 UIControl::OnValueChange() { - SendCommonEvent( UIEvent::EventOnValueChange ); +Uint32 UIControl::onValueChange() { + sendCommonEvent( UIEvent::EventOnValueChange ); return 1; } -void UIControl::OnClose() { - SendCommonEvent( UIEvent::EventOnClose ); +void UIControl::onClose() { + sendCommonEvent( UIEvent::EventOnClose ); } -Uint32 UIControl::HAlign() const { +Uint32 UIControl::hAlign() const { return mFlags & UI_HALIGN_MASK; } -void UIControl::HAlign( Uint32 halign ) { +void UIControl::hAlign( Uint32 halign ) { mFlags |= halign & UI_HALIGN_MASK; } -Uint32 UIControl::VAlign() const { +Uint32 UIControl::vAlign() const { return mFlags & UI_VALIGN_MASK; } -void UIControl::VAlign( Uint32 valign ) { +void UIControl::vAlign( Uint32 valign ) { mFlags |= valign & UI_VALIGN_MASK; } -void UIControl::FillBackground( bool enabled ) { - WriteFlag( UI_FILL_BACKGROUND, enabled ? 1 : 0 ); +void UIControl::fillBackground( bool enabled ) { + writeFlag( UI_FILL_BACKGROUND, enabled ? 1 : 0 ); if ( enabled && NULL == mBackground ) { mBackground = eeNew( UIBackground, () ); } } -void UIControl::Border( bool enabled ) { - WriteFlag( UI_BORDER, enabled ? 1 : 0 ); +void UIControl::border( bool enabled ) { + writeFlag( UI_BORDER, enabled ? 1 : 0 ); if ( enabled && NULL == mBorder ) { mBorder = eeNew( UIBorder, () ); @@ -435,205 +435,205 @@ void UIControl::Border( bool enabled ) { } } -UIControl * UIControl::NextGet() const { +UIControl * UIControl::nextGet() const { return mNext; } -UIControl * UIControl::PrevGet() const { +UIControl * UIControl::prevGet() const { return mPrev; } -UIControl * UIControl::NextGetLoop() const { +UIControl * UIControl::nextGetLoop() const { if ( NULL == mNext ) - return Parent()->ChildGetFirst(); + return parent()->childGetFirst(); else return mNext; } -void UIControl::Data(const UintPtr& data ) { +void UIControl::data(const UintPtr& data ) { mData = data; } -const UintPtr& UIControl::Data() const { +const UintPtr& UIControl::data() const { return mData; } -const Uint32& UIControl::Flags() const { +const Uint32& UIControl::flags() const { return mFlags; } -void UIControl::Flags( const Uint32& flags ) { +void UIControl::flags( const Uint32& flags ) { mFlags |= flags; } -void UIControl::Blend( const EE_BLEND_MODE& blend ) { +void UIControl::blend( const EE_BLEND_MODE& blend ) { mBlend = static_cast ( blend ); } -EE_BLEND_MODE UIControl::Blend() { +EE_BLEND_MODE UIControl::blend() { return static_cast ( mBlend ); } -void UIControl::ToFront() { +void UIControl::toFront() { if ( NULL != mParentCtrl ) { - mParentCtrl->ChildRemove( this ); - mParentCtrl->ChildAdd( this ); + mParentCtrl->childRemove( this ); + mParentCtrl->childAdd( this ); } } -void UIControl::ToBack() { +void UIControl::toBack() { if ( NULL != mParentCtrl ) { - mParentCtrl->ChildAddAt( this, 0 ); + mParentCtrl->childAddAt( this, 0 ); } } -void UIControl::ToPos( const Uint32& Pos ) { +void UIControl::toPos( const Uint32& Pos ) { if ( NULL != mParentCtrl ) { - mParentCtrl->ChildAddAt( this, Pos ); + mParentCtrl->childAddAt( this, Pos ); } } -void UIControl::OnVisibleChange() { - SendCommonEvent( UIEvent::EventOnVisibleChange ); +void UIControl::onVisibleChange() { + sendCommonEvent( UIEvent::EventOnVisibleChange ); } -void UIControl::OnEnabledChange() { - if ( !Enabled() && NULL != UIManager::instance()->FocusControl() ) { - if ( IsChild( UIManager::instance()->FocusControl() ) ) { - UIManager::instance()->FocusControl( NULL ); +void UIControl::onEnabledChange() { + if ( !enabled() && NULL != UIManager::instance()->focusControl() ) { + if ( isChild( UIManager::instance()->focusControl() ) ) { + UIManager::instance()->focusControl( NULL ); } } - SendCommonEvent( UIEvent::EventOnEnabledChange ); + sendCommonEvent( UIEvent::EventOnEnabledChange ); } -void UIControl::OnPosChange() { - UpdateScreenPos(); +void UIControl::onPositionChange() { + updateScreenPos(); - UpdateChildsScreenPos(); + updateChildsScreenPos(); - SendCommonEvent( UIEvent::EventOnPosChange ); + sendCommonEvent( UIEvent::EventOnPosChange ); } -void UIControl::OnSizeChange() { - UpdateCenter(); +void UIControl::onSizeChange() { + updateCenter(); - SendCommonEvent( UIEvent::EventOnSizeChange ); + sendCommonEvent( UIEvent::EventOnSizeChange ); } -Rectf UIControl::GetRectf() { +Rectf UIControl::getRectf() { return Rectf( mScreenPosf, Sizef( (Float)mSize.width(), (Float)mSize.height() ) ); } -void UIControl::BackgroundDraw() { +void UIControl::backgroundDraw() { Primitives P; - Rectf R = GetRectf(); - P.blendMode( mBackground->Blend() ); - P.setColor( mBackground->Color() ); + Rectf R = getRectf(); + P.blendMode( mBackground->blend() ); + P.setColor( mBackground->color() ); - if ( 4 == mBackground->Colors().size() ) { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( R, mBackground->Colors()[0], mBackground->Colors()[1], mBackground->Colors()[2], mBackground->Colors()[3], mBackground->Corners() ); + if ( 4 == mBackground->colors().size() ) { + if ( mBackground->corners() ) { + P.drawRoundedRectangle( R, mBackground->colors()[0], mBackground->colors()[1], mBackground->colors()[2], mBackground->colors()[3], mBackground->corners() ); } else { - P.drawRectangle( R, mBackground->Colors()[0], mBackground->Colors()[1], mBackground->Colors()[2], mBackground->Colors()[3] ); + P.drawRectangle( R, mBackground->colors()[0], mBackground->colors()[1], mBackground->colors()[2], mBackground->colors()[3] ); } } else { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( R, 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( R, 0.f, Vector2f::One, mBackground->corners() ); } else { P.drawRectangle( R ); } } } -void UIControl::BorderDraw() { +void UIControl::borderDraw() { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.lineWidth( (Float)mBorder->Width() ); - P.setColor( mBorder->Color() ); + P.blendMode( blend() ); + P.lineWidth( (Float)mBorder->width() ); + P.setColor( mBorder->color() ); //! @TODO: Check why was this +0.1f -0.1f? if ( mFlags & UI_CLIP_ENABLE ) { Rectf R( Vector2f( mScreenPosf.x + 0.1f, mScreenPosf.y + 0.1f ), Sizef( (Float)mSize.width() - 0.1f, (Float)mSize.height() - 0.1f ) ); - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( GetRectf(), 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( getRectf(), 0.f, Vector2f::One, mBackground->corners() ); } else { P.drawRectangle( R ); } } else { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( GetRectf(), 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( getRectf(), 0.f, Vector2f::One, mBackground->corners() ); } else { - P.drawRectangle( GetRectf() ); + P.drawRectangle( getRectf() ); } } } -const Uint32& UIControl::ControlFlags() const { +const Uint32& UIControl::controlFlags() const { return mControlFlags; } -void UIControl::ControlFlags( const Uint32& Flags ) { +void UIControl::controlFlags( const Uint32& Flags ) { mControlFlags = Flags; } -void UIControl::DrawChilds() { +void UIControl::drawChilds() { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { if ( ChildLoop->mVisible ) { - ChildLoop->InternalDraw(); + ChildLoop->internalDraw(); } ChildLoop = ChildLoop->mNext; } } -void UIControl::InternalDraw() { +void UIControl::internalDraw() { if ( mVisible ) { - MatrixSet(); + matrixSet(); - ClipMe(); + clipMe(); - Draw(); + draw(); - DrawChilds(); + drawChilds(); - ClipDisable(); + clipDisable(); - MatrixUnset(); + matrixUnset(); } } -void UIControl::ClipMe() { +void UIControl::clipMe() { if ( mFlags & UI_CLIP_ENABLE ) { if ( mFlags & UI_BORDER ) - UIManager::instance()->ClipEnable( mScreenPos.x, mScreenPos.y, mSize.width(), mSize.height() + 1 ); + UIManager::instance()->clipEnable( mScreenPos.x, mScreenPos.y, mSize.width(), mSize.height() + 1 ); else - UIManager::instance()->ClipEnable( mScreenPos.x, mScreenPos.y, mSize.width(), mSize.height() ); + UIManager::instance()->clipEnable( mScreenPos.x, mScreenPos.y, mSize.width(), mSize.height() ); } } -void UIControl::ClipDisable() { +void UIControl::clipDisable() { if ( mFlags & UI_CLIP_ENABLE ) - UIManager::instance()->ClipDisable(); + UIManager::instance()->clipDisable(); } -void UIControl::MatrixSet() { +void UIControl::matrixSet() { } -void UIControl::MatrixUnset() { +void UIControl::matrixUnset() { } -void UIControl::ChildDeleteAll() { +void UIControl::childDeleteAll() { while( NULL != mChild ) { eeDelete( mChild ); } } -void UIControl::ChildAdd( UIControl * ChildCtrl ) { +void UIControl::childAdd( UIControl * ChildCtrl ) { if ( NULL == mChild ) { mChild = ChildCtrl; mChildLast = ChildCtrl; @@ -645,14 +645,14 @@ void UIControl::ChildAdd( UIControl * ChildCtrl ) { } } -void UIControl::ChildAddAt( UIControl * ChildCtrl, Uint32 Pos ) { +void UIControl::childAddAt( UIControl * ChildCtrl, Uint32 Pos ) { eeASSERT( NULL != ChildCtrl ); UIControl * ChildLoop = mChild; - ChildCtrl->Parent( this ); + ChildCtrl->parent( this ); - ChildRemove( ChildCtrl ); + childRemove( ChildCtrl ); ChildCtrl->mParentCtrl = this; if ( ChildLoop == NULL ) { @@ -691,7 +691,7 @@ void UIControl::ChildAddAt( UIControl * ChildCtrl, Uint32 Pos ) { } } -void UIControl::ChildRemove( UIControl * ChildCtrl ) { +void UIControl::childRemove( UIControl * ChildCtrl ) { if ( ChildCtrl == mChild ) { mChild = mChild->mNext; @@ -718,16 +718,16 @@ void UIControl::ChildRemove( UIControl * ChildCtrl ) { } } -void UIControl::ChildsCloseAll() { +void UIControl::childsCloseAll() { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { - ChildLoop->Close(); + ChildLoop->close(); ChildLoop = ChildLoop->mNext; } } -bool UIControl::IsChild( UIControl * ChildCtrl ) const { +bool UIControl::isChild( UIControl * ChildCtrl ) const { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { @@ -740,7 +740,7 @@ bool UIControl::IsChild( UIControl * ChildCtrl ) const { return false; } -bool UIControl::InParentTreeOf( UIControl * Child ) const { +bool UIControl::inParentTreeOf( UIControl * Child ) const { UIControl * ParentLoop = Child->mParentCtrl; while ( NULL != ParentLoop ) { @@ -753,7 +753,7 @@ bool UIControl::InParentTreeOf( UIControl * Child ) const { return false; } -Uint32 UIControl::ChildCount() const { +Uint32 UIControl::childCount() const { UIControl * ChildLoop = mChild; Uint32 Count = 0; @@ -765,7 +765,7 @@ Uint32 UIControl::ChildCount() const { return Count; } -UIControl * UIControl::ChildAt( Uint32 Index ) const { +UIControl * UIControl::childAt( Uint32 Index ) const { UIControl * ChildLoop = mChild; while( NULL != ChildLoop && Index ) { @@ -776,41 +776,41 @@ UIControl * UIControl::ChildAt( Uint32 Index ) const { return ChildLoop; } -UIControl * UIControl::ChildPrev( UIControl * Ctrl, bool Loop ) const { +UIControl * UIControl::childPrev( UIControl * Ctrl, bool Loop ) const { if ( Loop && Ctrl == mChild && NULL != mChild->mNext ) return mChildLast; return Ctrl->mPrev; } -UIControl * UIControl::ChildNext( UIControl * Ctrl, bool Loop ) const { +UIControl * UIControl::childNext( UIControl * Ctrl, bool Loop ) const { if ( NULL == Ctrl->mNext && Loop ) return mChild; return Ctrl->mNext; } -UIControl * UIControl::ChildGetFirst() const { +UIControl * UIControl::childGetFirst() const { return mChild; } -UIControl * UIControl::ChildGetLast() const { +UIControl * UIControl::childGetLast() const { return mChildLast; } -UIControl * UIControl::OverFind( const Vector2f& Point ) { +UIControl * UIControl::overFind( const Vector2f& Point ) { UIControl * pOver = NULL; if ( mEnabled && mVisible ) { - UpdateQuad(); + updateQuad(); if ( mPoly.pointInside( Point ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 1 ); + writeCtrlFlag( UI_CTRL_FLAG_MOUSEOVER_ME_OR_CHILD, 1 ); UIControl * ChildLoop = mChildLast; while ( NULL != ChildLoop ) { - UIControl * ChildOver = ChildLoop->OverFind( Point ); + UIControl * ChildOver = ChildLoop->overFind( Point ); if ( NULL != ChildOver ) { pOver = ChildOver; @@ -830,17 +830,17 @@ UIControl * UIControl::OverFind( const Vector2f& Point ) { return pOver; } -UIControl * UIControl::ChildGetAt( Vector2i CtrlPos, unsigned int RecursiveLevel ) { +UIControl * UIControl::childGetAt( Vector2i CtrlPos, unsigned int RecursiveLevel ) { UIControl * Ctrl = NULL; for( UIControl * pLoop = mChild; NULL != pLoop && NULL == Ctrl; pLoop = pLoop->mNext ) { - if ( !pLoop->Visible() ) + if ( !pLoop->visible() ) continue; - if ( pLoop->Rect().contains( CtrlPos ) ) { + if ( pLoop->getRect().contains( CtrlPos ) ) { if ( RecursiveLevel ) - Ctrl = ChildGetAt( CtrlPos - pLoop->Pos(), RecursiveLevel - 1 ); + Ctrl = childGetAt( CtrlPos - pLoop->position(), RecursiveLevel - 1 ); if ( NULL == Ctrl ) Ctrl = pLoop; @@ -850,56 +850,56 @@ UIControl * UIControl::ChildGetAt( Vector2i CtrlPos, unsigned int RecursiveLevel return Ctrl; } -Uint32 UIControl::IsAnimated() { +Uint32 UIControl::isAnimated() { return mControlFlags & UI_CTRL_FLAG_ANIM; } -Uint32 UIControl::IsDragable() { +Uint32 UIControl::isDragable() { return mControlFlags & UI_CTRL_FLAG_DRAGABLE; } -Uint32 UIControl::IsComplex() { +Uint32 UIControl::isComplex() { return mControlFlags & UI_CTRL_FLAG_COMPLEX; } -Uint32 UIControl::IsClipped() { +Uint32 UIControl::isClipped() { return mFlags & UI_CLIP_ENABLE; } -Polygon2f& UIControl::GetPolygon() { +Polygon2f& UIControl::getPolygon() { return mPoly; } -const Vector2f& UIControl::GetPolygonCenter() const { +const Vector2f& UIControl::getPolygonCenter() const { return mCenter; } -void UIControl::UpdateQuad() { +void UIControl::updateQuad() { mPoly = Polygon2f( eeAABB( mScreenPosf.x, mScreenPosf.y, mScreenPosf.x + mSize.width(), mScreenPosf.y + mSize.height() ) ); - UIControl * tParent = Parent(); + UIControl * tParent = parent(); while ( tParent ) { - if ( tParent->IsAnimated() ) { + if ( tParent->isAnimated() ) { UIControlAnim * tP = reinterpret_cast ( tParent ); - mPoly.rotate( tP->Angle(), tP->RotationCenter() ); - mPoly.scale( tP->Scale(), tP->ScaleCenter() ); + mPoly.rotate( tP->angle(), tP->rotationCenter() ); + mPoly.scale( tP->scale(), tP->scaleCenter() ); } - tParent = tParent->Parent(); + tParent = tParent->parent(); }; } -void UIControl::UpdateCenter() { +void UIControl::updateCenter() { mCenter = Vector2f( mScreenPosf.x + (Float)mSize.width() * 0.5f, mScreenPosf.y + (Float)mSize.height() * 0.5f ); } -Time UIControl::Elapsed() { - return UIManager::instance()->Elapsed(); +Time UIControl::elapsed() { + return UIManager::instance()->elapsed(); } -Uint32 UIControl::AddEventListener( const Uint32& EventType, const UIEventCallback& Callback ) { +Uint32 UIControl::addEventListener( const Uint32& EventType, const UIEventCallback& Callback ) { mNumCallBacks++; mEvents[ EventType ][ mNumCallBacks ] = Callback; @@ -907,7 +907,7 @@ Uint32 UIControl::AddEventListener( const Uint32& EventType, const UIEventCallba return mNumCallBacks; } -void UIControl::RemoveEventListener( const Uint32& CallbackId ) { +void UIControl::removeEventListener( const Uint32& CallbackId ) { UIEventsMap::iterator it; for ( it = mEvents.begin(); it != mEvents.end(); ++it ) { @@ -918,9 +918,9 @@ void UIControl::RemoveEventListener( const Uint32& CallbackId ) { } } -void UIControl::SendEvent( const UIEvent * Event ) { - if ( 0 != mEvents.count( Event->EventType() ) ) { - std::map event = mEvents[ Event->EventType() ]; +void UIControl::sendEvent( const UIEvent * Event ) { + if ( 0 != mEvents.count( Event->getEventType() ) ) { + std::map event = mEvents[ Event->getEventType() ]; std::map::iterator it; if ( event.begin() != event.end() ) { @@ -930,25 +930,25 @@ void UIControl::SendEvent( const UIEvent * Event ) { } } -UIBackground * UIControl::Background() { +UIBackground * UIControl::background() { return mBackground; } -UIBorder * UIControl::Border() { +UIBorder * UIControl::border() { return mBorder; } -void UIControl::SetThemeByName( const std::string& Theme ) { - SetTheme( UIThemeManager::instance()->getByName( Theme ) ); +void UIControl::setThemeByName( const std::string& Theme ) { + setTheme( UIThemeManager::instance()->getByName( Theme ) ); } -void UIControl::SetTheme( UITheme * Theme ) { - SetThemeControl( Theme, "control" ); +void UIControl::setTheme( UITheme * Theme ) { + setThemeControl( Theme, "control" ); } -void UIControl::SafeDeleteSkinState() { +void UIControl::safeDeleteSkinState() { if ( NULL != mSkinState && ( mControlFlags & UI_CTRL_FLAG_SKIN_OWNER ) ) { - UISkin * tSkin = mSkinState->GetSkin(); + UISkin * tSkin = mSkinState->getSkin(); eeSAFE_DELETE( tSkin ); } @@ -956,105 +956,105 @@ void UIControl::SafeDeleteSkinState() { eeSAFE_DELETE( mSkinState ); } -void UIControl::SetThemeControl( UITheme * Theme, const std::string& ControlName ) { +void UIControl::setThemeControl( UITheme * Theme, const std::string& ControlName ) { if ( NULL != Theme ) { - UISkin * tSkin = Theme->getByName( Theme->Abbr() + "_" + ControlName ); + UISkin * tSkin = Theme->getByName( Theme->abbr() + "_" + ControlName ); if ( NULL != tSkin ) { Uint32 InitialState = UISkinState::StateNormal; if ( NULL != mSkinState ) { - InitialState = mSkinState->GetState(); + InitialState = mSkinState->getState(); } - SafeDeleteSkinState(); + safeDeleteSkinState(); mSkinState = eeNew( UISkinState, ( tSkin ) ); - mSkinState->SetState( InitialState ); + mSkinState->setState( InitialState ); } } } -void UIControl::SetSkinFromTheme( UITheme * Theme, const std::string& ControlName ) { - SetThemeControl( Theme, ControlName ); +void UIControl::setSkinFromTheme( UITheme * Theme, const std::string& ControlName ) { + setThemeControl( Theme, ControlName ); } -void UIControl::SetSkin( const UISkin& Skin ) { - SafeDeleteSkinState(); +void UIControl::setSkin( const UISkin& Skin ) { + safeDeleteSkinState(); - WriteCtrlFlag( UI_CTRL_FLAG_SKIN_OWNER, 1 ); + writeCtrlFlag( UI_CTRL_FLAG_SKIN_OWNER, 1 ); - UISkin * SkinCopy = const_cast( &Skin )->Copy(); + UISkin * SkinCopy = const_cast( &Skin )->copy(); mSkinState = eeNew( UISkinState, ( SkinCopy ) ); - DoAfterSetTheme(); + doAftersetTheme(); } -void UIControl::OnStateChange() { +void UIControl::onStateChange() { } -void UIControl::SetSkinState( const Uint32& State ) { +void UIControl::setSkinState( const Uint32& State ) { if ( NULL != mSkinState ) { - mSkinState->SetState( State ); + mSkinState->setState( State ); - OnStateChange(); + onStateChange(); } } -void UIControl::SetPrevSkinState() { +void UIControl::setPrevSkinState() { if ( NULL != mSkinState ) { - mSkinState->SetPrevState(); + mSkinState->setPrevState(); - OnStateChange(); + onStateChange(); } } -void UIControl::SetThemeToChilds( UITheme * Theme ) { +void UIControl::setThemeToChilds( UITheme * Theme ) { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { - ChildLoop->SetThemeToChilds( Theme ); - ChildLoop->SetTheme( Theme ); // First set the theme to childs to let the father override the childs forced themes + ChildLoop->setThemeToChilds( Theme ); + ChildLoop->setTheme( Theme ); // First set the theme to childs to let the father override the childs forced themes ChildLoop = ChildLoop->mNext; } } -void UIControl::UpdateChildsScreenPos() { +void UIControl::updateChildsScreenPos() { UIControl * ChildLoop = mChild; while ( NULL != ChildLoop ) { - ChildLoop->UpdateScreenPos(); - ChildLoop->UpdateChildsScreenPos(); + ChildLoop->updateScreenPos(); + ChildLoop->updateChildsScreenPos(); ChildLoop = ChildLoop->mNext; } } -void UIControl::UpdateScreenPos() { +void UIControl::updateScreenPos() { Vector2i Pos( mPos ); - ControlToScreen( Pos ); + controlToScreen( Pos ); mScreenPos = Pos; mScreenPosf = Vector2f( Pos.x, Pos.y ); - UpdateCenter(); + updateCenter(); } -UISkin * UIControl::GetSkin() { +UISkin * UIControl::getSkin() { if ( NULL != mSkinState ) - return mSkinState->GetSkin(); + return mSkinState->getSkin(); return NULL; } -void UIControl::WriteCtrlFlag( const Uint32& Flag, const Uint32& Val ) { +void UIControl::writeCtrlFlag( const Uint32& Flag, const Uint32& Val ) { BitOp::setBitFlagValue( &mControlFlags, Flag, Val ); } -void UIControl::WriteFlag( const Uint32& Flag, const Uint32& Val ) { +void UIControl::writeFlag( const Uint32& Flag, const Uint32& Val ) { if ( Val ) mFlags |= Flag; else { @@ -1063,47 +1063,47 @@ void UIControl::WriteFlag( const Uint32& Flag, const Uint32& Val ) { } } -void UIControl::ApplyDefaultTheme() { - UIThemeManager::instance()->ApplyDefaultTheme( this ); +void UIControl::applyDefaultTheme() { + UIThemeManager::instance()->applyDefaultTheme( this ); } -Recti UIControl::GetScreenRect() { +Recti UIControl::getScreenRect() { return Recti( mScreenPos, mSize ); } -Recti UIControl::MakePadding( bool PadLeft, bool PadRight, bool PadTop, bool PadBottom, bool SkipFlags ) { +Recti UIControl::makePadding( bool PadLeft, bool PadRight, bool PadTop, bool PadBottom, bool SkipFlags ) { Recti tPadding( 0, 0, 0, 0 ); if ( mFlags & UI_AUTO_PADDING || SkipFlags ) { - if ( NULL != mSkinState && NULL != mSkinState->GetSkin() ) { - if ( mSkinState->GetSkin()->GetType() == UISkin::SkinComplex ) { - UISkinComplex * tComplex = reinterpret_cast ( mSkinState->GetSkin() ); + if ( NULL != mSkinState && NULL != mSkinState->getSkin() ) { + if ( mSkinState->getSkin()->getType() == UISkin::SkinComplex ) { + UISkinComplex * tComplex = reinterpret_cast ( mSkinState->getSkin() ); SubTexture * tSubTexture = NULL; if ( PadLeft ) { - tSubTexture = tComplex->GetSubTextureSide( UISkinState::StateNormal, UISkinComplex::Left ); + tSubTexture = tComplex->getSubTextureSide( UISkinState::StateNormal, UISkinComplex::Left ); if ( NULL != tSubTexture ) tPadding.Left = tSubTexture->realSize().width(); } if ( PadRight ) { - tSubTexture = tComplex->GetSubTextureSide( UISkinState::StateNormal, UISkinComplex::Right ); + tSubTexture = tComplex->getSubTextureSide( UISkinState::StateNormal, UISkinComplex::Right ); if ( NULL != tSubTexture ) tPadding.Right = tSubTexture->realSize().width(); } if ( PadTop ) { - tSubTexture = tComplex->GetSubTextureSide( UISkinState::StateNormal, UISkinComplex::Up ); + tSubTexture = tComplex->getSubTextureSide( UISkinState::StateNormal, UISkinComplex::Up ); if ( NULL != tSubTexture ) tPadding.Top = tSubTexture->realSize().height(); } if ( PadBottom ) { - tSubTexture = tComplex->GetSubTextureSide( UISkinState::StateNormal, UISkinComplex::Down ); + tSubTexture = tComplex->getSubTextureSide( UISkinState::StateNormal, UISkinComplex::Down ); if ( NULL != tSubTexture ) tPadding.Bottom = tSubTexture->realSize().height(); @@ -1115,57 +1115,57 @@ Recti UIControl::MakePadding( bool PadLeft, bool PadRight, bool PadTop, bool Pad return tPadding; } -void UIControl::SetFocus() { - UIManager::instance()->FocusControl( this ); +void UIControl::setFocus() { + UIManager::instance()->focusControl( this ); } -void UIControl::SendParentSizeChange( const Vector2i& SizeChange ) { +void UIControl::sendParentSizeChange( const Vector2i& SizeChange ) { if ( mFlags & UI_REPORT_SIZE_CHANGE_TO_CHILDS ) { UIControl * ChildLoop = mChild; while( NULL != ChildLoop ) { - ChildLoop->OnParentSizeChange( SizeChange ); + ChildLoop->onParentSizeChange( SizeChange ); ChildLoop = ChildLoop->mNext; } } } -void UIControl::OnParentSizeChange( const Vector2i& SizeChange ) { - SendCommonEvent( UIEvent::EventOnParentSizeChange ); +void UIControl::onParentSizeChange( const Vector2i& SizeChange ) { + sendCommonEvent( UIEvent::EventOnParentSizeChange ); } -Sizei UIControl::GetSkinSize( UISkin * Skin, const Uint32& State ) { +Sizei UIControl::getSkinSize( UISkin * Skin, const Uint32& State ) { Sizei tSize; if ( NULL != Skin ) { - SubTexture * tSubTexture = Skin->GetSubTexture( State ); + SubTexture * tSubTexture = Skin->getSubTexture( State ); if ( NULL != tSubTexture ) { tSize = tSubTexture->realSize(); } - if ( Skin->GetType() == UISkin::SkinComplex ) { + if ( Skin->getType() == UISkin::SkinComplex ) { UISkinComplex * SkinC = reinterpret_cast ( Skin ); - tSubTexture = SkinC->GetSubTextureSide( State, UISkinComplex::Up ); + tSubTexture = SkinC->getSubTextureSide( State, UISkinComplex::Up ); if ( NULL != tSubTexture ) { tSize.y += tSubTexture->realSize().height(); } - tSubTexture = SkinC->GetSubTextureSide( State, UISkinComplex::Down ); + tSubTexture = SkinC->getSubTextureSide( State, UISkinComplex::Down ); if ( NULL != tSubTexture ) { tSize.y += tSubTexture->realSize().height(); } - tSubTexture = SkinC->GetSubTextureSide( State, UISkinComplex::Left ); + tSubTexture = SkinC->getSubTextureSide( State, UISkinComplex::Left ); if ( NULL != tSubTexture ) { tSize.x += tSubTexture->realSize().width(); } - tSubTexture = SkinC->GetSubTextureSide( State, UISkinComplex::Right ); + tSubTexture = SkinC->getSubTextureSide( State, UISkinComplex::Right ); if ( NULL != tSubTexture ) { tSize.x += tSubTexture->realSize().width(); @@ -1176,20 +1176,20 @@ Sizei UIControl::GetSkinSize( UISkin * Skin, const Uint32& State ) { return tSize; } -Sizei UIControl::GetSkinSize() { - return GetSkinSize( GetSkin(), UISkinState::StateNormal ); +Sizei UIControl::getSkinSize() { + return getSkinSize( getSkin(), UISkinState::StateNormal ); } -UIControl * UIControl::NextComplexControl() { +UIControl * UIControl::nextComplexControl() { UIControl * Found = NULL; UIControl * ChildLoop = mChild; while( NULL != ChildLoop ) { - if ( ChildLoop->Visible() && ChildLoop->Enabled() ) { - if ( ChildLoop->IsComplex() ) { + if ( ChildLoop->visible() && ChildLoop->enabled() ) { + if ( ChildLoop->isComplex() ) { return ChildLoop; } else { - Found = ChildLoop->NextComplexControl(); + Found = ChildLoop->nextComplexControl(); if ( NULL != Found ) { return Found; @@ -1201,20 +1201,20 @@ UIControl * UIControl::NextComplexControl() { } if ( NULL != mNext ) { - if ( mNext->Visible() && mNext->Enabled() && mNext->IsComplex() ) { + if ( mNext->visible() && mNext->enabled() && mNext->isComplex() ) { return mNext; } else { - return mNext->NextComplexControl(); + return mNext->nextComplexControl(); } } else { ChildLoop = mParentCtrl; while ( NULL != ChildLoop ) { if ( NULL != ChildLoop->mNext ) { - if ( ChildLoop->mNext->Visible() && ChildLoop->mNext->Enabled() && ChildLoop->mNext->IsComplex() ) { + if ( ChildLoop->mNext->visible() && ChildLoop->mNext->enabled() && ChildLoop->mNext->isComplex() ) { return ChildLoop->mNext; } else { - return ChildLoop->mNext->NextComplexControl(); + return ChildLoop->mNext->nextComplexControl(); } } @@ -1222,13 +1222,13 @@ UIControl * UIControl::NextComplexControl() { } } - return UIManager::instance()->MainControl(); + return UIManager::instance()->mainControl(); } -void UIControl::DoAfterSetTheme() { +void UIControl::doAftersetTheme() { } -void UIControl::WorldToControl( Vector2i& pos ) const { +void UIControl::worldToControl( Vector2i& pos ) const { Vector2f Pos( pos.x, pos.y ); std::list parents; @@ -1237,7 +1237,7 @@ void UIControl::WorldToControl( Vector2i& pos ) const { while ( NULL != ParentLoop ) { parents.push_front( ParentLoop ); - ParentLoop = ParentLoop->Parent(); + ParentLoop = ParentLoop->parent(); } parents.push_back( const_cast( reinterpret_cast( this ) ) ); @@ -1246,29 +1246,29 @@ void UIControl::WorldToControl( Vector2i& pos ) const { for ( std::list::iterator it = parents.begin(); it != parents.end(); it++ ) { UIControl * tParent = (*it); - UIControlAnim * tP = tParent->IsAnimated() ? reinterpret_cast ( tParent ) : NULL; + UIControlAnim * tP = tParent->isAnimated() ? reinterpret_cast ( tParent ) : NULL; Vector2f pPos ( tParent->mPos.x * scale.x , tParent->mPos.y * scale.y ); Vector2f Center; - if ( NULL != tP && 1.f != tP->Scale() ) { - Center = tP->ScaleOriginPoint() * scale; - scale *= tP->Scale(); + if ( NULL != tP && 1.f != tP->scale() ) { + Center = tP->scaleOriginPoint() * scale; + scale *= tP->scale(); pPos.scale( scale, pPos + Center ); } Pos -= pPos; - if ( NULL != tP && 0.f != tP->Angle() ) { - Center = tP->RotationOriginPoint() * scale; - Pos.rotate( -tP->Angle(), Center ); + if ( NULL != tP && 0.f != tP->angle() ) { + Center = tP->rotationOriginPoint() * scale; + Pos.rotate( -tP->angle(), Center ); } } pos = Vector2i( Pos.x / scale.x, Pos.y / scale.y ); } -void UIControl::ControlToWorld( Vector2i& pos ) const { +void UIControl::controlToWorld( Vector2i& pos ) const { Vector2f Pos( pos.x, pos.y ); std::list parents; @@ -1277,14 +1277,14 @@ void UIControl::ControlToWorld( Vector2i& pos ) const { while ( NULL != ParentLoop ) { parents.push_back( ParentLoop ); - ParentLoop = ParentLoop->Parent(); + ParentLoop = ParentLoop->parent(); } parents.push_front( const_cast( reinterpret_cast( this ) ) ); for ( std::list::iterator it = parents.begin(); it != parents.end(); it++ ) { UIControl * tParent = (*it); - UIControlAnim * tP = tParent->IsAnimated() ? reinterpret_cast ( tParent ) : NULL; + UIControlAnim * tP = tParent->isAnimated() ? reinterpret_cast ( tParent ) : NULL; Vector2f pPos ( tParent->mPos.x , tParent->mPos.y ); Pos += pPos; @@ -1293,8 +1293,8 @@ void UIControl::ControlToWorld( Vector2i& pos ) const { Vector2f CenterAngle( pPos.x + tP->mRotationOriginPoint.x, pPos.y + tP->mRotationOriginPoint.y ); Vector2f CenterScale( pPos.x + tP->mScaleOriginPoint.x, pPos.y + tP->mScaleOriginPoint.y ); - Pos.rotate( tP->Angle(), CenterAngle ); - Pos.scale( tP->Scale(), CenterScale ); + Pos.rotate( tP->angle(), CenterAngle ); + Pos.scale( tP->scale(), CenterScale ); } } diff --git a/src/eepp/ui/uicontrolanim.cpp b/src/eepp/ui/uicontrolanim.cpp index cdd9b3f60..a94b78412 100644 --- a/src/eepp/ui/uicontrolanim.cpp +++ b/src/eepp/ui/uicontrolanim.cpp @@ -18,7 +18,7 @@ UIControlAnim::UIControlAnim( const CreateParams& Params ) : { mControlFlags |= UI_CTRL_FLAG_ANIM; - UpdateOriginPoint(); + updateOriginPoint(); } UIControlAnim::~UIControlAnim() { @@ -28,57 +28,57 @@ UIControlAnim::~UIControlAnim() { eeSAFE_DELETE( mMoveAnim ); } -Uint32 UIControlAnim::Type() const { +Uint32 UIControlAnim::getType() const { return UI_TYPE_CONTROL_ANIM; } -bool UIControlAnim::IsType( const Uint32& type ) const { - return UIControlAnim::Type() == type ? true : UIControl::IsType( type ); +bool UIControlAnim::isType( const Uint32& type ) const { + return UIControlAnim::getType() == type ? true : UIControl::isType( type ); } -void UIControlAnim::Draw() { +void UIControlAnim::draw() { if ( mVisible && 0.f != mAlpha ) { if ( mFlags & UI_FILL_BACKGROUND ) - BackgroundDraw(); + backgroundDraw(); if ( mFlags & UI_BORDER ) - BorderDraw(); + borderDraw(); if ( NULL != mSkinState ) - mSkinState->Draw( mScreenPosf.x, mScreenPosf.y, (Float)mSize.width(), (Float)mSize.height(), (Uint32)mAlpha ); + mSkinState->draw( mScreenPosf.x, mScreenPosf.y, (Float)mSize.width(), (Float)mSize.height(), (Uint32)mAlpha ); - if ( UIManager::instance()->HighlightFocus() && UIManager::instance()->FocusControl() == this ) { + if ( UIManager::instance()->highlightFocus() && UIManager::instance()->focusControl() == this ) { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.setColor( UIManager::instance()->HighlightFocusColor() ); - P.drawRectangle( GetRectf() ); + P.blendMode( blend() ); + P.setColor( UIManager::instance()->highlightFocusColor() ); + P.drawRectangle( getRectf() ); } - if ( UIManager::instance()->HighlightOver() && UIManager::instance()->OverControl() == this ) { + if ( UIManager::instance()->highlightOver() && UIManager::instance()->overControl() == this ) { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.setColor( UIManager::instance()->HighlightOverColor() ); - P.drawRectangle( GetRectf() ); + P.blendMode( blend() ); + P.setColor( UIManager::instance()->highlightOverColor() ); + P.drawRectangle( getRectf() ); } } } -const Float& UIControlAnim::Angle() const { +const Float& UIControlAnim::angle() const { return mAngle; } -const OriginPoint& UIControlAnim::RotationOriginPoint() const { +const OriginPoint& UIControlAnim::rotationOriginPoint() const { return mRotationOriginPoint; } -void UIControlAnim::RotationOriginPoint( const OriginPoint & center ) { +void UIControlAnim::rotationOriginPoint( const OriginPoint & center ) { mRotationOriginPoint = center; - UpdateOriginPoint(); + updateOriginPoint(); } -Vector2f UIControlAnim::RotationCenter() { +Vector2f UIControlAnim::rotationCenter() { switch ( mRotationOriginPoint.OriginType ) { case OriginPoint::OriginCenter: return mCenter; case OriginPoint::OriginTopLeft: return mScreenPosf; @@ -86,36 +86,36 @@ Vector2f UIControlAnim::RotationCenter() { } } -void UIControlAnim::Angle( const Float& angle ) { +void UIControlAnim::angle( const Float& angle ) { mAngle = angle; - OnAngleChange(); + onAngleChange(); } -void UIControlAnim::Angle( const Float& angle , const OriginPoint & center ) { +void UIControlAnim::angle( const Float& angle , const OriginPoint & center ) { mRotationOriginPoint = center; - UpdateOriginPoint(); - Angle( angle ); + updateOriginPoint(); + this->angle( angle ); } -const Vector2f& UIControlAnim::Scale() const { +const Vector2f& UIControlAnim::scale() const { return mScale; } -void UIControlAnim::Scale( const Vector2f & scale ) { +void UIControlAnim::scale( const Vector2f & scale ) { mScale = scale; - OnScaleChange(); + onScaleChange(); } -const OriginPoint& UIControlAnim::ScaleOriginPoint() const { +const OriginPoint& UIControlAnim::scaleOriginPoint() const { return mScaleOriginPoint; } -void UIControlAnim::ScaleOriginPoint( const OriginPoint & center ) { +void UIControlAnim::scaleOriginPoint( const OriginPoint & center ) { mScaleOriginPoint = center; - UpdateOriginPoint(); + updateOriginPoint(); } -Vector2f UIControlAnim::ScaleCenter() { +Vector2f UIControlAnim::scaleCenter() { switch ( mScaleOriginPoint.OriginType ) { case OriginPoint::OriginCenter: return mCenter; case OriginPoint::OriginTopLeft: return mScreenPosf; @@ -123,60 +123,60 @@ Vector2f UIControlAnim::ScaleCenter() { } } -void UIControlAnim::Scale( const Vector2f& scale, const OriginPoint& center ) { +void UIControlAnim::scale( const Vector2f& scale, const OriginPoint& center ) { mScaleOriginPoint = center; - UpdateOriginPoint(); - Scale( scale ); + updateOriginPoint(); + this->scale( scale ); } -void UIControlAnim::Scale( const Float& scale, const OriginPoint& center ) { - Scale( Vector2f( scale, scale ), center ); +void UIControlAnim::scale( const Float& scale, const OriginPoint& center ) { + this->scale( Vector2f( scale, scale ), center ); } -const Float& UIControlAnim::Alpha() const { +const Float& UIControlAnim::alpha() const { return mAlpha; } -void UIControlAnim::Alpha( const Float& alpha ) { +void UIControlAnim::alpha( const Float& alpha ) { mAlpha = alpha; - OnAlphaChange(); + onAlphaChange(); } -void UIControlAnim::AlphaChilds( const Float &alpha ) { +void UIControlAnim::alphaChilds( const Float &alpha ) { UIControlAnim * AnimChild; UIControl * CurChild = mChild; while ( NULL != CurChild ) { - if ( CurChild->IsAnimated() ) { + if ( CurChild->isAnimated() ) { AnimChild = reinterpret_cast ( CurChild ); - AnimChild->Alpha( alpha ); - AnimChild->AlphaChilds( alpha ); + AnimChild->alpha( alpha ); + AnimChild->alphaChilds( alpha ); } - CurChild = CurChild->NextGet(); + CurChild = CurChild->nextGet(); } } -void UIControlAnim::MatrixSet() { +void UIControlAnim::matrixSet() { if ( mScale != 1.f || mAngle != 0.f ) { GlobalBatchRenderer::instance()->draw(); GLi->pushMatrix(); - Vector2f scaleCenter = ScaleCenter(); + Vector2f scaleCenter = this->scaleCenter(); GLi->translatef( scaleCenter.x , scaleCenter.y, 0.f ); GLi->scalef( mScale.x, mScale.y, 1.0f ); GLi->translatef( -scaleCenter.x, -scaleCenter.y, 0.f ); - Vector2f rotationCenter = RotationCenter(); + Vector2f rotationCenter = this->rotationCenter(); GLi->translatef( rotationCenter.x , rotationCenter.y, 0.f ); GLi->rotatef( mAngle, 0.0f, 0.0f, 1.0f ); GLi->translatef( -rotationCenter.x, -rotationCenter.y, 0.f ); } } -void UIControlAnim::MatrixUnset() { +void UIControlAnim::matrixUnset() { if ( mScale != 1.f || mAngle != 0.f ) { GlobalBatchRenderer::instance()->draw(); @@ -184,29 +184,29 @@ void UIControlAnim::MatrixUnset() { } } -void UIControlAnim::Update() { - UIDragable::Update(); +void UIControlAnim::update() { + UIDragable::update(); if ( NULL != mMoveAnim && mMoveAnim->enabled() ) { - mMoveAnim->update( Elapsed() ); - Pos( (int)mMoveAnim->getPos().x, (int)mMoveAnim->getPos().y ); + mMoveAnim->update( elapsed() ); + position( (int)mMoveAnim->getPos().x, (int)mMoveAnim->getPos().y ); if ( mMoveAnim->ended() ) eeSAFE_DELETE( mMoveAnim ); } if ( NULL != mAlphaAnim && mAlphaAnim->enabled() ) { - mAlphaAnim->update( Elapsed() ); - Alpha( mAlphaAnim->getRealPos() ); + mAlphaAnim->update( elapsed() ); + alpha( mAlphaAnim->getRealPos() ); if ( mAlphaAnim->ended() ) { if ( ( mControlFlags & UI_CTRL_FLAG_CLOSE_FO ) ) - Close(); + close(); if ( ( mControlFlags & UI_CTRL_FLAG_DISABLE_FADE_OUT ) ) { mControlFlags &= ~UI_CTRL_FLAG_DISABLE_FADE_OUT; - Visible( false ); + visible( false ); } eeSAFE_DELETE( mAlphaAnim ); @@ -214,31 +214,31 @@ void UIControlAnim::Update() { } if ( NULL != mScaleAnim && mScaleAnim->enabled() ) { - mScaleAnim->update( Elapsed() ); - Scale( mScaleAnim->getPos() ); + mScaleAnim->update( elapsed() ); + scale( mScaleAnim->getPos() ); if ( mScaleAnim->ended() ) eeSAFE_DELETE( mScaleAnim ); } if ( NULL != mAngleAnim && mAngleAnim->enabled() ) { - mAngleAnim->update( Elapsed() ); - Angle( mAngleAnim->getRealPos() ); + mAngleAnim->update( elapsed() ); + angle( mAngleAnim->getRealPos() ); if ( mAngleAnim->ended() ) eeSAFE_DELETE( mAngleAnim ); } } -bool UIControlAnim::FadingOut() { +bool UIControlAnim::isFadingOut() { return 0 != ( mControlFlags & UI_CTRL_FLAG_DISABLE_FADE_OUT ); } -bool UIControlAnim::Animating() { +bool UIControlAnim::isAnimating() { return ( NULL != mAlphaAnim && mAlphaAnim->enabled() ) || ( NULL != mAngleAnim && mAngleAnim->enabled() ) || ( NULL != mScaleAnim && mScaleAnim->enabled() ) || ( NULL != mMoveAnim && mMoveAnim->enabled() ); } -Interpolation * UIControlAnim::StartAlphaAnim( const Float& From, const Float& To, const Time& TotalTime, const bool& AlphaChilds, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { +Interpolation * UIControlAnim::startAlphaAnim( const Float& From, const Float& To, const Time& TotalTime, const bool& AlphaChilds, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { if ( NULL == mAlphaAnim ) mAlphaAnim = eeNew( Interpolation, () ); @@ -249,27 +249,27 @@ Interpolation * UIControlAnim::StartAlphaAnim( const Float& From, const Float& T mAlphaAnim->start( PathEndCallback ); mAlphaAnim->type( Type ); - Alpha( From ); + alpha( From ); if ( AlphaChilds ) { UIControlAnim * AnimChild; UIControl * CurChild = mChild; while ( NULL != CurChild ) { - if ( CurChild->IsAnimated() ) { + if ( CurChild->isAnimated() ) { AnimChild = reinterpret_cast ( CurChild ); - AnimChild->StartAlphaAnim( From, To, TotalTime, AlphaChilds ); + AnimChild->startAlphaAnim( From, To, TotalTime, AlphaChilds ); } - CurChild = CurChild->NextGet(); + CurChild = CurChild->nextGet(); } } return mAlphaAnim; } -Waypoints * UIControlAnim::StartScaleAnim( const Vector2f& From, const Vector2f& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { +Waypoints * UIControlAnim::startScaleAnim( const Vector2f& From, const Vector2f& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { if ( NULL == mScaleAnim ) mScaleAnim = eeNew( Waypoints, () ); @@ -280,16 +280,16 @@ Waypoints * UIControlAnim::StartScaleAnim( const Vector2f& From, const Vector2f& mScaleAnim->start( PathEndCallback ); mScaleAnim->type( Type ); - Scale( From ); + scale( From ); return mScaleAnim; } -Waypoints * UIControlAnim::StartScaleAnim( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { - return StartScaleAnim( Vector2f( From, From ), Vector2f( To, To ), TotalTime, Type, PathEndCallback ); +Waypoints * UIControlAnim::startScaleAnim( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { + return startScaleAnim( Vector2f( From, From ), Vector2f( To, To ), TotalTime, Type, PathEndCallback ); } -Waypoints * UIControlAnim::StartMovement( const Vector2i& From, const Vector2i& To, const Time& TotalTime, const Ease::Interpolation& Type, Waypoints::OnPathEndCallback PathEndCallback ) { +Waypoints * UIControlAnim::startMovement( const Vector2i& From, const Vector2i& To, const Time& TotalTime, const Ease::Interpolation& Type, Waypoints::OnPathEndCallback PathEndCallback ) { if ( NULL == mMoveAnim ) mMoveAnim = eeNew( Waypoints, () ); @@ -300,12 +300,12 @@ Waypoints * UIControlAnim::StartMovement( const Vector2i& From, const Vector2i& mMoveAnim->start( PathEndCallback ); mMoveAnim->type( Type ); - Pos( From ); + position( From ); return mMoveAnim; } -Interpolation * UIControlAnim::StartRotation( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { +Interpolation * UIControlAnim::startRotation( const Float& From, const Float& To, const Time& TotalTime, const Ease::Interpolation& Type, Interpolation::OnPathEndCallback PathEndCallback ) { if ( NULL == mAngleAnim ) mAngleAnim = eeNew( Interpolation, () ); @@ -316,110 +316,110 @@ Interpolation * UIControlAnim::StartRotation( const Float& From, const Float& To mAngleAnim->start( PathEndCallback ); mAngleAnim->type( Type ); - Angle( From ); + angle( From ); return mAngleAnim; } -Interpolation * UIControlAnim::CreateFadeIn( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { - return StartAlphaAnim( mAlpha, 255.f, Time, AlphaChilds, Type ); +Interpolation * UIControlAnim::createFadeIn( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { + return startAlphaAnim( mAlpha, 255.f, Time, AlphaChilds, Type ); } -Interpolation * UIControlAnim::CreateFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { - return StartAlphaAnim( 255.f, mAlpha, Time, AlphaChilds, Type ); +Interpolation * UIControlAnim::createFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { + return startAlphaAnim( 255.f, mAlpha, Time, AlphaChilds, Type ); } -Interpolation * UIControlAnim::CloseFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { - StartAlphaAnim ( mAlpha, 0.f, Time, AlphaChilds, Type ); +Interpolation * UIControlAnim::closeFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { + startAlphaAnim ( mAlpha, 0.f, Time, AlphaChilds, Type ); mControlFlags |= UI_CTRL_FLAG_CLOSE_FO; return mAlphaAnim; } -Interpolation * UIControlAnim::DisableFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { - Enabled( false ); +Interpolation * UIControlAnim::disableFadeOut( const Time& Time, const bool& AlphaChilds, const Ease::Interpolation& Type ) { + enabled( false ); - StartAlphaAnim ( mAlpha, 0.f, Time, AlphaChilds, Type ); + startAlphaAnim ( mAlpha, 0.f, Time, AlphaChilds, Type ); mControlFlags |= UI_CTRL_FLAG_DISABLE_FADE_OUT; return mAlphaAnim; } -void UIControlAnim::BackgroundDraw() { +void UIControlAnim::backgroundDraw() { Primitives P; - Rectf R = GetRectf(); - P.blendMode( mBackground->Blend() ); - P.setColor( GetColor( mBackground->Color() ) ); + Rectf R = getRectf(); + P.blendMode( mBackground->blend() ); + P.setColor( getColor( mBackground->color() ) ); - if ( 4 == mBackground->Colors().size() ) { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( R, GetColor( mBackground->Colors()[0] ), GetColor( mBackground->Colors()[1] ), GetColor( mBackground->Colors()[2] ), GetColor( mBackground->Colors()[3] ), mBackground->Corners() ); + if ( 4 == mBackground->colors().size() ) { + if ( mBackground->corners() ) { + P.drawRoundedRectangle( R, getColor( mBackground->colors()[0] ), getColor( mBackground->colors()[1] ), getColor( mBackground->colors()[2] ), getColor( mBackground->colors()[3] ), mBackground->corners() ); } else { - P.drawRectangle( R, GetColor( mBackground->Colors()[0] ), GetColor( mBackground->Colors()[1] ), GetColor( mBackground->Colors()[2] ), GetColor( mBackground->Colors()[3] ) ); + P.drawRectangle( R, getColor( mBackground->colors()[0] ), getColor( mBackground->colors()[1] ), getColor( mBackground->colors()[2] ), getColor( mBackground->colors()[3] ) ); } } else { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( R, 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( R, 0.f, Vector2f::One, mBackground->corners() ); } else { P.drawRectangle( R ); } } } -void UIControlAnim::BorderDraw() { +void UIControlAnim::borderDraw() { Primitives P; P.fillMode( DRAW_LINE ); - P.blendMode( Blend() ); - P.lineWidth( (Float)mBorder->Width() ); - P.setColor( GetColor( mBorder->Color() ) ); + P.blendMode( blend() ); + P.lineWidth( (Float)mBorder->width() ); + P.setColor( getColor( mBorder->color() ) ); //! @TODO: Check why was this +0.1f -0.1f? if ( mFlags & UI_CLIP_ENABLE ) { Rectf R( Vector2f( mScreenPosf.x + 0.1f, mScreenPosf.y + 0.1f ), Sizef( (Float)mSize.width() - 0.1f, (Float)mSize.height() - 0.1f ) ); - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( GetRectf(), 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( getRectf(), 0.f, Vector2f::One, mBackground->corners() ); } else { P.drawRectangle( R ); } } else { - if ( mBackground->Corners() ) { - P.drawRoundedRectangle( GetRectf(), 0.f, Vector2f::One, mBackground->Corners() ); + if ( mBackground->corners() ) { + P.drawRoundedRectangle( getRectf(), 0.f, Vector2f::One, mBackground->corners() ); } else { - P.drawRectangle( GetRectf() ); + P.drawRectangle( getRectf() ); } } } -ColorA UIControlAnim::GetColor( const ColorA& Col ) { +ColorA UIControlAnim::getColor( const ColorA& Col ) { return ColorA( Col.r(), Col.g(), Col.b(), static_cast( (Float)Col.a() * ( mAlpha / 255.f ) ) ); } -void UIControlAnim::UpdateQuad() { +void UIControlAnim::updateQuad() { mPoly = Polygon2f( eeAABB( mScreenPosf.x, mScreenPosf.y, mScreenPosf.x + mSize.width(), mScreenPosf.y + mSize.height() ) ); - mPoly.rotate( mAngle, RotationCenter() ); - mPoly.scale( mScale, ScaleCenter() ); + mPoly.rotate( mAngle, rotationCenter() ); + mPoly.scale( mScale, scaleCenter() ); - UIControl * tParent = Parent(); + UIControl * tParent = parent(); while ( tParent ) { - if ( tParent->IsAnimated() ) { + if ( tParent->isAnimated() ) { UIControlAnim * tP = reinterpret_cast ( tParent ); - mPoly.rotate( tP->Angle(), tP->RotationCenter() ); - mPoly.scale( tP->Scale(), tP->ScaleCenter() ); + mPoly.rotate( tP->angle(), tP->rotationCenter() ); + mPoly.scale( tP->scale(), tP->scaleCenter() ); } - tParent = tParent->Parent(); + tParent = tParent->parent(); }; } -void UIControlAnim::OnSizeChange() { - UpdateOriginPoint(); +void UIControlAnim::onSizeChange() { + updateOriginPoint(); } -void UIControlAnim::UpdateOriginPoint() { +void UIControlAnim::updateOriginPoint() { switch ( mRotationOriginPoint.OriginType ) { case OriginPoint::OriginCenter: mRotationOriginPoint.x = mSize.x * 0.5f; @@ -443,44 +443,44 @@ void UIControlAnim::UpdateOriginPoint() { } } -Interpolation * UIControlAnim::RotationInterpolation() { +Interpolation * UIControlAnim::rotationInterpolation() { if ( NULL == mAngleAnim ) mAngleAnim = eeNew( Interpolation, () ); return mAngleAnim; } -Waypoints * UIControlAnim::ScaleInterpolation() { +Waypoints * UIControlAnim::scaleInterpolation() { if ( NULL == mScaleAnim ) mScaleAnim = eeNew( Waypoints, () ); return mScaleAnim; } -Interpolation * UIControlAnim::AlphaInterpolation() { +Interpolation * UIControlAnim::alphaInterpolation() { if ( NULL == mAlphaAnim ) mAlphaAnim = eeNew( Interpolation, () ); return mAlphaAnim; } -Waypoints * UIControlAnim::MovementInterpolation() { +Waypoints * UIControlAnim::movementInterpolation() { if ( NULL == mMoveAnim ) mMoveAnim = eeNew( Waypoints, () ); return mMoveAnim; } -void UIControlAnim::OnAngleChange() { - SendCommonEvent( UIEvent::EventOnAngleChange ); +void UIControlAnim::onAngleChange() { + sendCommonEvent( UIEvent::EventOnAngleChange ); } -void UIControlAnim::OnScaleChange() { - SendCommonEvent( UIEvent::EventOnScaleChange ); +void UIControlAnim::onScaleChange() { + sendCommonEvent( UIEvent::EventOnScaleChange ); } -void UIControlAnim::OnAlphaChange() { - SendCommonEvent( UIEvent::EventOnAlphaChange ); +void UIControlAnim::onAlphaChange() { + sendCommonEvent( UIEvent::EventOnAlphaChange ); } }} diff --git a/src/eepp/ui/uidefaulttheme.cpp b/src/eepp/ui/uidefaulttheme.cpp index 7cf2c963d..683a81456 100644 --- a/src/eepp/ui/uidefaulttheme.cpp +++ b/src/eepp/ui/uidefaulttheme.cpp @@ -9,16 +9,16 @@ namespace EE { namespace UI { -UIDefaultTheme::UIDefaultTheme( const std::string& Name, const std::string& Abbr, Graphics::Font * DefaultFont ) : - UITheme( Name, Abbr, DefaultFont ) +UIdefaultTheme::UIdefaultTheme( const std::string& Name, const std::string& Abbr, Graphics::Font * defaultFont ) : + UITheme( Name, Abbr, defaultFont ) { - FontColor( ColorA( 230, 230, 230, 255 ) ); - FontOverColor( ColorA( 255, 255, 255, 255 ) ); - FontSelectedColor( ColorA( 255, 255, 255, 255 ) ); - FontShadowColor( ColorA( 50, 50, 50, 150 ) ); + fontColor( ColorA( 230, 230, 230, 255 ) ); + fontOverColor( ColorA( 255, 255, 255, 255 ) ); + fontSelectedColor( ColorA( 255, 255, 255, 255 ) ); + fontShadowColor( ColorA( 50, 50, 50, 150 ) ); } -UIPopUpMenu * UIDefaultTheme::CreatePopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { +UIPopUpMenu * UIdefaultTheme::createPopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIPopUpMenu::CreateParams MenuParams; MenuParams.Parent( Parent ); MenuParams.PosSet( Pos ); @@ -30,7 +30,7 @@ UIPopUpMenu * UIDefaultTheme::CreatePopUpMenu( UIControl * Parent, const Sizei& MenuParams.MinSpaceForIcons = MinSpaceForIcons; MenuParams.MinRightMargin = MinRightMargin; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { MenuParams.MinWidth = 100; MenuParams.MinSpaceForIcons = 24; MenuParams.MinRightMargin = 8; @@ -40,7 +40,7 @@ UIPopUpMenu * UIDefaultTheme::CreatePopUpMenu( UIControl * Parent, const Sizei& return eeNew( UIPopUpMenu, ( MenuParams ) ); } -UIProgressBar * UIDefaultTheme::CreateProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { +UIProgressBar * UIdefaultTheme::createProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { UIProgressBar::CreateParams PBParams; PBParams.Parent( Parent ); PBParams.PosSet( Pos ); @@ -51,7 +51,7 @@ UIProgressBar * UIDefaultTheme::CreateProgressBar( UIControl * Parent, const Siz PBParams.MovementSpeed = MovementSpeed; PBParams.FillerMargin = FillerMargin; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { PBParams.Flags |= UI_AUTO_SIZE; PBParams.DisplayPercent = true; PBParams.VerticalExpand = true; @@ -60,12 +60,12 @@ UIProgressBar * UIDefaultTheme::CreateProgressBar( UIControl * Parent, const Siz } UIProgressBar * Ctrl = eeNew( UIProgressBar, ( PBParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIWinMenu * UIDefaultTheme::CreateWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { +UIWinMenu * UIdefaultTheme::createWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { UIWinMenu::CreateParams WinMenuParams; WinMenuParams.Parent( Parent ); WinMenuParams.PosSet( Pos ); @@ -76,17 +76,17 @@ UIWinMenu * UIDefaultTheme::CreateWinMenu( UIControl * Parent, const Sizei& Size WinMenuParams.MenuHeight = MenuHeight; WinMenuParams.FirstButtonMargin = FirstButtonMargin; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { WinMenuParams.ButtonMargin = 12; } UIWinMenu * Ctrl = eeNew( UIWinMenu, ( WinMenuParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIWindow * UIDefaultTheme::CreateWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { +UIWindow * UIdefaultTheme::createWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIWindow::CreateParams WinParams; WinParams.Parent( Parent ); WinParams.PosSet( Pos ); @@ -96,7 +96,7 @@ UIWindow * UIDefaultTheme::CreateWindow( UIControl * Parent, const Sizei& Size, WinParams.MinWindowSize = MinWindowSize; WinParams.BaseAlpha = BaseAlpha; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { WinParams.Flags |= UI_DRAW_SHADOW; WinParams.WinFlags |= UI_WIN_DRAW_SHADOW; WinParams.ButtonsPositionFixer.x = -2; @@ -106,7 +106,7 @@ UIWindow * UIDefaultTheme::CreateWindow( UIControl * Parent, const Sizei& Size, return eeNew( UIWindow, ( WinParams ) ); } -UICommonDialog * UIDefaultTheme::CreateCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { +UICommonDialog * UIdefaultTheme::createCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { UICommonDialog::CreateParams DLGParams; DLGParams.Parent( Parent ); DLGParams.PosSet( Pos ); @@ -119,7 +119,7 @@ UICommonDialog * UIDefaultTheme::CreateCommonDialog( UIControl * Parent, const S DLGParams.DefaultFilePattern = DefaultFilePattern; DLGParams.CDLFlags = CDLFlags; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { DLGParams.Flags |= UI_DRAW_SHADOW; DLGParams.WinFlags |= UI_WIN_DRAW_SHADOW; DLGParams.ButtonsPositionFixer.x = -2; @@ -129,7 +129,7 @@ UICommonDialog * UIDefaultTheme::CreateCommonDialog( UIControl * Parent, const S return eeNew( UICommonDialog, ( DLGParams ) ); } -UIMessageBox * UIDefaultTheme::CreateMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { +UIMessageBox * UIdefaultTheme::createMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIMessageBox::CreateParams MsgBoxParams; MsgBoxParams.Parent( Parent ); MsgBoxParams.PosSet( Pos ); @@ -141,7 +141,7 @@ UIMessageBox * UIDefaultTheme::CreateMessageBox( UI_MSGBOX_TYPE Type, const Stri MsgBoxParams.Type = Type; MsgBoxParams.Message = Message; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { MsgBoxParams.Flags |= UI_DRAW_SHADOW; MsgBoxParams.WinFlags |= UI_WIN_DRAW_SHADOW; MsgBoxParams.ButtonsPositionFixer.x = -2; @@ -151,7 +151,7 @@ UIMessageBox * UIDefaultTheme::CreateMessageBox( UI_MSGBOX_TYPE Type, const Stri return eeNew( UIMessageBox, ( MsgBoxParams ) ); } -UIComboBox * UIDefaultTheme::CreateComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { +UIComboBox * UIdefaultTheme::createComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIComboBox::CreateParams ComboParams; ComboParams.Parent( Parent ); ComboParams.PosSet( Pos ); @@ -161,17 +161,17 @@ UIComboBox * UIDefaultTheme::CreateComboBox( UIControl * Parent, const Sizei& Si ComboParams.PopUpToMainControl = PopUpToMainControl; ComboParams.ListBox = ListBox; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { ComboParams.Flags |= UI_AUTO_SIZE | UI_TEXT_SELECTION_ENABLED; } UIComboBox * Ctrl = eeNew( UIComboBox, ( ComboParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIDropDownList * UIDefaultTheme::CreateDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { +UIDropDownList * UIdefaultTheme::createDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIDropDownList::CreateParams DDLParams; DDLParams.Parent( Parent ); DDLParams.PosSet( Pos ); @@ -181,17 +181,17 @@ UIDropDownList * UIDefaultTheme::CreateDropDownList( UIControl * Parent, const S DDLParams.PopUpToMainControl = PopUpToMainControl; DDLParams.ListBox = ListBox; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { DDLParams.Flags |= UI_AUTO_SIZE; } UIDropDownList * Ctrl = eeNew( UIDropDownList, ( DDLParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITabWidget * UIDefaultTheme::CreateTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { +UITabWidget * UIdefaultTheme::createTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { UITabWidget::CreateParams TabWidgetParams; TabWidgetParams.Parent( Parent ); TabWidgetParams.PosSet( Pos ); @@ -206,7 +206,7 @@ UITabWidget * UIDefaultTheme::CreateTabWidget( UIControl *Parent, const Sizei &S TabWidgetParams.MinTabWidth = MinTabWidth; TabWidgetParams.MaxTabWidth = MaxTabWidth; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { TabWidgetParams.TabSeparation = -1; TabWidgetParams.FontSelectedColor = ColorA( 255, 255, 255, 255 ); TabWidgetParams.DrawLineBelowTabs = true; @@ -215,27 +215,27 @@ UITabWidget * UIDefaultTheme::CreateTabWidget( UIControl *Parent, const Sizei &S } UITabWidget * Ctrl = eeNew( UITabWidget, ( TabWidgetParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITooltip * UIDefaultTheme::CreateTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { +UITooltip * UIdefaultTheme::createTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITooltip::CreateParams TooltipParams; TooltipParams.Parent( Parent ); TooltipParams.PosSet( Pos ); TooltipParams.SizeSet( Size ); TooltipParams.Flags = Flags; - if ( UseDefaultThemeValues() ) { + if ( useDefaultThemeValues() ) { TooltipParams.Flags &= ~UI_AUTO_PADDING; TooltipParams.FontColor = ColorA( 0, 0, 0, 255 ); TooltipParams.Padding = Recti( 4, 6, 4, 6 ); } UITooltip * Ctrl = eeNew( UITooltip, ( TooltipParams, TooltipOf ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } diff --git a/src/eepp/ui/uidragable.cpp b/src/eepp/ui/uidragable.cpp index 0dcfd8c75..741dff491 100644 --- a/src/eepp/ui/uidragable.cpp +++ b/src/eepp/ui/uidragable.cpp @@ -14,55 +14,55 @@ UIDragable::UIDragable( const UIControl::CreateParams& Params ) : UIDragable::~UIDragable() { } -Uint32 UIDragable::Type() const { +Uint32 UIDragable::getType() const { return UI_TYPE_CONTROL_DRAGABLE; } -bool UIDragable::IsType( const Uint32& type ) const { - return UIDragable::Type() == type ? true : UIControl::IsType( type ); +bool UIDragable::isType( const Uint32& type ) const { + return UIDragable::getType() == type ? true : UIControl::isType( type ); } -Uint32 UIDragable::OnMouseDown( const Vector2i& Pos, const Uint32 Flags ) { - if ( !( UIManager::instance()->LastPressTrigger() & mDragButton ) && ( Flags & mDragButton ) && DragEnable() && !Dragging() ) { - Dragging( true ); +Uint32 UIDragable::onMouseDown( const Vector2i& Pos, const Uint32 Flags ) { + if ( !( UIManager::instance()->lastPressTrigger() & mDragButton ) && ( Flags & mDragButton ) && dragEnable() && !dragging() ) { + dragging( true ); mDragPoint = Pos; } - UIControl::OnMouseDown( Pos, Flags ); + UIControl::onMouseDown( Pos, Flags ); return 1; } -Uint32 UIDragable::OnMouseUp( const Vector2i& Pos, const Uint32 Flags ) { - if ( DragEnable() && Dragging() && ( Flags & mDragButton ) ) { - Dragging( false ); +Uint32 UIDragable::onMouseUp( const Vector2i& Pos, const Uint32 Flags ) { + if ( dragEnable() && dragging() && ( Flags & mDragButton ) ) { + dragging( false ); } - UIControl::OnMouseUp( Pos, Flags ); + UIControl::onMouseUp( Pos, Flags ); return 1; } -const Vector2i& UIDragable::DragPoint() const { +const Vector2i& UIDragable::dragPoint() const { return mDragPoint; } -void UIDragable::DragPoint( const Vector2i& Point ) { +void UIDragable::dragPoint( const Vector2i& Point ) { mDragPoint = Point; } -void UIDragable::Update() { - UIControl::Update(); +void UIDragable::update() { + UIControl::update(); - if ( !DragEnable() ) + if ( !dragEnable() ) return; - if ( Dragging() ) { - if ( !( UIManager::instance()->PressTrigger() & mDragButton ) ) { - Dragging( false ); - UIManager::instance()->SetControlDragging( false ); + if ( dragging() ) { + if ( !( UIManager::instance()->pressTrigger() & mDragButton ) ) { + dragging( false ); + UIManager::instance()->setControlDragging( false ); return; } - Vector2i Pos( UIManager::instance()->GetMousePos() ); + Vector2i Pos( UIManager::instance()->getMousePos() ); if ( mDragPoint != Pos ) { if ( OnDrag( Pos ) ) { @@ -70,9 +70,9 @@ void UIDragable::Update() { mDragPoint = Pos; - OnPosChange(); + onPositionChange(); - UIManager::instance()->SetControlDragging( true ); + UIManager::instance()->setControlDragging( true ); } } } @@ -90,39 +90,39 @@ Uint32 UIDragable::OnDragEnd( const Vector2i& Pos ) { return 1; } -bool UIDragable::DragEnable() const { +bool UIDragable::dragEnable() const { return 0 != ( mFlags & UI_DRAG_ENABLE ); } -void UIDragable::DragEnable( const bool& enable ) { - WriteFlag( UI_DRAG_ENABLE, true == enable ); +void UIDragable::dragEnable( const bool& enable ) { + writeFlag( UI_DRAG_ENABLE, true == enable ); } -bool UIDragable::Dragging() const { +bool UIDragable::dragging() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_DRAGGING ); } -void UIDragable::Dragging( const bool& dragging ) { - WriteCtrlFlag( UI_CTRL_FLAG_DRAGGING, true == dragging ); +void UIDragable::dragging( const bool& dragging ) { + writeCtrlFlag( UI_CTRL_FLAG_DRAGGING, true == dragging ); if ( dragging ) { UIMessage tMsg( this, UIMessage::MsgDragStart, 0 ); - MessagePost( &tMsg ); + messagePost( &tMsg ); - OnDragStart( UIManager::instance()->GetMousePos() ); + OnDragStart( UIManager::instance()->getMousePos() ); } else { UIMessage tMsg( this, UIMessage::MsgDragEnd, 0 ); - MessagePost( &tMsg ); + messagePost( &tMsg ); - OnDragEnd( UIManager::instance()->GetMousePos() ); + OnDragEnd( UIManager::instance()->getMousePos() ); } } -void UIDragable::DragButton( const Uint32& Button ) { +void UIDragable::dragButton( const Uint32& Button ) { mDragButton = Button; } -const Uint32& UIDragable::DragButton() const { +const Uint32& UIDragable::dragButton() const { return mDragButton; } diff --git a/src/eepp/ui/uidropdownlist.cpp b/src/eepp/ui/uidropdownlist.cpp index 7a5698912..755f5e9c7 100644 --- a/src/eepp/ui/uidropdownlist.cpp +++ b/src/eepp/ui/uidropdownlist.cpp @@ -9,9 +9,9 @@ UIDropDownList::UIDropDownList( UIDropDownList::CreateParams& Params ) : mMinNumVisibleItems( Params.MinNumVisibleItems ), mPopUpToMainControl( Params.PopUpToMainControl ) { - AllowEditing( false ); + allowEditing( false ); - ApplyDefaultTheme(); + applyDefaultTheme(); if ( NULL == mListBox ) { Uint32 flags = UI_CLIP_ENABLE | UI_AUTO_PADDING; @@ -22,10 +22,10 @@ UIDropDownList::UIDropDownList( UIDropDownList::CreateParams& Params ) : if ( Params.Flags & UI_TEXT_SELECTION_ENABLED ) flags |= UI_TEXT_SELECTION_ENABLED; - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL != Theme ) { - mListBox = Theme->CreateListBox( NULL, Sizei( mSize.width(), mMinNumVisibleItems * mSize.height() ),Vector2i(), flags ); + mListBox = Theme->createListBox( NULL, Sizei( mSize.width(), mMinNumVisibleItems * mSize.height() ),Vector2i(), flags ); } else { UIListBox::CreateParams LBParams; LBParams.Size = Sizei( mSize.width(), mMinNumVisibleItems * mSize.height() ); @@ -35,195 +35,195 @@ UIDropDownList::UIDropDownList( UIDropDownList::CreateParams& Params ) : } } - mListBox->Enabled( false ); - mListBox->Visible( false ); + mListBox->enabled( false ); + mListBox->visible( false ); - mListBox->AddEventListener( UIEvent::EventOnComplexControlFocusLoss, cb::Make1( this, &UIDropDownList::OnListBoxFocusLoss ) ); - mListBox->AddEventListener( UIEvent::EventOnItemSelected , cb::Make1( this, &UIDropDownList::OnItemSelected ) ); - mListBox->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &UIDropDownList::OnItemClicked ) ); - mListBox->AddEventListener( UIEvent::EventOnItemKeyDown, cb::Make1( this, &UIDropDownList::OnItemKeyDown ) ); - mListBox->AddEventListener( UIEvent::EventKeyDown , cb::Make1( this, &UIDropDownList::OnItemKeyDown ) ); - mListBox->AddEventListener( UIEvent::EventOnControlClear, cb::Make1( this, &UIDropDownList::OnControlClear ) ); + mListBox->addEventListener( UIEvent::EventOnComplexControlFocusLoss, cb::Make1( this, &UIDropDownList::onListBoxFocusLoss ) ); + mListBox->addEventListener( UIEvent::EventOnItemSelected , cb::Make1( this, &UIDropDownList::onItemSelected ) ); + mListBox->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &UIDropDownList::onItemClicked ) ); + mListBox->addEventListener( UIEvent::EventOnItemKeyDown, cb::Make1( this, &UIDropDownList::onItemKeyDown ) ); + mListBox->addEventListener( UIEvent::EventKeyDown , cb::Make1( this, &UIDropDownList::onItemKeyDown ) ); + mListBox->addEventListener( UIEvent::EventOnControlClear, cb::Make1( this, &UIDropDownList::onControlClear ) ); } UIDropDownList::~UIDropDownList() { - DestroyListBox(); + destroyListBox(); } -Uint32 UIDropDownList::Type() const { +Uint32 UIDropDownList::getType() const { return UI_TYPE_DROPDOWNLIST; } -bool UIDropDownList::IsType( const Uint32& type ) const { - return UIDropDownList::Type() == type ? true : UITextInput::IsType( type ); +bool UIDropDownList::isType( const Uint32& type ) const { + return UIDropDownList::getType() == type ? true : UITextInput::isType( type ); } -void UIDropDownList::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "dropdownlist" ); +void UIDropDownList::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "dropdownlist" ); - AutoSizeControl(); + autoSizeControl(); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UIDropDownList::OnSizeChange() { - UIComplexControl::OnSizeChange(); +void UIDropDownList::onSizeChange() { + UIComplexControl::onSizeChange(); } -void UIDropDownList::AutoSizeControl() { +void UIDropDownList::autoSizeControl() { if ( mFlags & UI_AUTO_SIZE ) { - Size( mSize.x, GetSkinSize().height() ); + size( mSize.x, getSkinSize().height() ); } } -void UIDropDownList::AutoSize() { +void UIDropDownList::autoSize() { } -UIListBox * UIDropDownList::ListBox() const { +UIListBox * UIDropDownList::getListBox() const { return mListBox; } -Uint32 UIDropDownList::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { +Uint32 UIDropDownList::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { if ( Flags & EE_BUTTON_LMASK ) - ShowListBox(); + showListBox(); return 1; } -void UIDropDownList::ShowListBox() { - if ( !mListBox->Visible() ) { +void UIDropDownList::showListBox() { + if ( !mListBox->visible() ) { if ( !mPopUpToMainControl ) - mListBox->Parent( Parent() ); + mListBox->parent( parent() ); else - mListBox->Parent( UIManager::instance()->MainControl() ); + mListBox->parent( UIManager::instance()->mainControl() ); - mListBox->ToFront(); + mListBox->toFront(); Vector2i Pos( mPos.x, mPos.y + mSize.height() ); if ( mPopUpToMainControl ) { - Parent()->ControlToWorld( Pos ); + parent()->controlToWorld( Pos ); } - mListBox->Pos( Pos ); + mListBox->position( Pos ); - if ( mListBox->Count() ) { - Recti tPadding = mListBox->PaddingContainer(); + if ( mListBox->count() ) { + Recti tPadding = mListBox->paddingContainer(); - Float sliderValue = mListBox->VerticalScrollBar()->Value(); + Float sliderValue = mListBox->verticalScrollBar()->value(); - if ( mMinNumVisibleItems < mListBox->Count() ) - mListBox->Size( mSize.width(), (Int32)( mMinNumVisibleItems * mListBox->RowHeight() ) + tPadding.Top + tPadding.Bottom ); + if ( mMinNumVisibleItems < mListBox->count() ) + mListBox->size( mSize.width(), (Int32)( mMinNumVisibleItems * mListBox->rowHeight() ) + tPadding.Top + tPadding.Bottom ); else { - mListBox->Size( mSize.width(), (Int32)( mListBox->Count() * mListBox->RowHeight() ) + tPadding.Top + tPadding.Bottom ); + mListBox->size( mSize.width(), (Int32)( mListBox->count() * mListBox->rowHeight() ) + tPadding.Top + tPadding.Bottom ); } - mListBox->UpdateQuad(); + mListBox->updateQuad(); - Rectf aabb( mListBox->GetPolygon().toAABB() ); + Rectf aabb( mListBox->getPolygon().toAABB() ); Recti aabbi( aabb.Left, aabb.Top, aabb.Right, aabb.Bottom ); - if ( !UIManager::instance()->MainControl()->GetScreenRect().contains( aabbi ) ) { + if ( !UIManager::instance()->mainControl()->getScreenRect().contains( aabbi ) ) { Pos = Vector2i( mPos.x, mPos.y ); if ( mPopUpToMainControl ) { - Parent()->ControlToWorld( Pos ); + parent()->controlToWorld( Pos ); } - Pos.y -= mListBox->Size().height(); + Pos.y -= mListBox->size().height(); - mListBox->Pos( Pos ); + mListBox->position( Pos ); } - mListBox->VerticalScrollBar()->Value( sliderValue ); + mListBox->verticalScrollBar()->value( sliderValue ); - Show(); + show(); - mListBox->SetFocus(); + mListBox->setFocus(); } } else { - Hide(); + hide(); } } -void UIDropDownList::OnControlClear( const UIEvent * Event ) { - Text( "" ); +void UIDropDownList::onControlClear( const UIEvent * Event ) { + text( "" ); } -void UIDropDownList::OnItemKeyDown( const UIEvent * Event ) { +void UIDropDownList::onItemKeyDown( const UIEvent * Event ) { const UIEventKey * KEvent = reinterpret_cast ( Event ); - if ( KEvent->KeyCode() == KEY_RETURN ) - OnItemClicked( Event ); + if ( KEvent->getKeyCode() == KEY_RETURN ) + onItemClicked( Event ); } -void UIDropDownList::OnListBoxFocusLoss( const UIEvent * Event ) { - if ( UIManager::instance()->FocusControl() != this && !IsChild( UIManager::instance()->FocusControl() ) ) { - Hide(); +void UIDropDownList::onListBoxFocusLoss( const UIEvent * Event ) { + if ( UIManager::instance()->focusControl() != this && !isChild( UIManager::instance()->focusControl() ) ) { + hide(); } } -void UIDropDownList::OnItemClicked( const UIEvent * Event ) { - Hide(); - SetFocus(); +void UIDropDownList::onItemClicked( const UIEvent * Event ) { + hide(); + setFocus(); } -void UIDropDownList::OnItemSelected( const UIEvent * Event ) { - Text( mListBox->GetItemSelectedText() ); +void UIDropDownList::onItemSelected( const UIEvent * Event ) { + text( mListBox->getItemSelectedText() ); - UIMessage Msg( this, UIMessage::MsgSelected, mListBox->GetItemSelectedIndex() ); - MessagePost( &Msg ); + UIMessage Msg( this, UIMessage::MsgSelected, mListBox->getItemSelectedIndex() ); + messagePost( &Msg ); - SendCommonEvent( UIEvent::EventOnItemSelected ); + sendCommonEvent( UIEvent::EventOnItemSelected ); } -void UIDropDownList::Show() { - mListBox->Enabled( true ); - mListBox->Visible( true ); +void UIDropDownList::show() { + mListBox->enabled( true ); + mListBox->visible( true ); - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - mListBox->StartAlphaAnim( 255.f == mListBox->Alpha() ? 0.f : mListBox->Alpha(), 255.f, UIThemeManager::instance()->ControlsFadeInTime() ); + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + mListBox->startAlphaAnim( 255.f == mListBox->alpha() ? 0.f : mListBox->alpha(), 255.f, UIThemeManager::instance()->controlsFadeInTime() ); } } -void UIDropDownList::Hide() { - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - mListBox->DisableFadeOut( UIThemeManager::instance()->ControlsFadeOutTime() ); +void UIDropDownList::hide() { + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + mListBox->disableFadeOut( UIThemeManager::instance()->controlsFadeOutTime() ); } else { - mListBox->Enabled( false ); - mListBox->Visible( false ); + mListBox->enabled( false ); + mListBox->visible( false ); } } -void UIDropDownList::Update() { +void UIDropDownList::update() { if ( mEnabled && mVisible ) { - if ( IsMouseOver() ) { - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + if ( isMouseOver() ) { + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); if ( Flags & EE_BUTTONS_WUWD ) { if ( Flags & EE_BUTTON_WUMASK ) { - mListBox->SelectPrev(); + mListBox->selectPrev(); } else if ( Flags & EE_BUTTON_WDMASK ) { - mListBox->SelectNext(); + mListBox->selectNext(); } } } } - UITextInput::Update(); + UITextInput::update(); } -Uint32 UIDropDownList::OnKeyDown( const UIEventKey &Event ) { - mListBox->OnKeyDown( Event ); +Uint32 UIDropDownList::onKeyDown( const UIEventKey &Event ) { + mListBox->onKeyDown( Event ); - return UITextInput::OnKeyDown( Event ); + return UITextInput::onKeyDown( Event ); } -void UIDropDownList::DestroyListBox() { - if ( !UIManager::instance()->IsShootingDown() ) { - mListBox->Close(); +void UIDropDownList::destroyListBox() { + if ( !UIManager::instance()->isShootingDown() ) { + mListBox->close(); } } diff --git a/src/eepp/ui/uievent.cpp b/src/eepp/ui/uievent.cpp index 4925bbac7..966ce6a6e 100644 --- a/src/eepp/ui/uievent.cpp +++ b/src/eepp/ui/uievent.cpp @@ -3,9 +3,9 @@ namespace EE { namespace UI { -UIEvent::UIEvent( UIControl * Ctrl, const Uint32& EventType ) : - mCtrl( Ctrl ), - mEventType( EventType ) +UIEvent::UIEvent(UIControl * control, const Uint32& eventType ) : + mCtrl( control ), + mEventType( eventType ) { } @@ -13,11 +13,11 @@ UIEvent::~UIEvent() { } -UIControl * UIEvent::Ctrl() const { +UIControl * UIEvent::getControl() const { return mCtrl; } -const Uint32& UIEvent::EventType() const { +const Uint32& UIEvent::getEventType() const { return mEventType; } diff --git a/src/eepp/ui/uieventkey.cpp b/src/eepp/ui/uieventkey.cpp index 90d175dbc..2b68f61a6 100644 --- a/src/eepp/ui/uieventkey.cpp +++ b/src/eepp/ui/uieventkey.cpp @@ -15,15 +15,15 @@ UIEventKey::~UIEventKey() { } -const Uint32& UIEventKey::KeyCode() const { +const Uint32& UIEventKey::getKeyCode() const { return mKeyCode; } -const Uint16& UIEventKey::Char() const { +const Uint16& UIEventKey::getChar() const { return mChar; } -const Uint32& UIEventKey::Mod() const { +const Uint32& UIEventKey::getMod() const { return mMod; } diff --git a/src/eepp/ui/uieventmouse.cpp b/src/eepp/ui/uieventmouse.cpp index 4b119a22c..1b1d62497 100644 --- a/src/eepp/ui/uieventmouse.cpp +++ b/src/eepp/ui/uieventmouse.cpp @@ -14,11 +14,11 @@ UIEventMouse::~UIEventMouse() { } -const Vector2i& UIEventMouse::Pos() const { +const Vector2i& UIEventMouse::getPosition() const { return mPos; } -const Uint32& UIEventMouse::Flags() const { +const Uint32& UIEventMouse::getFlags() const { return mFlags; } diff --git a/src/eepp/ui/uigenericgrid.cpp b/src/eepp/ui/uigenericgrid.cpp index c600a7ac6..c1698633d 100644 --- a/src/eepp/ui/uigenericgrid.cpp +++ b/src/eepp/ui/uigenericgrid.cpp @@ -34,8 +34,8 @@ UIGenericGrid::UIGenericGrid( const UIGenericGrid::CreateParams& Params ) : CParams.Size = Sizei( mSize.width() - mPadding.Right - mPadding.Left, mSize.height() - mPadding.Top - mPadding.Bottom ); CParams.Flags = Params.Flags; mContainer = eeNew( UIItemContainer , ( CParams ) ); - mContainer->Visible( true ); - mContainer->Enabled( true ); + mContainer->visible( true ); + mContainer->enabled( true ); if ( mFlags & UI_CLIP_ENABLE ) mFlags &= ~UI_CLIP_ENABLE; @@ -49,165 +49,165 @@ UIGenericGrid::UIGenericGrid( const UIGenericGrid::CreateParams& Params ) : mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); ScrollBarP.PosSet ( 0, mSize.height() - 15 ); - ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->Size().width(), 15 ); + ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); if ( UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); } if ( UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } - mVScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIGenericGrid::OnScrollValueChange ) ); - mHScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIGenericGrid::OnScrollValueChange ) ); + mVScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIGenericGrid::onScrollValueChange ) ); + mHScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIGenericGrid::onScrollValueChange ) ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIGenericGrid::~UIGenericGrid() { } -Uint32 UIGenericGrid::Type() const { +Uint32 UIGenericGrid::getType() const { return UI_TYPE_GENERICGRID; } -bool UIGenericGrid::IsType( const Uint32& type ) const { - return UIGenericGrid::Type() == type ? true : UIControlAnim::IsType( type ); +bool UIGenericGrid::isType( const Uint32& type ) const { + return UIGenericGrid::getType() == type ? true : UIControlAnim::isType( type ); } -void UIGenericGrid::SetDefaultCollumnsWidth() { +void UIGenericGrid::setDefaultCollumnsWidth() { if ( mCollWidthAssigned ) return; if ( mItemsNotVisible <= 0 ) { - Uint32 VisibleItems = mContainer->Size().height() / mRowHeight; + Uint32 VisibleItems = mContainer->size().height() / mRowHeight; Int32 oItemsNotVisible = (Int32)mItems.size() - VisibleItems; if ( oItemsNotVisible > 0 ) { mItemsNotVisible = oItemsNotVisible; - UpdateVScroll(); + updateVScroll(); - ContainerResize(); + containerResize(); } } - Uint32 CollumnWidh = mContainer->Size().width() / mCollumnsCount; + Uint32 CollumnWidh = mContainer->size().width() / mCollumnsCount; for ( Uint32 i = 0; i < mCollumnsCount; i++ ) { mCollumnsWidth[ i ] = CollumnWidh; } - UpdateSize(); - UpdateCells(); + updateSize(); + updateCells(); } -void UIGenericGrid::OnScrollValueChange( const UIEvent * Event ) { - UpdateScroll( true ); +void UIGenericGrid::onScrollValueChange( const UIEvent * Event ) { + updateScroll( true ); } -void UIGenericGrid::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "genericgrid" ); +void UIGenericGrid::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "genericgrid" ); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UIGenericGrid::AutoPadding() { +void UIGenericGrid::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPadding = MakePadding(); + mPadding = makePadding(); } } -void UIGenericGrid::OnSizeChange() { - mVScrollBar->Pos( mSize.width() - mVScrollBar->Size().width(), 0 ); - mVScrollBar->Size( mVScrollBar->Size().width(), mSize.height() ); +void UIGenericGrid::onSizeChange() { + mVScrollBar->position( mSize.width() - mVScrollBar->size().width(), 0 ); + mVScrollBar->size( mVScrollBar->size().width(), mSize.height() ); - mHScrollBar->Pos( 0, mSize.height() - mHScrollBar->Size().height() ); - mHScrollBar->Size( mSize.width() - mVScrollBar->Size().width(), mHScrollBar->Size().height() ); + mHScrollBar->position( 0, mSize.height() - mHScrollBar->size().height() ); + mHScrollBar->size( mSize.width() - mVScrollBar->size().width(), mHScrollBar->size().height() ); - if ( mContainer->IsClipped() && UI_SCROLLBAR_AUTO == mHScrollMode ) { - if ( (Int32)mTotalWidth <= mContainer->Size().width() ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + if ( mContainer->isClipped() && UI_SCROLLBAR_AUTO == mHScrollMode ) { + if ( (Int32)mTotalWidth <= mContainer->size().width() ) { + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); mHScrollInit = 0; } } - ContainerResize(); - SetDefaultCollumnsWidth(); - UpdateScroll(); + containerResize(); + setDefaultCollumnsWidth(); + updateScroll(); } -void UIGenericGrid::ContainerResize() { - mContainer->Pos( mPadding.Left, mPadding.Top ); +void UIGenericGrid::containerResize() { + mContainer->position( mPadding.Left, mPadding.Top ); - if( mHScrollBar->Visible() ) - mContainer->Size( mSize.width() - mPadding.Right, mSize.height() - mPadding.Top - mHScrollBar->Size().height() ); + if( mHScrollBar->visible() ) + mContainer->size( mSize.width() - mPadding.Right, mSize.height() - mPadding.Top - mHScrollBar->size().height() ); else - mContainer->Size( mSize.width() - mPadding.Right, mSize.height() - mPadding.Bottom - mPadding.Top ); + mContainer->size( mSize.width() - mPadding.Right, mSize.height() - mPadding.Bottom - mPadding.Top ); - if ( mVScrollBar->Visible() ) - mContainer->Size( mContainer->Size().width() - mVScrollBar->Size().width(), mContainer->Size().height() ); + if ( mVScrollBar->visible() ) + mContainer->size( mContainer->size().width() - mVScrollBar->size().width(), mContainer->size().height() ); - SetDefaultCollumnsWidth(); + setDefaultCollumnsWidth(); } -void UIGenericGrid::UpdateVScroll() { +void UIGenericGrid::updateVScroll() { if ( mItemsNotVisible <= 0 ) { if ( UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } else { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } } else { if ( UI_SCROLLBAR_AUTO == mVScrollMode || UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } else { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } } - ContainerResize(); + containerResize(); } -void UIGenericGrid::UpdateHScroll() { - if ( mContainer->IsClipped() && ( UI_SCROLLBAR_AUTO == mHScrollMode || UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) ) { - if ( mContainer->Size().width() < (Int32)mTotalWidth ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); +void UIGenericGrid::updateHScroll() { + if ( mContainer->isClipped() && ( UI_SCROLLBAR_AUTO == mHScrollMode || UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) ) { + if ( mContainer->size().width() < (Int32)mTotalWidth ) { + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); - ContainerResize(); + containerResize(); - Int32 ScrollH = mTotalWidth - mContainer->Size().width(); + Int32 ScrollH = mTotalWidth - mContainer->size().width(); - Int32 HScrolleable = (Uint32)( mHScrollBar->Value() * ScrollH ); + Int32 HScrolleable = (Uint32)( mHScrollBar->value() * ScrollH ); mHScrollInit = -HScrolleable; } else { if ( UI_SCROLLBAR_AUTO == mHScrollMode ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); mHScrollInit = 0; - ContainerResize(); + containerResize(); } } } } -void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { +void UIGenericGrid::updateScroll( bool FromScrollChange ) { if ( !mItems.size() ) return; @@ -216,26 +216,26 @@ void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { Int32 ItemPos, ItemPosMax; Int32 tHLastScroll = mHScrollInit; - Uint32 VisibleItems = mContainer->Size().height() / mRowHeight; + Uint32 VisibleItems = mContainer->size().height() / mRowHeight; mItemsNotVisible = (Int32)mItems.size() - VisibleItems; - bool Clipped = 0 != mContainer->IsClipped(); + bool Clipped = 0 != mContainer->isClipped(); - UpdateVScroll(); + updateVScroll(); - UpdateHScroll(); + updateHScroll(); - VisibleItems = mContainer->Size().height() / mRowHeight; + VisibleItems = mContainer->size().height() / mRowHeight; mItemsNotVisible = (Uint32)mItems.size() - VisibleItems; - Int32 Scrolleable = (Int32)mItems.size() * mRowHeight - mContainer->Size().height(); + Int32 Scrolleable = (Int32)mItems.size() * mRowHeight - mContainer->size().height(); bool FirstVisible = false; if ( Clipped && mSmoothScroll ) { if ( Scrolleable >= 0 ) - RelPos = (Uint32)( mVScrollBar->Value() * Scrolleable ); + RelPos = (Uint32)( mVScrollBar->value() * Scrolleable ); else RelPos = 0; - RelPosMax = RelPos + mContainer->Size().height() + mRowHeight; + RelPosMax = RelPos + mContainer->size().height() + mRowHeight; if ( ( FromScrollChange && eeINDEX_NOT_FOUND != mLastPos && mLastPos == RelPos ) && ( tHLastScroll == mHScrollInit ) ) return; @@ -248,9 +248,9 @@ void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { ItemPosMax = ItemPos + mRowHeight; if ( ( ItemPos >= (Int32)RelPos || ItemPosMax >= (Int32)RelPos ) && ( ItemPos <= (Int32)RelPosMax ) ) { - Item->Pos( mHScrollInit, ItemPos - RelPos ); - Item->Enabled( true ); - Item->Visible( true ); + Item->position( mHScrollInit, ItemPos - RelPos ); + Item->enabled( true ); + Item->visible( true ); if ( !FirstVisible ) { mVisibleFirst = i; @@ -259,15 +259,15 @@ void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { mVisibleLast = i; } else { - Item->Enabled( false ); - Item->Visible( false ); + Item->enabled( false ); + Item->visible( false ); } } } else { RelPosMax = (Uint32)mItems.size(); if ( mItemsNotVisible > 0 ) { - RelPos = (Uint32)( mVScrollBar->Value() * mItemsNotVisible ); + RelPos = (Uint32)( mVScrollBar->value() * mItemsNotVisible ); RelPosMax = RelPos + VisibleItems; } @@ -282,12 +282,12 @@ void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { if ( i >= RelPos && i < RelPosMax ) { if ( Clipped ) - Item->Pos( mHScrollInit, ItemPos ); + Item->position( mHScrollInit, ItemPos ); else - Item->Pos( 0, ItemPos ); + Item->position( 0, ItemPos ); - Item->Enabled( true ); - Item->Visible( true ); + Item->enabled( true ); + Item->visible( true ); if ( !FirstVisible ) { mVisibleFirst = i; @@ -296,47 +296,47 @@ void UIGenericGrid::UpdateScroll( bool FromScrollChange ) { mVisibleLast = i; } else { - Item->Enabled( false ); - Item->Visible( false ); + Item->enabled( false ); + Item->visible( false ); } } } - if ( mHScrollBar->Visible() && !mVScrollBar->Visible() ) { - mHScrollBar->Pos( 0, mSize.height() - mHScrollBar->Size().height() ); - mHScrollBar->Size( mSize.width(), mHScrollBar->Size().height() ); + if ( mHScrollBar->visible() && !mVScrollBar->visible() ) { + mHScrollBar->position( 0, mSize.height() - mHScrollBar->size().height() ); + mHScrollBar->size( mSize.width(), mHScrollBar->size().height() ); } else { - mHScrollBar->Pos( 0, mSize.height() - mHScrollBar->Size().height() ); - mHScrollBar->Size( mSize.width() - mVScrollBar->Size().width(), mHScrollBar->Size().height() ); + mHScrollBar->position( 0, mSize.height() - mHScrollBar->size().height() ); + mHScrollBar->size( mSize.width() - mVScrollBar->size().width(), mHScrollBar->size().height() ); } } -void UIGenericGrid::UpdateSize() { - UpdateCollumnsPos(); +void UIGenericGrid::updateSize() { + updateCollumnsPos(); mTotalHeight = mItems.size() * mRowHeight; } -void UIGenericGrid::Add( UIGridCell * Cell ) { +void UIGenericGrid::add( UIGridCell * Cell ) { mItems.push_back( Cell ); - if ( mContainer != Cell->Parent() ) - Cell->Parent( mContainer ); + if ( mContainer != Cell->parent() ) + Cell->parent( mContainer ); - SetDefaultCollumnsWidth(); + setDefaultCollumnsWidth(); - Cell->AutoSize(); + Cell->autoSize(); - UpdateSize(); + updateSize(); - UpdateScroll(); + updateScroll(); } -void UIGenericGrid::Remove( UIGridCell * Cell ) { - return Remove( GetItemIndex( Cell ) ); +void UIGenericGrid::remove( UIGridCell * Cell ) { + return remove( getItemIndex( Cell ) ); } -void UIGenericGrid::Remove( std::vector ItemsIndex ) { +void UIGenericGrid::remove( std::vector ItemsIndex ) { if ( ItemsIndex.size() && eeINDEX_NOT_FOUND != ItemsIndex[0] ) { std::vector ItemsCpy; bool erase; @@ -366,75 +366,75 @@ void UIGenericGrid::Remove( std::vector ItemsIndex ) { mItems = ItemsCpy; - SetDefaultCollumnsWidth(); - UpdateSize(); - UpdateScroll(); + setDefaultCollumnsWidth(); + updateSize(); + updateScroll(); } } -void UIGenericGrid::Remove( Uint32 ItemIndex ) { - Remove( std::vector ( 1, ItemIndex ) ); +void UIGenericGrid::remove( Uint32 ItemIndex ) { + remove( std::vector ( 1, ItemIndex ) ); } -void UIGenericGrid::CollumnWidth( const Uint32& CollumnIndex, const Uint32& CollumnWidth ) { +void UIGenericGrid::collumnWidth( const Uint32& CollumnIndex, const Uint32& CollumnWidth ) { eeASSERT( CollumnIndex < mCollumnsCount ); mCollWidthAssigned = true; mCollumnsWidth[ CollumnIndex ] = CollumnWidth; - UpdateCollumnsPos(); - UpdateCells(); - UpdateScroll(); + updateCollumnsPos(); + updateCells(); + updateScroll(); } -Uint32 UIGenericGrid::Count() const { +Uint32 UIGenericGrid::getCount() const { return mItems.size(); } -const Uint32& UIGenericGrid::CollumnsCount() const { +const Uint32& UIGenericGrid::getCollumnsCount() const { return mCollumnsCount; } -const Uint32& UIGenericGrid::CollumnWidth( const Uint32& CollumnIndex ) const { +const Uint32& UIGenericGrid::collumnWidth( const Uint32& CollumnIndex ) const { eeASSERT( CollumnIndex < mCollumnsCount ); return mCollumnsWidth[ CollumnIndex ]; } -void UIGenericGrid::RowHeight( const Uint32& height ) { +void UIGenericGrid::rowHeight( const Uint32& height ) { if ( mRowHeight != height ) { mRowHeight = height; - UpdateSize(); - UpdateCells(); - UpdateScroll(); + updateSize(); + updateCells(); + updateScroll(); } } -const Uint32& UIGenericGrid::RowHeight() const { +const Uint32& UIGenericGrid::rowHeight() const { return mRowHeight; } -UIGridCell * UIGenericGrid::GetCell( const Uint32& CellIndex ) const { +UIGridCell * UIGenericGrid::getCell( const Uint32& CellIndex ) const { eeASSERT( CellIndex < mItems.size() ); return mItems[ CellIndex ]; } -Uint32 UIGenericGrid::GetCellPos( const Uint32& CollumnIndex ) { +Uint32 UIGenericGrid::getCellPosition( const Uint32& CollumnIndex ) { eeASSERT( CollumnIndex < mCollumnsCount ); return mCollumnsPos[ CollumnIndex ]; } -void UIGenericGrid::UpdateCells() { +void UIGenericGrid::updateCells() { for ( Uint32 i = 0; i < mItems.size(); i++ ) { - mItems[i]->FixCell(); + mItems[i]->fixCell(); } } -void UIGenericGrid::UpdateCollumnsPos() { +void UIGenericGrid::updateCollumnsPos() { Uint32 Pos = 0; for ( Uint32 i = 0; i < mCollumnsCount; i++ ) { @@ -446,56 +446,56 @@ void UIGenericGrid::UpdateCollumnsPos() { mTotalWidth = Pos; } -void UIGenericGrid::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UIGenericGrid::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mVScrollBar->Alpha( mAlpha ); - mHScrollBar->Alpha( mAlpha ); + mVScrollBar->alpha( mAlpha ); + mHScrollBar->alpha( mAlpha ); } -void UIGenericGrid::VerticalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { +void UIGenericGrid::verticalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { if ( Mode != mVScrollMode ) { mVScrollMode = Mode; - UpdateScroll(); + updateScroll(); } } -const UI_SCROLLBAR_MODE& UIGenericGrid::VerticalScrollMode() { +const UI_SCROLLBAR_MODE& UIGenericGrid::verticalScrollMode() { return mVScrollMode; } -void UIGenericGrid::HorizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { +void UIGenericGrid::horizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { if ( Mode != mHScrollMode ) { mHScrollMode = Mode; if ( UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); - ContainerResize(); + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); + containerResize(); } else if ( UI_SCROLLBAR_ALWAYS_OFF == mHScrollMode ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); - ContainerResize(); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); + containerResize(); } - UpdateScroll(); + updateScroll(); } } -const UI_SCROLLBAR_MODE& UIGenericGrid::HorizontalScrollMode() { +const UI_SCROLLBAR_MODE& UIGenericGrid::horizontalScrollMode() { return mHScrollMode; } -UIScrollBar * UIGenericGrid::VerticalScrollBar() const { +UIScrollBar * UIGenericGrid::verticalScrollBar() const { return mVScrollBar; } -UIScrollBar * UIGenericGrid::HorizontalScrollBar() const { +UIScrollBar * UIGenericGrid::horizontalScrollBar() const { return mHScrollBar; } -Uint32 UIGenericGrid::GetItemIndex( UIGridCell * Item ) { +Uint32 UIGenericGrid::getItemIndex( UIGridCell * Item ) { for ( Uint32 i = 0; i < mItems.size(); i++ ) { if ( Item == mItems[i] ) return i; @@ -504,31 +504,31 @@ Uint32 UIGenericGrid::GetItemIndex( UIGridCell * Item ) { return eeINDEX_NOT_FOUND; } -Uint32 UIGenericGrid::OnSelected() { - SendCommonEvent( UIEvent::EventOnItemSelected ); +Uint32 UIGenericGrid::onSelected() { + sendCommonEvent( UIEvent::EventOnItemSelected ); return 1; } -UIGridCell * UIGenericGrid::GetItemSelected() { +UIGridCell * UIGenericGrid::getItemSelected() { if ( -1 != mSelected ) return mItems[ mSelected ]; return NULL; } -Uint32 UIGenericGrid::GetItemSelectedIndex() const { +Uint32 UIGenericGrid::getItemSelectedIndex() const { return mSelected; } -Uint32 UIGenericGrid::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIGenericGrid::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgFocusLoss: { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( this != FocusCtrl && !IsParentOf( FocusCtrl ) ) { - OnComplexControlFocusLoss(); + if ( this != FocusCtrl && !isParentOf( FocusCtrl ) ) { + onComplexControlFocusLoss(); } return 1; @@ -538,83 +538,83 @@ Uint32 UIGenericGrid::OnMessage( const UIMessage * Msg ) { return 0; } -UIItemContainer * UIGenericGrid::Container() const { +UIItemContainer * UIGenericGrid::getContainer() const { return mContainer; } -bool UIGenericGrid::TouchDragEnable() const { +bool UIGenericGrid::touchDragEnable() const { return 0 != ( mFlags & UI_TOUCH_DRAG_ENABLED ); } -void UIGenericGrid::TouchDragEnable( const bool& enable ) { - WriteFlag( UI_TOUCH_DRAG_ENABLED, true == enable ); +void UIGenericGrid::touchDragEnable( const bool& enable ) { + writeFlag( UI_TOUCH_DRAG_ENABLED, true == enable ); } -bool UIGenericGrid::TouchDragging() const { +bool UIGenericGrid::touchDragging() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_TOUCH_DRAGGING ); } -void UIGenericGrid::TouchDragging( const bool& dragging ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, true == dragging ); +void UIGenericGrid::touchDragging( const bool& dragging ) { + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, true == dragging ); } -void UIGenericGrid::Update() { +void UIGenericGrid::update() { if ( mEnabled && mVisible ) { if ( mFlags & UI_TOUCH_DRAG_ENABLED ) { - Uint32 Press = UIManager::instance()->PressTrigger(); - Uint32 LPress = UIManager::instance()->LastPressTrigger(); + Uint32 Press = UIManager::instance()->pressTrigger(); + Uint32 LPress = UIManager::instance()->lastPressTrigger(); if ( ( mControlFlags & UI_CTRL_FLAG_TOUCH_DRAGGING ) ) { // Mouse Not Down if ( !( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); - UIManager::instance()->SetControlDragging( false ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); + UIManager::instance()->setControlDragging( false ); return; } - Vector2i Pos( UIManager::instance()->GetMousePos() ); + Vector2i Pos( UIManager::instance()->getMousePos() ); if ( mTouchDragPoint != Pos ) { Vector2i diff = -( mTouchDragPoint - Pos ); - mVScrollBar->Value( mVScrollBar->Value() + ( -diff.y / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); + mVScrollBar->value( mVScrollBar->value() + ( -diff.y / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); - mTouchDragAcceleration += Elapsed().asMilliseconds() * diff.y * mTouchDragDeceleration; + mTouchDragAcceleration += elapsed().asMilliseconds() * diff.y * mTouchDragDeceleration; mTouchDragPoint = Pos; - UIManager::instance()->SetControlDragging( true ); + UIManager::instance()->setControlDragging( true ); } else { - mTouchDragAcceleration -= Elapsed().asMilliseconds() * mTouchDragAcceleration * 0.01f; + mTouchDragAcceleration -= elapsed().asMilliseconds() * mTouchDragAcceleration * 0.01f; } } else { // Mouse Down - if ( IsMouseOverMeOrChilds() && !mVScrollBar->IsMouseOverMeOrChilds() && !mHScrollBar->IsMouseOverMeOrChilds() ) { + if ( isMouseOverMeOrChilds() && !mVScrollBar->isMouseOverMeOrChilds() && !mHScrollBar->isMouseOverMeOrChilds() ) { if ( !( LPress & EE_BUTTON_LMASK ) && ( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 1 ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 1 ); - mTouchDragPoint = UIManager::instance()->GetMousePos(); + mTouchDragPoint = UIManager::instance()->getMousePos(); mTouchDragAcceleration = 0; } } // Mouse Up if ( ( LPress & EE_BUTTON_LMASK ) && !( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); - UIManager::instance()->SetControlDragging( false ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); + UIManager::instance()->setControlDragging( false ); } // Deaccelerate if ( mTouchDragAcceleration > 0.01f || mTouchDragAcceleration < -0.01f ) { - mVScrollBar->Value( mVScrollBar->Value() + ( -mTouchDragAcceleration / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); + mVScrollBar->value( mVScrollBar->value() + ( -mTouchDragAcceleration / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); - mTouchDragAcceleration -= mTouchDragAcceleration * mTouchDragDeceleration * Elapsed().asMilliseconds(); + mTouchDragAcceleration -= mTouchDragAcceleration * mTouchDragDeceleration * elapsed().asMilliseconds(); } } } } - UIComplexControl::Update(); + UIComplexControl::update(); } }} diff --git a/src/eepp/ui/uigfx.cpp b/src/eepp/ui/uigfx.cpp index aae62474c..b074ad394 100644 --- a/src/eepp/ui/uigfx.cpp +++ b/src/eepp/ui/uigfx.cpp @@ -10,44 +10,44 @@ UIGfx::UIGfx( const UIGfx::CreateParams& Params ) : mRender( Params.SubTextureRender ), mAlignOffset(0,0) { - if ( NULL != mSubTexture && ( ( Flags() & UI_AUTO_SIZE ) || ( Params.Size.x == -1 && Params.Size.y == -1 ) ) ) - Size( mSubTexture->size() ); + if ( NULL != mSubTexture && ( ( flags() & UI_AUTO_SIZE ) || ( Params.Size.x == -1 && Params.Size.y == -1 ) ) ) + size( mSubTexture->size() ); mColor.Alpha = (Uint8)mAlpha; - AutoSize(); + autoSize(); } UIGfx::~UIGfx() { } -Uint32 UIGfx::Type() const { +Uint32 UIGfx::getType() const { return UI_TYPE_GFX; } -bool UIGfx::IsType( const Uint32& type ) const { - return UIGfx::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIGfx::isType( const Uint32& type ) const { + return UIGfx::getType() == type ? true : UIComplexControl::isType( type ); } -void UIGfx::SubTexture( Graphics::SubTexture * subTexture ) { +void UIGfx::subTexture( Graphics::SubTexture * subTexture ) { mSubTexture = subTexture; - AutoSize(); - AutoAlign(); + autoSize(); + autoAlign(); } -void UIGfx::AutoSize() { +void UIGfx::autoSize() { if ( mFlags & UI_AUTO_SIZE ) { if ( NULL != mSubTexture ) { - Size( mSubTexture->size() ); + size( mSubTexture->size() ); } else { - Size( Sizei( 0, 0 ) ); + size( Sizei( 0, 0 ) ); } } } -void UIGfx::Draw() { - UIControlAnim::Draw(); +void UIGfx::draw() { + UIControlAnim::draw(); if ( mVisible ) { if ( NULL != mSubTexture && 0.f != mAlpha ) { @@ -58,7 +58,7 @@ void UIGfx::Draw() { mSubTexture->offset( Vector2i( 0, 0 ) ); mSubTexture->destSize( Vector2f( mSize.x, mSize.y ) ); - DrawSubTexture(); + drawSubTexture(); mSubTexture->destSize( oDestSize ); mSubTexture->offset( oOff ); @@ -74,58 +74,58 @@ void UIGfx::Draw() { mSubTexture->destSize( Sizef( oDestSize.x * Scale1, oDestSize.y * Scale1 ) ); - AutoAlign(); + autoAlign(); - DrawSubTexture(); + drawSubTexture(); mSubTexture->destSize( oDestSize ); - AutoAlign(); + autoAlign(); } else { - DrawSubTexture(); + drawSubTexture(); } mSubTexture->offset( oOff ); } else { - AutoAlign(); + autoAlign(); - DrawSubTexture(); + drawSubTexture(); } } } } -void UIGfx::DrawSubTexture() { - mSubTexture->draw( (Float)mScreenPos.x + mAlignOffset.x, (Float)mScreenPos.y + mAlignOffset.y, mColor, 0.f, Vector2f::One, Blend(), mRender ); +void UIGfx::drawSubTexture() { + mSubTexture->draw( (Float)mScreenPos.x + mAlignOffset.x, (Float)mScreenPos.y + mAlignOffset.y, mColor, 0.f, Vector2f::One, blend(), mRender ); } -void UIGfx::Alpha( const Float& alpha ) { - UIControlAnim::Alpha( alpha ); +void UIGfx::alpha( const Float& alpha ) { + UIControlAnim::alpha( alpha ); mColor.Alpha = (Uint8)alpha; } -Graphics::SubTexture * UIGfx::SubTexture() const { +Graphics::SubTexture * UIGfx::subTexture() const { return mSubTexture; } -const ColorA& UIGfx::Color() const { +const ColorA& UIGfx::color() const { return mColor; } -void UIGfx::Color( const ColorA& color ) { - mColor = color; - Alpha( color.a() ); +void UIGfx::color( const ColorA& col ) { + mColor = col; + alpha( col.a() ); } -const EE_RENDER_MODE& UIGfx::RenderMode() const { +const EE_RENDER_MODE& UIGfx::renderMode() const { return mRender; } -void UIGfx::RenderMode( const EE_RENDER_MODE& render ) { +void UIGfx::renderMode( const EE_RENDER_MODE& render ) { mRender = render; } -void UIGfx::AutoAlign() { +void UIGfx::autoAlign() { if ( NULL == mSubTexture ) return; @@ -146,13 +146,13 @@ void UIGfx::AutoAlign() { } } -void UIGfx::OnSizeChange() { - AutoSize(); - AutoAlign(); - UIControlAnim::OnSizeChange(); +void UIGfx::onSizeChange() { + autoSize(); + autoAlign(); + UIControlAnim::onSizeChange(); } -const Vector2i& UIGfx::AlignOffset() const { +const Vector2i& UIGfx::alignOffset() const { return mAlignOffset; } diff --git a/src/eepp/ui/uigridcell.cpp b/src/eepp/ui/uigridcell.cpp index 3dfe76b72..bf241902e 100644 --- a/src/eepp/ui/uigridcell.cpp +++ b/src/eepp/ui/uigridcell.cpp @@ -7,147 +7,147 @@ namespace EE { namespace UI { UIGridCell::UIGridCell( UIGridCell::CreateParams& Params ) : UIComplexControl( Params ) { - mCells.resize( GridParent()->CollumnsCount(), NULL ); + mCells.resize( gridParent()->getCollumnsCount(), NULL ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIGridCell::~UIGridCell() { - if ( UIManager::instance()->FocusControl() == this ) - mParentCtrl->SetFocus(); + if ( UIManager::instance()->focusControl() == this ) + mParentCtrl->setFocus(); - if ( UIManager::instance()->OverControl() == this ) - UIManager::instance()->OverControl( mParentCtrl ); + if ( UIManager::instance()->overControl() == this ) + UIManager::instance()->overControl( mParentCtrl ); } -void UIGridCell::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "gridcell" ); +void UIGridCell::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "gridcell" ); } -UIGenericGrid * UIGridCell::GridParent() const { - return reinterpret_cast ( mParentCtrl->Parent() ); +UIGenericGrid * UIGridCell::gridParent() const { + return reinterpret_cast ( mParentCtrl->parent() ); } -void UIGridCell::Cell( const Uint32& CollumnIndex, UIControl * Ctrl ) { - eeASSERT( CollumnIndex < GridParent()->CollumnsCount() ); +void UIGridCell::cell( const Uint32& CollumnIndex, UIControl * Ctrl ) { + eeASSERT( CollumnIndex < gridParent()->getCollumnsCount() ); - UIGenericGrid * P = GridParent(); + UIGenericGrid * P = gridParent(); mCells[ CollumnIndex ] = Ctrl; - if ( Ctrl->Parent() != this ) - Ctrl->Parent( this ); + if ( Ctrl->parent() != this ) + Ctrl->parent( this ); - Ctrl->Pos ( P->GetCellPos( CollumnIndex ) , 0 ); - Ctrl->Size ( P->CollumnWidth( CollumnIndex ) , P->RowHeight() ); + Ctrl->position ( P->getCellPosition( CollumnIndex ) , 0 ); + Ctrl->size ( P->collumnWidth( CollumnIndex ) , P->rowHeight() ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); } -UIControl * UIGridCell::Cell( const Uint32& CollumnIndex ) const { - eeASSERT( CollumnIndex < GridParent()->CollumnsCount() ); +UIControl * UIGridCell::cell( const Uint32& CollumnIndex ) const { + eeASSERT( CollumnIndex < gridParent()->getCollumnsCount() ); return mCells[ CollumnIndex ]; } -void UIGridCell::FixCell() { - AutoSize(); +void UIGridCell::fixCell() { + autoSize(); - UIGenericGrid * P = GridParent(); + UIGenericGrid * P = gridParent(); for ( Uint32 i = 0; i < mCells.size(); i++ ) { - mCells[i]->Pos ( P->GetCellPos( i ) , 0 ); - mCells[i]->Size ( P->CollumnWidth( i ) , P->RowHeight() ); + mCells[i]->position ( P->getCellPosition( i ) , 0 ); + mCells[i]->size ( P->collumnWidth( i ) , P->rowHeight() ); } } -void UIGridCell::Update() { +void UIGridCell::update() { if ( mEnabled && mVisible ) { - UIGenericGrid * MyParent = reinterpret_cast ( Parent()->Parent() ); - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + UIGenericGrid * MyParent = reinterpret_cast ( parent()->parent() ); + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); - if ( NULL != MyParent && MyParent->Alpha() != mAlpha ) { - Alpha( MyParent->Alpha() ); + if ( NULL != MyParent && MyParent->alpha() != mAlpha ) { + alpha( MyParent->alpha() ); for ( Uint32 i = 0; i < mCells.size(); i++ ) { - if ( NULL != mCells[i] && mCells[i]->IsAnimated() ) { - reinterpret_cast( mCells[i] )->Alpha( MyParent->Alpha() ); + if ( NULL != mCells[i] && mCells[i]->isAnimated() ) { + reinterpret_cast( mCells[i] )->alpha( MyParent->alpha() ); } } } - if ( IsMouseOverMeOrChilds() ) { - if ( ( Flags & EE_BUTTONS_WUWD ) && MyParent->VerticalScrollBar()->Visible() ) { - MyParent->VerticalScrollBar()->Slider()->ManageClick( Flags ); + if ( isMouseOverMeOrChilds() ) { + if ( ( Flags & EE_BUTTONS_WUWD ) && MyParent->verticalScrollBar()->visible() ) { + MyParent->verticalScrollBar()->getSlider()->manageClick( Flags ); } } } - UIComplexControl::Update(); + UIComplexControl::update(); } -void UIGridCell::Select() { - UIGenericGrid * MyParent = reinterpret_cast ( Parent()->Parent() ); +void UIGridCell::select() { + UIGenericGrid * MyParent = reinterpret_cast ( parent()->parent() ); - if ( MyParent->GetItemSelected() != this ) { - if ( NULL != MyParent->GetItemSelected() ) - MyParent->GetItemSelected()->Unselect(); + if ( MyParent->getItemSelected() != this ) { + if ( NULL != MyParent->getItemSelected() ) + MyParent->getItemSelected()->unselect(); bool wasSelected = 0 != ( mControlFlags & UI_CTRL_FLAG_SELECTED ); - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); mControlFlags |= UI_CTRL_FLAG_SELECTED; - MyParent->mSelected = MyParent->GetItemIndex( this ); + MyParent->mSelected = MyParent->getItemIndex( this ); if ( !wasSelected ) { - MyParent->OnSelected(); + MyParent->onSelected(); } } } -void UIGridCell::Unselect() { +void UIGridCell::unselect() { if ( mControlFlags & UI_CTRL_FLAG_SELECTED ) mControlFlags &= ~UI_CTRL_FLAG_SELECTED; - SetSkinState( UISkinState::StateNormal ); + setSkinState( UISkinState::StateNormal ); } -bool UIGridCell::Selected() const { +bool UIGridCell::isSelected() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_SELECTED ); } -Uint32 UIGridCell::OnMouseExit( const Vector2i& Pos, const Uint32 Flags ) { - UIControl::OnMouseExit( Pos, Flags ); +Uint32 UIGridCell::onMouseExit( const Vector2i& Pos, const Uint32 Flags ) { + UIControl::onMouseExit( Pos, Flags ); if ( mControlFlags & UI_CTRL_FLAG_SELECTED ) - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); return 1; } -Uint32 UIGridCell::OnMessage( const UIMessage * Msg ) { - switch( Msg->Msg() ) { +Uint32 UIGridCell::onMessage( const UIMessage * Msg ) { + switch( Msg->getMsg() ) { case UIMessage::MsgMouseEnter: { - OnMouseEnter( Vector2i(), Msg->Flags() ); + onMouseEnter( Vector2i(), Msg->getFlags() ); break; } case UIMessage::MsgMouseExit: { - OnMouseExit( Vector2i(), Msg->Flags() ); + onMouseExit( Vector2i(), Msg->getFlags() ); break; } case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTONS_LRM ) { - Select(); + if ( Msg->getFlags() & EE_BUTTONS_LRM ) { + select(); - UIMessage tMsg( this, UIMessage::MsgCellClicked, Msg->Flags() ); + UIMessage tMsg( this, UIMessage::MsgCellClicked, Msg->getFlags() ); - MessagePost( &tMsg ); + messagePost( &tMsg ); return 1; } @@ -157,15 +157,15 @@ Uint32 UIGridCell::OnMessage( const UIMessage * Msg ) { return 0; } -void UIGridCell::AutoSize() { - UIGenericGrid * MyParent = reinterpret_cast ( Parent()->Parent() ); +void UIGridCell::autoSize() { + UIGenericGrid * MyParent = reinterpret_cast ( parent()->parent() ); - Size( MyParent->mTotalWidth, MyParent->mRowHeight ); + size( MyParent->mTotalWidth, MyParent->mRowHeight ); } -void UIGridCell::OnStateChange() { - if ( Selected() && mSkinState->GetState() != UISkinState::StateSelected ) { - SetSkinState( UISkinState::StateSelected ); +void UIGridCell::onStateChange() { + if ( isSelected() && mSkinState->getState() != UISkinState::StateSelected ) { + setSkinState( UISkinState::StateSelected ); } } diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp index 36178de30..2f66f0ed0 100644 --- a/src/eepp/ui/uilistbox.cpp +++ b/src/eepp/ui/uilistbox.cpp @@ -32,8 +32,8 @@ UIListBox::UIListBox( UIListBox::CreateParams& Params ) : mTouchDragAcceleration(0), mTouchDragDeceleration( Params.TouchDragDeceleration ) { - if ( NULL == Params.Font && NULL != UIThemeManager::instance()->DefaultFont() ) - mFont = UIThemeManager::instance()->DefaultFont(); + if ( NULL == Params.Font && NULL != UIThemeManager::instance()->defaultFont() ) + mFont = UIThemeManager::instance()->defaultFont(); UIControl::CreateParams CParams; CParams.Parent( this ); @@ -41,8 +41,8 @@ UIListBox::UIListBox( UIListBox::CreateParams& Params ) : CParams.Size = Sizei( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Top - mPaddingContainer.Bottom ); CParams.Flags = Params.Flags; mContainer = eeNew( UIItemContainer, ( CParams ) ); - mContainer->Visible( true ); - mContainer->Enabled( true ); + mContainer->visible( true ); + mContainer->enabled( true ); if ( mFlags & UI_CLIP_ENABLE ) mFlags &= ~UI_CLIP_ENABLE; @@ -55,99 +55,99 @@ UIListBox::UIListBox( UIListBox::CreateParams& Params ) : ScrollBarP.VerticalScrollBar = true; mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); - ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->Size().width(), 15 ); + ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); ScrollBarP.PosSet( 0, mSize.height() - 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); if ( UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); } if ( UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } - mVScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIListBox::OnScrollValueChange ) ); - mHScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIListBox::OnHScrollValueChange ) ); + mVScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIListBox::onScrollValueChange ) ); + mHScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIListBox::onHScrollValueChange ) ); - SetRowHeight(); + setRowHeight(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIListBox::~UIListBox() { } -Uint32 UIListBox::Type() const { +Uint32 UIListBox::getType() const { return UI_TYPE_LISTBOX; } -bool UIListBox::IsType( const Uint32& type ) const { - return UIListBox::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIListBox::isType( const Uint32& type ) const { + return UIListBox::getType() == type ? true : UIComplexControl::isType( type ); } -void UIListBox::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "listbox" ); +void UIListBox::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "listbox" ); - if ( NULL == mFont && NULL != mSkinState && NULL != mSkinState->GetSkin() && NULL != mSkinState->GetSkin()->Theme() && NULL != mSkinState->GetSkin()->Theme()->Font() ) - mFont = mSkinState->GetSkin()->Theme()->Font(); + if ( NULL == mFont && NULL != mSkinState && NULL != mSkinState->getSkin() && NULL != mSkinState->getSkin()->theme() && NULL != mSkinState->getSkin()->theme()->font() ) + mFont = mSkinState->getSkin()->theme()->font(); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UIListBox::AutoPadding() { +void UIListBox::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPaddingContainer = MakePadding(); + mPaddingContainer = makePadding(); } } -UIScrollBar * UIListBox::VerticalScrollBar() const { +UIScrollBar * UIListBox::verticalScrollBar() const { return mVScrollBar; } -UIScrollBar * UIListBox::HorizontalScrollBar() const { +UIScrollBar * UIListBox::horizontalScrollBar() const { return mHScrollBar; } -void UIListBox::AddListBoxItems( std::vector Texts ) { +void UIListBox::addListBoxItems( std::vector Texts ) { mItems.reserve( mItems.size() + Texts.size() ); mTexts.reserve( mTexts.size() + Texts.size() ); for ( Uint32 i = 0; i < Texts.size(); i++ ) { - AddListBoxItem( Texts[i] ); + addListBoxItem( Texts[i] ); } - UpdateScroll(); + updateScroll(); } -Uint32 UIListBox::AddListBoxItem( UIListBoxItem * Item ) { +Uint32 UIListBox::addListBoxItem( UIListBoxItem * Item ) { mItems.push_back( Item ); - mTexts.push_back( Item->Text() ); + mTexts.push_back( Item->text() ); - if ( Item->Parent() != mContainer ) - Item->Parent( mContainer ); + if ( Item->parent() != mContainer ) + Item->parent( mContainer ); - UpdateScroll(); + updateScroll(); Uint32 tMaxTextWidth = mMaxTextWidth; - ItemUpdateSize( Item ); + itemUpdateSize( Item ); if ( tMaxTextWidth != mMaxTextWidth ) { - UpdateListBoxItemsSize(); - UpdateScroll(); + updateListBoxItemsSize(); + updateScroll(); } return (Uint32)(mItems.size() - 1); } -Uint32 UIListBox::AddListBoxItem( const String& Text ) { +Uint32 UIListBox::addListBoxItem( const String& Text ) { mTexts.push_back( Text ); mItems.push_back( NULL ); @@ -157,36 +157,36 @@ Uint32 UIListBox::AddListBoxItem( const String& Text ) { if ( twidth > mMaxTextWidth ) { mMaxTextWidth = twidth; - UpdateListBoxItemsSize(); + updateListBoxItemsSize(); } } - UpdateScroll(); + updateScroll(); return (Uint32)(mItems.size() - 1); } -UIListBoxItem * UIListBox::CreateListBoxItem( const String& Name ) { +UIListBoxItem * UIListBox::createListBoxItem( const String& Name ) { UITextBox::CreateParams TextParams; TextParams.Parent( mContainer ); TextParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT; TextParams.Font = mFont; TextParams.FontColor = mFontColor; UIListBoxItem * tItem = eeNew( UIListBoxItem, ( TextParams ) ); - tItem->Text( Name ); + tItem->text( Name ); return tItem; } -Uint32 UIListBox::RemoveListBoxItem( const String& Text ) { - return RemoveListBoxItem( GetListBoxItemIndex( Text ) ); +Uint32 UIListBox::removeListBoxItem( const String& Text ) { + return removeListBoxItem( getListBoxItemIndex( Text ) ); } -Uint32 UIListBox::RemoveListBoxItem( UIListBoxItem * Item ) { - return RemoveListBoxItem( GetListBoxItemIndex( Item ) ); +Uint32 UIListBox::removeListBoxItem( UIListBoxItem * Item ) { + return removeListBoxItem( getListBoxItemIndex( Item ) ); } -void UIListBox::RemoveListBoxItems( std::vector ItemsIndex ) { +void UIListBox::removeListBoxItems( std::vector ItemsIndex ) { if ( ItemsIndex.size() && eeINDEX_NOT_FOUND != ItemsIndex[0] ) { std::vector ItemsCpy; bool erase; @@ -215,7 +215,7 @@ void UIListBox::RemoveListBoxItems( std::vector ItemsIndex ) { if ( !erase ) { ItemsCpy.push_back( mItems[i] ); - mTexts.push_back( mItems[i]->Text() ); + mTexts.push_back( mItems[i]->text() ); } else { eeSAFE_DELETE( mItems[i] ); // doesn't call to mItems[i]->Close(); because is not checking for close. } @@ -223,43 +223,43 @@ void UIListBox::RemoveListBoxItems( std::vector ItemsIndex ) { mItems = ItemsCpy; - UpdateScroll(); - FindMaxWidth(); - UpdateListBoxItemsSize(); + updateScroll(); + findMaxWidth(); + updateListBoxItemsSize(); } } -void UIListBox::Clear() { +void UIListBox::clear() { mTexts.clear(); mItems.clear(); mSelected.clear(); - mVScrollBar->Value(0); + mVScrollBar->value(0); - UpdateScroll(); - FindMaxWidth(); - UpdateListBoxItemsSize(); + updateScroll(); + findMaxWidth(); + updateListBoxItemsSize(); - SendCommonEvent( UIEvent::EventOnControlClear ); + sendCommonEvent( UIEvent::EventOnControlClear ); } -Uint32 UIListBox::RemoveListBoxItem( Uint32 ItemIndex ) { - RemoveListBoxItems( std::vector( 1, ItemIndex ) ); +Uint32 UIListBox::removeListBoxItem( Uint32 ItemIndex ) { + removeListBoxItems( std::vector( 1, ItemIndex ) ); return ItemIndex; } -Uint32 UIListBox::GetListBoxItemIndex( const String& Name ) { +Uint32 UIListBox::getListBoxItemIndex( const String& Name ) { Uint32 size = (Uint32)mItems.size(); for ( Uint32 i = 0; i < size; i++ ) { - if ( Name == mItems[i]->Text() ) + if ( Name == mItems[i]->text() ) return i; } return eeINDEX_NOT_FOUND; } -Uint32 UIListBox::GetListBoxItemIndex( UIListBoxItem * Item ) { +Uint32 UIListBox::getListBoxItemIndex( UIListBoxItem * Item ) { Uint32 size = (Uint32)mItems.size(); for ( Uint32 i = 0; i < size; i++ ) { @@ -270,45 +270,45 @@ Uint32 UIListBox::GetListBoxItemIndex( UIListBoxItem * Item ) { return eeINDEX_NOT_FOUND; } -void UIListBox::OnScrollValueChange( const UIEvent * Event ) { - UpdateScroll( true ); +void UIListBox::onScrollValueChange( const UIEvent * Event ) { + updateScroll( true ); } -void UIListBox::OnHScrollValueChange( const UIEvent * Event ) { - UpdateScroll( true ); +void UIListBox::onHScrollValueChange( const UIEvent * Event ) { + updateScroll( true ); } -void UIListBox::OnSizeChange() { - mVScrollBar->Pos( mSize.width() - mVScrollBar->Size().width() + mVScrollPadding.Left, mVScrollPadding.Top ); - mVScrollBar->Size( mVScrollBar->Size().width() + mVScrollPadding.Right, mSize.height() + mVScrollPadding.Bottom ); +void UIListBox::onSizeChange() { + mVScrollBar->position( mSize.width() - mVScrollBar->size().width() + mVScrollPadding.Left, mVScrollPadding.Top ); + mVScrollBar->size( mVScrollBar->size().width() + mVScrollPadding.Right, mSize.height() + mVScrollPadding.Bottom ); - mHScrollBar->Pos( mHScrollPadding.Left, mSize.height() - mHScrollBar->Size().height() + mHScrollPadding.Top ); - mHScrollBar->Size( mSize.width() - mVScrollBar->Size().width() + mHScrollPadding.Right, mHScrollBar->Size().height() + mHScrollPadding.Bottom ); + mHScrollBar->position( mHScrollPadding.Left, mSize.height() - mHScrollBar->size().height() + mHScrollPadding.Top ); + mHScrollBar->size( mSize.width() - mVScrollBar->size().width() + mHScrollPadding.Right, mHScrollBar->size().height() + mHScrollPadding.Bottom ); - if ( mContainer->IsClipped() && UI_SCROLLBAR_AUTO == mHScrollMode ) { - if ( (Int32)mMaxTextWidth <= mContainer->Size().width() ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + if ( mContainer->isClipped() && UI_SCROLLBAR_AUTO == mHScrollMode ) { + if ( (Int32)mMaxTextWidth <= mContainer->size().width() ) { + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); mHScrollInit = 0; } } - ContainerResize(); - UpdateListBoxItemsSize(); - UpdateScroll(); + containerResize(); + updateListBoxItemsSize(); + updateScroll(); } -void UIListBox::SetRowHeight() { +void UIListBox::setRowHeight() { Uint32 tOldRowHeight = mRowHeight; if ( 0 == mRowHeight ) { Uint32 FontSize = 12; - if ( NULL != UIThemeManager::instance()->DefaultFont() ) - FontSize = UIThemeManager::instance()->DefaultFont()->getFontHeight(); + if ( NULL != UIThemeManager::instance()->defaultFont() ) + FontSize = UIThemeManager::instance()->defaultFont()->getFontHeight(); - if ( NULL != mSkinState && NULL != mSkinState->GetSkin() && NULL != mSkinState->GetSkin()->Theme() && NULL != mSkinState->GetSkin()->Theme()->Font() ) - FontSize = mSkinState->GetSkin()->Theme()->Font()->getFontHeight(); + if ( NULL != mSkinState && NULL != mSkinState->getSkin() && NULL != mSkinState->getSkin()->theme() && NULL != mSkinState->getSkin()->theme()->font() ) + FontSize = mSkinState->getSkin()->theme()->font()->getFontHeight(); if ( NULL != mFont ) FontSize = mFont->getFontHeight(); @@ -317,12 +317,12 @@ void UIListBox::SetRowHeight() { } if ( tOldRowHeight != mRowHeight ) { - UpdateScroll(); - UpdateListBoxItemsSize(); + updateScroll(); + updateListBoxItemsSize(); } } -void UIListBox::FindMaxWidth() { +void UIListBox::findMaxWidth() { Uint32 size = (Uint32)mItems.size(); Int32 width; @@ -330,7 +330,7 @@ void UIListBox::FindMaxWidth() { for ( Uint32 i = 0; i < size; i++ ) { if ( NULL != mItems[i] ) - width = (Int32)mItems[i]->GetTextWidth(); + width = (Int32)mItems[i]->getTextWidth(); else width = mFont->getTextWidth( mTexts[i] ); @@ -339,52 +339,52 @@ void UIListBox::FindMaxWidth() { } } -void UIListBox::UpdateListBoxItemsSize() { +void UIListBox::updateListBoxItemsSize() { Uint32 size = (Uint32)mItems.size(); for ( Uint32 i = 0; i < size; i++ ) - ItemUpdateSize( mItems[i] ); + itemUpdateSize( mItems[i] ); } -void UIListBox::ItemUpdateSize( UIListBoxItem * Item ) { +void UIListBox::itemUpdateSize( UIListBoxItem * Item ) { if ( NULL != Item ) { - Int32 width = (Int32)Item->GetTextWidth(); + Int32 width = (Int32)Item->getTextWidth(); if ( width > (Int32)mMaxTextWidth ) mMaxTextWidth = (Uint32)width; - if ( !mHScrollBar->Visible() ) { - if ( width < mContainer->Size().width() ) - width = mContainer->Size().width(); + if ( !mHScrollBar->visible() ) { + if ( width < mContainer->size().width() ) + width = mContainer->size().width(); if ( ( mItemsNotVisible > 0 && UI_SCROLLBAR_AUTO == mVScrollMode ) || UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) - width -= mVScrollBar->Size().width(); + width -= mVScrollBar->size().width(); } else { width = mMaxTextWidth; } - Item->Size( width, mRowHeight ); + Item->size( width, mRowHeight ); } } -void UIListBox::ContainerResize() { - mContainer->Pos( mPaddingContainer.Left, mPaddingContainer.Top ); +void UIListBox::containerResize() { + mContainer->position( mPaddingContainer.Left, mPaddingContainer.Top ); - if( mHScrollBar->Visible() ) - mContainer->Size( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Top - mHScrollBar->Size().height() ); + if( mHScrollBar->visible() ) + mContainer->size( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Top - mHScrollBar->size().height() ); else - mContainer->Size( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Bottom - mPaddingContainer.Top ); + mContainer->size( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Bottom - mPaddingContainer.Top ); } -void UIListBox::CreateItemIndex( const Uint32& i ) { +void UIListBox::createItemIndex( const Uint32& i ) { if ( NULL == mItems[i] ) { - mItems[i] = CreateListBoxItem( mTexts[i] ); + mItems[i] = createListBoxItem( mTexts[i] ); - ItemUpdateSize( mItems[i] ); + itemUpdateSize( mItems[i] ); for ( std::list::iterator it = mSelected.begin(); it != mSelected.end(); it++ ) { if ( *it == i ) { - mItems[i]->Select(); + mItems[i]->select(); break; } @@ -392,7 +392,7 @@ void UIListBox::CreateItemIndex( const Uint32& i ) { } } -void UIListBox::UpdateScroll( bool FromScrollChange ) { +void UIListBox::updateScroll( bool FromScrollChange ) { if ( !mItems.size() ) return; @@ -401,76 +401,76 @@ void UIListBox::UpdateScroll( bool FromScrollChange ) { Int32 ItemPos, ItemPosMax; Int32 tHLastScroll = mHScrollInit; - Uint32 VisibleItems = mContainer->Size().height() / mRowHeight; + Uint32 VisibleItems = mContainer->size().height() / mRowHeight; mItemsNotVisible = (Int32)mItems.size() - VisibleItems; - bool wasScrollVisible = mVScrollBar->Visible(); - bool wasHScrollVisible = mHScrollBar->Visible(); + bool wasScrollVisible = mVScrollBar->visible(); + bool wasHScrollVisible = mHScrollBar->visible(); - bool Clipped = 0 != mContainer->IsClipped(); + bool Clipped = 0 != mContainer->isClipped(); if ( mItemsNotVisible <= 0 ) { if ( UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } else { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } } else { if ( UI_SCROLLBAR_AUTO == mVScrollMode || UI_SCROLLBAR_ALWAYS_ON == mVScrollMode ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } else { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } } if ( Clipped && ( UI_SCROLLBAR_AUTO == mHScrollMode || UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) ) { - if ( ( mVScrollBar->Visible() && mContainer->Size().width() - mVScrollBar->Size().width() < (Int32)mMaxTextWidth ) || - ( !mVScrollBar->Visible() && mContainer->Size().width() < (Int32)mMaxTextWidth ) ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + if ( ( mVScrollBar->visible() && mContainer->size().width() - mVScrollBar->size().width() < (Int32)mMaxTextWidth ) || + ( !mVScrollBar->visible() && mContainer->size().width() < (Int32)mMaxTextWidth ) ) { + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); - ContainerResize(); + containerResize(); Int32 ScrollH; - if ( mVScrollBar->Visible() ) - ScrollH = mMaxTextWidth - mContainer->Size().width() + mVScrollBar->Size().width(); + if ( mVScrollBar->visible() ) + ScrollH = mMaxTextWidth - mContainer->size().width() + mVScrollBar->size().width(); else - ScrollH = mMaxTextWidth - mContainer->Size().width(); + ScrollH = mMaxTextWidth - mContainer->size().width(); - Int32 HScrolleable = (Uint32)( mHScrollBar->Value() * ScrollH ); + Int32 HScrolleable = (Uint32)( mHScrollBar->value() * ScrollH ); mHScrollInit = -HScrolleable; } else { if ( UI_SCROLLBAR_AUTO == mHScrollMode ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); mHScrollInit = 0; - ContainerResize(); + containerResize(); } } } - VisibleItems = mContainer->Size().height() / mRowHeight; + VisibleItems = mContainer->size().height() / mRowHeight; mItemsNotVisible = (Uint32)mItems.size() - VisibleItems; - Int32 Scrolleable = (Int32)mItems.size() * mRowHeight - mContainer->Size().height(); - bool isScrollVisible = mVScrollBar->Visible(); - bool isHScrollVisible = mHScrollBar->Visible(); + Int32 Scrolleable = (Int32)mItems.size() * mRowHeight - mContainer->size().height(); + bool isScrollVisible = mVScrollBar->visible(); + bool isHScrollVisible = mHScrollBar->visible(); bool FirstVisible = false; if ( Clipped && mSmoothScroll ) { if ( Scrolleable >= 0 ) - RelPos = (Uint32)( mVScrollBar->Value() * Scrolleable ); + RelPos = (Uint32)( mVScrollBar->value() * Scrolleable ); else RelPos = 0; - RelPosMax = RelPos + mContainer->Size().height() + mRowHeight; + RelPosMax = RelPos + mContainer->size().height() + mRowHeight; if ( ( FromScrollChange && eeINDEX_NOT_FOUND != mLastPos && mLastPos == RelPos ) && ( tHLastScroll == mHScrollInit ) ) return; @@ -484,13 +484,13 @@ void UIListBox::UpdateScroll( bool FromScrollChange ) { if ( ( ItemPos >= (Int32)RelPos || ItemPosMax >= (Int32)RelPos ) && ( ItemPos <= (Int32)RelPosMax ) ) { if ( NULL == Item ) { - CreateItemIndex( i ); + createItemIndex( i ); Item = mItems[i]; } - Item->Pos( mHScrollInit, ItemPos - RelPos ); - Item->Enabled( true ); - Item->Visible( true ); + Item->position( mHScrollInit, ItemPos - RelPos ); + Item->enabled( true ); + Item->visible( true ); if ( !FirstVisible ) { mVisibleFirst = i; @@ -505,14 +505,14 @@ void UIListBox::UpdateScroll( bool FromScrollChange ) { if ( NULL != Item ) { if ( ( !wasScrollVisible && isScrollVisible ) || ( wasScrollVisible && !isScrollVisible ) ||( !wasHScrollVisible && isHScrollVisible ) || ( wasHScrollVisible && !isHScrollVisible ) ) - ItemUpdateSize( Item ); + itemUpdateSize( Item ); } } } else { RelPosMax = (Uint32)mItems.size(); if ( mItemsNotVisible > 0 ) { - RelPos = (Uint32)( mVScrollBar->Value() * mItemsNotVisible ); + RelPos = (Uint32)( mVScrollBar->value() * mItemsNotVisible ); RelPosMax = RelPos + VisibleItems; } @@ -527,17 +527,17 @@ void UIListBox::UpdateScroll( bool FromScrollChange ) { if ( i >= RelPos && i < RelPosMax ) { if ( NULL == Item ) { - CreateItemIndex( i ); + createItemIndex( i ); Item = mItems[i]; } if ( Clipped ) - Item->Pos( mHScrollInit, ItemPos ); + Item->position( mHScrollInit, ItemPos ); else - Item->Pos( 0, ItemPos ); + Item->position( 0, ItemPos ); - Item->Enabled( true ); - Item->Visible( true ); + Item->enabled( true ); + Item->visible( true ); if ( !FirstVisible ) { mVisibleFirst = i; @@ -552,64 +552,64 @@ void UIListBox::UpdateScroll( bool FromScrollChange ) { if ( NULL != Item ) { if ( ( !wasScrollVisible && isScrollVisible ) || ( wasScrollVisible && !isScrollVisible ) ||( !wasHScrollVisible && isHScrollVisible ) || ( wasHScrollVisible && !isHScrollVisible ) ) - ItemUpdateSize( Item ); + itemUpdateSize( Item ); } } } - if ( mHScrollBar->Visible() && !mVScrollBar->Visible() ) { - mHScrollBar->Pos( mHScrollPadding.Left, mSize.height() - mHScrollBar->Size().height() + mHScrollPadding.Top ); - mHScrollBar->Size( mSize.width() + mHScrollPadding.Right, mHScrollBar->Size().height() + mHScrollPadding.Bottom ); + if ( mHScrollBar->visible() && !mVScrollBar->visible() ) { + mHScrollBar->position( mHScrollPadding.Left, mSize.height() - mHScrollBar->size().height() + mHScrollPadding.Top ); + mHScrollBar->size( mSize.width() + mHScrollPadding.Right, mHScrollBar->size().height() + mHScrollPadding.Bottom ); } else { - mHScrollBar->Pos( mHScrollPadding.Left, mSize.height() - mHScrollBar->Size().height() + mHScrollPadding.Top ); - mHScrollBar->Size( mSize.width() - mVScrollBar->Size().width() + mHScrollPadding.Right, mHScrollBar->Size().height() + mHScrollPadding.Bottom ); + mHScrollBar->position( mHScrollPadding.Left, mSize.height() - mHScrollBar->size().height() + mHScrollPadding.Top ); + mHScrollBar->size( mSize.width() - mVScrollBar->size().width() + mHScrollPadding.Right, mHScrollBar->size().height() + mHScrollPadding.Bottom ); } } -void UIListBox::ItemKeyEvent( const UIEventKey &Event ) { - UIEventKey ItemEvent( Event.Ctrl(), UIEvent::EventOnItemKeyDown, Event.KeyCode(), Event.Char(), Event.Mod() ); - SendEvent( &ItemEvent ); +void UIListBox::itemKeyEvent( const UIEventKey &Event ) { + UIEventKey ItemEvent( Event.getControl(), UIEvent::EventOnItemKeyDown, Event.getKeyCode(), Event.getChar(), Event.getMod() ); + sendEvent( &ItemEvent ); } -void UIListBox::ItemClicked( UIListBoxItem * Item ) { +void UIListBox::itemClicked( UIListBoxItem * Item ) { UIEvent ItemEvent( Item, UIEvent::EventOnItemClicked ); - SendEvent( &ItemEvent ); + sendEvent( &ItemEvent ); - if ( !( IsMultiSelect() && UIManager::instance()->GetInput()->isKeyDown( KEY_LCTRL ) ) ) - ResetItemsStates(); + if ( !( isMultiSelect() && UIManager::instance()->getInput()->isKeyDown( KEY_LCTRL ) ) ) + resetItemsStates(); } -Uint32 UIListBox::OnSelected() { +Uint32 UIListBox::onSelected() { UIMessage tMsg( this, UIMessage::MsgSelected, 0 ); - MessagePost( &tMsg ); + messagePost( &tMsg ); - SendCommonEvent( UIEvent::EventOnItemSelected ); + sendCommonEvent( UIEvent::EventOnItemSelected ); return 1; } -void UIListBox::ResetItemsStates() { +void UIListBox::resetItemsStates() { for ( Uint32 i = 0; i < mItems.size(); i++ ) { if ( NULL != mItems[i] ) - mItems[i]->Unselect(); + mItems[i]->unselect(); } } -bool UIListBox::IsMultiSelect() const { +bool UIListBox::isMultiSelect() const { return 0 != ( mFlags & UI_MULTI_SELECT ); } -UIListBoxItem * UIListBox::GetItem( const Uint32& Index ) const { +UIListBoxItem * UIListBox::getItem( const Uint32& Index ) const { eeASSERT( Index < mItems.size() ) return mItems[ Index ]; } -UIListBoxItem * UIListBox::GetItemSelected() { +UIListBoxItem * UIListBox::getItemSelected() { if ( mSelected.size() ) { if ( NULL == mItems[ mSelected.front() ] ) - CreateItemIndex( mSelected.front() ); + createItemIndex( mSelected.front() ); return mItems[ mSelected.front() ]; } @@ -617,14 +617,14 @@ UIListBoxItem * UIListBox::GetItemSelected() { return NULL; } -Uint32 UIListBox::GetItemSelectedIndex() const { +Uint32 UIListBox::getItemSelectedIndex() const { if ( mSelected.size() ) return mSelected.front(); return eeINDEX_NOT_FOUND; } -String UIListBox::GetItemSelectedText() const { +String UIListBox::getItemSelectedText() const { String tstr; if ( mSelected.size() ) @@ -633,17 +633,17 @@ String UIListBox::GetItemSelectedText() const { return tstr; } -std::list UIListBox::GetItemsSelectedIndex() const { +std::list UIListBox::getItemsSelectedIndex() const { return mSelected; } -std::list UIListBox::GetItemsSelected() { +std::list UIListBox::getItemsSelected() { std::list tItems; std::list::iterator it; for ( it = mSelected.begin(); it != mSelected.end(); it++ ) { if ( NULL == mItems[ *it ] ) - CreateItemIndex( *it ); + createItemIndex( *it ); tItems.push_back( mItems[ *it ] ); } @@ -651,7 +651,7 @@ std::list UIListBox::GetItemsSelected() { return tItems; } -Uint32 UIListBox::GetItemIndex( UIListBoxItem * Item ) { +Uint32 UIListBox::getItemIndex( UIListBoxItem * Item ) { for ( Uint32 i = 0; i < mItems.size(); i++ ) { if ( Item == mItems[i] ) return i; @@ -660,7 +660,7 @@ Uint32 UIListBox::GetItemIndex( UIListBoxItem * Item ) { return eeINDEX_NOT_FOUND; } -Uint32 UIListBox::GetItemIndex( const String& Text ) { +Uint32 UIListBox::getItemIndex( const String& Text ) { for ( Uint32 i = 0; i < mTexts.size(); i++ ) { if ( Text == mTexts[i] ) return i; @@ -669,97 +669,97 @@ Uint32 UIListBox::GetItemIndex( const String& Text ) { return eeINDEX_NOT_FOUND; } -void UIListBox::FontColor( const ColorA& Color ) { +void UIListBox::fontColor( const ColorA& Color ) { mFontColor = Color; for ( Uint32 i = 0; i < mItems.size(); i++ ) - mItems[i]->Color( mFontColor ); + mItems[i]->color( mFontColor ); } -const ColorA& UIListBox::FontColor() const { +const ColorA& UIListBox::fontColor() const { return mFontColor; } -void UIListBox::FontOverColor( const ColorA& Color ) { +void UIListBox::fontOverColor( const ColorA& Color ) { mFontOverColor = Color; } -const ColorA& UIListBox::FontOverColor() const { +const ColorA& UIListBox::fontOverColor() const { return mFontOverColor; } -void UIListBox::FontSelectedColor( const ColorA& Color ) { +void UIListBox::fontSelectedColor( const ColorA& Color ) { mFontSelectedColor = Color; } -const ColorA& UIListBox::FontSelectedColor() const { +const ColorA& UIListBox::fontSelectedColor() const { return mFontSelectedColor; } -void UIListBox::Font( Graphics::Font * Font ) { +void UIListBox::font( Graphics::Font * Font ) { mFont = Font; for ( Uint32 i = 0; i < mItems.size(); i++ ) - mItems[i]->Font( mFont ); + mItems[i]->font( mFont ); - FindMaxWidth(); - UpdateListBoxItemsSize(); - UpdateScroll(); + findMaxWidth(); + updateListBoxItemsSize(); + updateScroll(); } -Graphics::Font * UIListBox::Font() const { +Graphics::Font * UIListBox::font() const { return mFont; } -void UIListBox::PaddingContainer( const Recti& Padding ) { +void UIListBox::paddingContainer( const Recti& Padding ) { if ( Padding != mPaddingContainer ) { mPaddingContainer = Padding; - ContainerResize(); - UpdateScroll(); + containerResize(); + updateScroll(); } } -const Recti& UIListBox::PaddingContainer() const { +const Recti& UIListBox::paddingContainer() const { return mPaddingContainer; } -void UIListBox::SmoothScroll( const bool& soft ) { +void UIListBox::smoothScroll( const bool& soft ) { if ( soft != mSmoothScroll ) { mSmoothScroll = soft; - UpdateScroll(); + updateScroll(); } } -const bool& UIListBox::SmoothScroll() const { +const bool& UIListBox::smoothScroll() const { return mSmoothScroll; } -void UIListBox::RowHeight( const Uint32& height ) { +void UIListBox::rowHeight( const Uint32& height ) { if ( mRowHeight != height ) { mRowHeight = height; - UpdateListBoxItemsSize(); - UpdateScroll(); + updateListBoxItemsSize(); + updateScroll(); } } -const Uint32& UIListBox::RowHeight() const { +const Uint32& UIListBox::rowHeight() const { return mRowHeight; } -Uint32 UIListBox::Count() { +Uint32 UIListBox::count() { return (Uint32)mItems.size(); } -void UIListBox::SetSelected( const String& Text ) { - SetSelected( GetItemIndex( Text ) ); +void UIListBox::setSelected( const String& Text ) { + setSelected( getItemIndex( Text ) ); } -void UIListBox::SetSelected( Uint32 Index ) { +void UIListBox::setSelected( Uint32 Index ) { if ( Index < mItems.size() ) { - if ( IsMultiSelect() ) { + if ( isMultiSelect() ) { for ( std::list::iterator it = mSelected.begin(); it != mSelected.end(); it++ ) { if ( *it == Index ) return; @@ -767,7 +767,7 @@ void UIListBox::SetSelected( Uint32 Index ) { } else { if ( mSelected.size() ) { if ( NULL != mItems[ mSelected.front() ] ) { - mItems[ mSelected.front() ]->Unselect(); + mItems[ mSelected.front() ]->unselect(); } mSelected.clear(); @@ -777,108 +777,108 @@ void UIListBox::SetSelected( Uint32 Index ) { mSelected.push_back( Index ); if ( NULL != mItems[ Index ] ) { - mItems[ Index ]->Select(); + mItems[ Index ]->select(); } else { - UpdateScroll(); + updateScroll(); } } } -void UIListBox::SelectPrev() { - if ( !IsMultiSelect() && mSelected.size() ) { +void UIListBox::selectPrev() { + if ( !isMultiSelect() && mSelected.size() ) { Int32 SelIndex = mSelected.front() - 1; if ( SelIndex >= 0 ) { if ( NULL == mItems[ mSelected.front() ] ) - CreateItemIndex( mSelected.front() ); + createItemIndex( mSelected.front() ); if ( NULL == mItems[ SelIndex ] ) - CreateItemIndex( SelIndex ); + createItemIndex( SelIndex ); - if ( mItems[ SelIndex ]->Pos().y < 0 ) { - mVScrollBar->Value( (Float)( SelIndex * mRowHeight ) / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ); + if ( mItems[ SelIndex ]->position().y < 0 ) { + mVScrollBar->value( (Float)( SelIndex * mRowHeight ) / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ); - mItems[ SelIndex ]->SetFocus(); + mItems[ SelIndex ]->setFocus(); } - SetSelected( SelIndex ); + setSelected( SelIndex ); } } } -void UIListBox::SelectNext() { - if ( !IsMultiSelect() && mSelected.size() ) { +void UIListBox::selectNext() { + if ( !isMultiSelect() && mSelected.size() ) { Int32 SelIndex = mSelected.front() + 1; if ( SelIndex < (Int32)mItems.size() ) { if ( NULL == mItems[ mSelected.front() ] ) - CreateItemIndex( mSelected.front() ); + createItemIndex( mSelected.front() ); if ( NULL == mItems[ SelIndex ] ) - CreateItemIndex( SelIndex ); + createItemIndex( SelIndex ); - if ( mItems[ SelIndex ]->Pos().y + (Int32)RowHeight() > mContainer->Size().height() ) { - mVScrollBar->Value( (Float)( SelIndex * mRowHeight ) / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ); + if ( mItems[ SelIndex ]->position().y + (Int32)rowHeight() > mContainer->size().height() ) { + mVScrollBar->value( (Float)( SelIndex * mRowHeight ) / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ); - mItems[ SelIndex ]->SetFocus(); + mItems[ SelIndex ]->setFocus(); } - SetSelected( SelIndex ); + setSelected( SelIndex ); } } } -Uint32 UIListBox::OnKeyDown( const UIEventKey &Event ) { - UIControlAnim::OnKeyDown( Event ); +Uint32 UIListBox::onKeyDown( const UIEventKey &Event ) { + UIControlAnim::onKeyDown( Event ); if ( !mSelected.size() || mFlags & UI_MULTI_SELECT ) return 0; if ( Sys::getTicks() - mLastTickMove > 100 ) { - if ( KEY_DOWN == Event.KeyCode() ) { + if ( KEY_DOWN == Event.getKeyCode() ) { mLastTickMove = Sys::getTicks(); - SelectNext(); - } else if ( KEY_UP == Event.KeyCode() ) { + selectNext(); + } else if ( KEY_UP == Event.getKeyCode() ) { mLastTickMove = Sys::getTicks(); - SelectPrev(); - } else if ( KEY_HOME == Event.KeyCode() ) { + selectPrev(); + } else if ( KEY_HOME == Event.getKeyCode() ) { mLastTickMove = Sys::getTicks(); if ( mSelected.front() != 0 ) { - mVScrollBar->Value( 0 ); + mVScrollBar->value( 0 ); - mItems[ 0 ]->SetFocus(); + mItems[ 0 ]->setFocus(); - SetSelected( 0 ); + setSelected( 0 ); } - } else if ( KEY_END == Event.KeyCode() ) { + } else if ( KEY_END == Event.getKeyCode() ) { mLastTickMove = Sys::getTicks(); - if ( mSelected.front() != Count() - 1 ) { - mVScrollBar->Value( 1 ); + if ( mSelected.front() != count() - 1 ) { + mVScrollBar->value( 1 ); - mItems[ Count() - 1 ]->SetFocus(); + mItems[ count() - 1 ]->setFocus(); - SetSelected( Count() - 1 ); + setSelected( count() - 1 ); } } } - ItemKeyEvent( Event ); + itemKeyEvent( Event ); return 1; } -Uint32 UIListBox::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIListBox::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgFocusLoss: { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( this != FocusCtrl && !IsParentOf( FocusCtrl ) ) { - OnComplexControlFocusLoss(); + if ( this != FocusCtrl && !isParentOf( FocusCtrl ) ) { + onComplexControlFocusLoss(); } return 1; @@ -888,127 +888,127 @@ Uint32 UIListBox::OnMessage( const UIMessage * Msg ) { return 0; } -void UIListBox::OnAlphaChange() { - UIComplexControl::OnAlphaChange(); +void UIListBox::onAlphaChange() { + UIComplexControl::onAlphaChange(); if ( mItems.size() ) { for ( Uint32 i = mVisibleFirst; i <= mVisibleLast; i++ ) { if ( NULL != mItems[i] ) - mItems[i]->Alpha( mAlpha ); + mItems[i]->alpha( mAlpha ); } } - mVScrollBar->Alpha( mAlpha ); - mHScrollBar->Alpha( mAlpha ); + mVScrollBar->alpha( mAlpha ); + mHScrollBar->alpha( mAlpha ); } -void UIListBox::VerticalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { +void UIListBox::verticalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { if ( Mode != mVScrollMode ) { mVScrollMode = Mode; - UpdateScroll(); + updateScroll(); } } -const UI_SCROLLBAR_MODE& UIListBox::VerticalScrollMode() { +const UI_SCROLLBAR_MODE& UIListBox::verticalScrollMode() { return mVScrollMode; } -void UIListBox::HorizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { +void UIListBox::horizontalScrollMode( const UI_SCROLLBAR_MODE& Mode ) { if ( Mode != mHScrollMode ) { mHScrollMode = Mode; if ( UI_SCROLLBAR_ALWAYS_ON == mHScrollMode ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); - ContainerResize(); + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); + containerResize(); } else if ( UI_SCROLLBAR_ALWAYS_OFF == mHScrollMode ) { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); - ContainerResize(); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); + containerResize(); } - UpdateScroll(); + updateScroll(); } } -const UI_SCROLLBAR_MODE& UIListBox::HorizontalScrollMode() { +const UI_SCROLLBAR_MODE& UIListBox::horizontalScrollMode() { return mHScrollMode; } -bool UIListBox::TouchDragEnable() const { +bool UIListBox::touchDragEnable() const { return 0 != ( mFlags & UI_TOUCH_DRAG_ENABLED ); } -void UIListBox::TouchDragEnable( const bool& enable ) { - WriteFlag( UI_TOUCH_DRAG_ENABLED, true == enable ); +void UIListBox::touchDragEnable( const bool& enable ) { + writeFlag( UI_TOUCH_DRAG_ENABLED, true == enable ); } -bool UIListBox::TouchDragging() const { +bool UIListBox::touchDragging() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_TOUCH_DRAGGING ); } -void UIListBox::TouchDragging( const bool& dragging ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, true == dragging ); +void UIListBox::touchDragging( const bool& dragging ) { + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, true == dragging ); } -void UIListBox::Update() { +void UIListBox::update() { if ( mEnabled && mVisible ) { if ( mFlags & UI_TOUCH_DRAG_ENABLED ) { - Uint32 Press = UIManager::instance()->PressTrigger(); - Uint32 LPress = UIManager::instance()->LastPressTrigger(); + Uint32 Press = UIManager::instance()->pressTrigger(); + Uint32 LPress = UIManager::instance()->lastPressTrigger(); if ( ( mControlFlags & UI_CTRL_FLAG_TOUCH_DRAGGING ) ) { // Mouse Not Down if ( !( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); - UIManager::instance()->SetControlDragging( false ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); + UIManager::instance()->setControlDragging( false ); return; } - Vector2i Pos( UIManager::instance()->GetMousePos() ); + Vector2i Pos( UIManager::instance()->getMousePos() ); if ( mTouchDragPoint != Pos ) { Vector2i diff = -( mTouchDragPoint - Pos ); - mVScrollBar->Value( mVScrollBar->Value() + ( -diff.y / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); + mVScrollBar->value( mVScrollBar->value() + ( -diff.y / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); - mTouchDragAcceleration += Elapsed().asMilliseconds() * diff.y * mTouchDragDeceleration; + mTouchDragAcceleration += elapsed().asMilliseconds() * diff.y * mTouchDragDeceleration; mTouchDragPoint = Pos; - UIManager::instance()->SetControlDragging( true ); + UIManager::instance()->setControlDragging( true ); } else { - mTouchDragAcceleration -= Elapsed().asMilliseconds() * mTouchDragAcceleration * 0.01f; + mTouchDragAcceleration -= elapsed().asMilliseconds() * mTouchDragAcceleration * 0.01f; } } else { // Mouse Down - if ( IsMouseOverMeOrChilds() && !mVScrollBar->IsMouseOverMeOrChilds() && !mHScrollBar->IsMouseOverMeOrChilds() ) { + if ( isMouseOverMeOrChilds() && !mVScrollBar->isMouseOverMeOrChilds() && !mHScrollBar->isMouseOverMeOrChilds() ) { if ( !( LPress & EE_BUTTON_LMASK ) && ( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 1 ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 1 ); - mTouchDragPoint = UIManager::instance()->GetMousePos(); + mTouchDragPoint = UIManager::instance()->getMousePos(); mTouchDragAcceleration = 0; } } // Mouse Up if ( ( LPress & EE_BUTTON_LMASK ) && !( Press & EE_BUTTON_LMASK ) ) { - WriteCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); - UIManager::instance()->SetControlDragging( false ); + writeCtrlFlag( UI_CTRL_FLAG_TOUCH_DRAGGING, 0 ); + UIManager::instance()->setControlDragging( false ); } // Deaccelerate if ( mTouchDragAcceleration > 0.01f || mTouchDragAcceleration < -0.01f ) { - mVScrollBar->Value( mVScrollBar->Value() + ( -mTouchDragAcceleration / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); + mVScrollBar->value( mVScrollBar->value() + ( -mTouchDragAcceleration / (Float)( ( mItems.size() - 1 ) * mRowHeight ) ) ); - mTouchDragAcceleration -= mTouchDragAcceleration * mTouchDragDeceleration * Elapsed().asMilliseconds(); + mTouchDragAcceleration -= mTouchDragAcceleration * mTouchDragDeceleration * elapsed().asMilliseconds(); } } } } - UIComplexControl::Update(); + UIComplexControl::update(); } }} diff --git a/src/eepp/ui/uilistboxitem.cpp b/src/eepp/ui/uilistboxitem.cpp index e38ba0427..e870dd182 100644 --- a/src/eepp/ui/uilistboxitem.cpp +++ b/src/eepp/ui/uilistboxitem.cpp @@ -7,120 +7,120 @@ namespace EE { namespace UI { UIListBoxItem::UIListBoxItem( const UITextBox::CreateParams& Params ) : UITextBox( Params ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UIListBoxItem::~UIListBoxItem() { - if ( UIManager::instance()->FocusControl() == this ) - mParentCtrl->SetFocus(); + if ( UIManager::instance()->focusControl() == this ) + mParentCtrl->setFocus(); - if ( UIManager::instance()->OverControl() == this ) - UIManager::instance()->OverControl( mParentCtrl ); + if ( UIManager::instance()->overControl() == this ) + UIManager::instance()->overControl( mParentCtrl ); } -Uint32 UIListBoxItem::Type() const { +Uint32 UIListBoxItem::getType() const { return UI_TYPE_LISTBOXITEM; } -bool UIListBoxItem::IsType( const Uint32& type ) const { - return UIListBoxItem::Type() == type ? true : UITextBox::IsType( type ); +bool UIListBoxItem::isType( const Uint32& type ) const { + return UIListBoxItem::getType() == type ? true : UITextBox::isType( type ); } -void UIListBoxItem::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "listboxitem" ); +void UIListBoxItem::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "listboxitem" ); } -Uint32 UIListBoxItem::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { +Uint32 UIListBoxItem::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { if ( Flags & EE_BUTTONS_LRM ) { - reinterpret_cast ( Parent()->Parent() )->ItemClicked( this ); + reinterpret_cast ( parent()->parent() )->itemClicked( this ); - Select(); + select(); } return 1; } -void UIListBoxItem::Select() { - UIListBox * LBParent = reinterpret_cast ( Parent()->Parent() ); +void UIListBoxItem::select() { + UIListBox * LBParent = reinterpret_cast ( parent()->parent() ); bool wasSelected = 0 != ( mControlFlags & UI_CTRL_FLAG_SELECTED ); - if ( LBParent->IsMultiSelect() ) { + if ( LBParent->isMultiSelect() ) { if ( !wasSelected ) { - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); mControlFlags |= UI_CTRL_FLAG_SELECTED; - LBParent->mSelected.push_back( LBParent->GetItemIndex( this ) ); + LBParent->mSelected.push_back( LBParent->getItemIndex( this ) ); - LBParent->OnSelected(); + LBParent->onSelected(); } else { mControlFlags &= ~UI_CTRL_FLAG_SELECTED; - LBParent->mSelected.remove( LBParent->GetItemIndex( this ) ); + LBParent->mSelected.remove( LBParent->getItemIndex( this ) ); } } else { - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); mControlFlags |= UI_CTRL_FLAG_SELECTED; LBParent->mSelected.clear(); - LBParent->mSelected.push_back( LBParent->GetItemIndex( this ) ); + LBParent->mSelected.push_back( LBParent->getItemIndex( this ) ); if ( !wasSelected ) { - LBParent->OnSelected(); + LBParent->onSelected(); } } } -void UIListBoxItem::Update() { - UITextBox::Update(); +void UIListBoxItem::update() { + UITextBox::update(); if ( mEnabled && mVisible ) { - UIListBox * LBParent = reinterpret_cast ( Parent()->Parent() ); - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + UIListBox * LBParent = reinterpret_cast ( parent()->parent() ); + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); - if ( IsMouseOver() ) { - if ( Flags & EE_BUTTONS_WUWD && LBParent->VerticalScrollBar()->Visible() ) { - LBParent->VerticalScrollBar()->Slider()->ManageClick( Flags ); + if ( isMouseOver() ) { + if ( Flags & EE_BUTTONS_WUWD && LBParent->verticalScrollBar()->visible() ) { + LBParent->verticalScrollBar()->getSlider()->manageClick( Flags ); } } } } -Uint32 UIListBoxItem::OnMouseExit( const Vector2i& Pos, const Uint32 Flags ) { - UIControl::OnMouseExit( Pos, Flags ); +Uint32 UIListBoxItem::onMouseExit( const Vector2i& Pos, const Uint32 Flags ) { + UIControl::onMouseExit( Pos, Flags ); if ( mControlFlags & UI_CTRL_FLAG_SELECTED ) - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); return 1; } -void UIListBoxItem::Unselect() { +void UIListBoxItem::unselect() { if ( mControlFlags & UI_CTRL_FLAG_SELECTED ) mControlFlags &= ~UI_CTRL_FLAG_SELECTED; - SetSkinState( UISkinState::StateNormal ); + setSkinState( UISkinState::StateNormal ); } -bool UIListBoxItem::Selected() const { +bool UIListBoxItem::isSelected() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_SELECTED ); } -void UIListBoxItem::OnStateChange() { - UIListBox * LBParent = reinterpret_cast ( Parent()->Parent() ); +void UIListBoxItem::onStateChange() { + UIListBox * LBParent = reinterpret_cast ( parent()->parent() ); - if ( Selected() && mSkinState->GetState() != UISkinState::StateSelected ) { - SetSkinState( UISkinState::StateSelected ); + if ( isSelected() && mSkinState->getState() != UISkinState::StateSelected ) { + setSkinState( UISkinState::StateSelected ); } - if ( mSkinState->GetState() == UISkinState::StateSelected ) { - Color( LBParent->FontSelectedColor() ); - } else if ( mSkinState->GetState() == UISkinState::StateMouseEnter ) { - Color( LBParent->FontOverColor() ); + if ( mSkinState->getState() == UISkinState::StateSelected ) { + color( LBParent->fontSelectedColor() ); + } else if ( mSkinState->getState() == UISkinState::StateMouseEnter ) { + color( LBParent->fontOverColor() ); } else { - Color( LBParent->FontColor() ); + color( LBParent->fontColor() ); } } diff --git a/src/eepp/ui/uimanager.cpp b/src/eepp/ui/uimanager.cpp index c05dfb714..2ed4c2cf7 100644 --- a/src/eepp/ui/uimanager.cpp +++ b/src/eepp/ui/uimanager.cpp @@ -30,12 +30,12 @@ UIManager::UIManager() : } UIManager::~UIManager() { - Shutdown(); + shutdown(); } -void UIManager::Init( Uint32 Flags, EE::Window::Window * window ) { +void UIManager::init( Uint32 Flags, EE::Window::Window * window ) { if ( mInit ) - Shutdown(); + shutdown(); mWindow = window; mFlags = Flags; @@ -59,19 +59,19 @@ void UIManager::Init( Uint32 Flags, EE::Window::Window * window ) { Params.DecorationAutoSize = false; mControl = eeNew( UIWindow, ( Params ) ); - mControl->Visible( true ); - mControl->Enabled( true ); - mControl->Container()->Enabled( false ); - mControl->Container()->Visible( false ); + mControl->visible( true ); + mControl->enabled( true ); + mControl->getContainer()->enabled( false ); + mControl->getContainer()->visible( false ); mFocusControl = mControl; mOverControl = mControl; - mCbId = mKM->pushCallback( cb::Make1( this, &UIManager::InputCallback ) ); - mResizeCb = mWindow->pushResizeCallback( cb::Make1( this, &UIManager::ResizeControl ) ); + mCbId = mKM->pushCallback( cb::Make1( this, &UIManager::inputCallback ) ); + mResizeCb = mWindow->pushResizeCallback( cb::Make1( this, &UIManager::resizeControl ) ); } -void UIManager::Shutdown() { +void UIManager::shutdown() { if ( mInit ) { if ( -1 != mCbId && NULL != Engine::existsSingleton() && @@ -97,114 +97,114 @@ void UIManager::Shutdown() { UIThemeManager::destroySingleton(); } -void UIManager::InputCallback( InputEvent * Event ) { +void UIManager::inputCallback( InputEvent * Event ) { switch( Event->Type ) { case InputEvent::KeyUp: - SendKeyUp( Event->key.keysym.sym, Event->key.keysym.unicode, Event->key.keysym.mod ); + sendKeyUp( Event->key.keysym.sym, Event->key.keysym.unicode, Event->key.keysym.mod ); break; case InputEvent::KeyDown: - SendKeyDown( Event->key.keysym.sym, Event->key.keysym.unicode, Event->key.keysym.mod ); + sendKeyDown( Event->key.keysym.sym, Event->key.keysym.unicode, Event->key.keysym.mod ); - CheckTabPress( Event->key.keysym.sym ); + checkTabPress( Event->key.keysym.sym ); break; } } -void UIManager::ResizeControl( EE::Window::Window * win ) { - mControl->Size( mWindow->getWidth(), mWindow->getHeight() ); - SendMsg( mControl, UIMessage::MsgWindowResize ); +void UIManager::resizeControl( EE::Window::Window * win ) { + mControl->size( mWindow->getWidth(), mWindow->getHeight() ); + sendMsg( mControl, UIMessage::MsgWindowResize ); std::list::iterator it; for ( it = mWindowsList.begin(); it != mWindowsList.end(); it++ ) { - SendMsg( *it, UIMessage::MsgWindowResize ); + sendMsg( *it, UIMessage::MsgWindowResize ); } } -void UIManager::SendKeyUp( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ) { +void UIManager::sendKeyUp( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ) { UIEventKey KeyEvent = UIEventKey( mFocusControl, UIEvent::EventKeyUp, KeyCode, Char, Mod ); UIControl * CtrlLoop = mFocusControl; while( NULL != CtrlLoop ) { - if ( CtrlLoop->Enabled() && CtrlLoop->OnKeyUp( KeyEvent ) ) + if ( CtrlLoop->enabled() && CtrlLoop->onKeyUp( KeyEvent ) ) break; - CtrlLoop = CtrlLoop->Parent(); + CtrlLoop = CtrlLoop->parent(); } } -void UIManager::SendKeyDown( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ) { +void UIManager::sendKeyDown( const Uint32& KeyCode, const Uint16& Char, const Uint32& Mod ) { UIEventKey KeyEvent = UIEventKey( mFocusControl, UIEvent::EventKeyDown, KeyCode, Char, Mod ); UIControl * CtrlLoop = mFocusControl; while( NULL != CtrlLoop ) { - if ( CtrlLoop->Enabled() && CtrlLoop->OnKeyDown( KeyEvent ) ) + if ( CtrlLoop->enabled() && CtrlLoop->onKeyDown( KeyEvent ) ) break; - CtrlLoop = CtrlLoop->Parent(); + CtrlLoop = CtrlLoop->parent(); } } -UIControl * UIManager::FocusControl() const { +UIControl * UIManager::focusControl() const { return mFocusControl; } -UIControl * UIManager::LossFocusControl() const { +UIControl * UIManager::lossFocusControl() const { return mLossFocusControl; } -void UIManager::FocusControl( UIControl * Ctrl ) { +void UIManager::focusControl( UIControl * Ctrl ) { if ( NULL != mFocusControl && NULL != Ctrl && Ctrl != mFocusControl ) { mLossFocusControl = mFocusControl; mFocusControl = Ctrl; - mLossFocusControl->OnFocusLoss(); - SendMsg( mLossFocusControl, UIMessage::MsgFocusLoss ); + mLossFocusControl->onFocusLoss(); + sendMsg( mLossFocusControl, UIMessage::MsgFocusLoss ); - mFocusControl->OnFocus(); - SendMsg( mFocusControl, UIMessage::MsgFocus ); + mFocusControl->onFocus(); + sendMsg( mFocusControl, UIMessage::MsgFocus ); } } -UIControl * UIManager::OverControl() const { +UIControl * UIManager::overControl() const { return mOverControl; } -void UIManager::OverControl( UIControl * Ctrl ) { +void UIManager::overControl( UIControl * Ctrl ) { mOverControl = Ctrl; } -void UIManager::SendMsg( UIControl * Ctrl, const Uint32& Msg, const Uint32& Flags ) { +void UIManager::sendMsg( UIControl * Ctrl, const Uint32& Msg, const Uint32& Flags ) { UIMessage tMsg( Ctrl, Msg, Flags ); - Ctrl->MessagePost( &tMsg ); + Ctrl->messagePost( &tMsg ); } -void UIManager::Update() { +void UIManager::update() { mElapsed = mWindow->elapsed(); - bool wasDraggingControl = IsControlDragging(); + bool wasDraggingControl = isControlDragging(); - mControl->Update(); + mControl->update(); - UIControl * pOver = mControl->OverFind( mKM->getMousePosf() ); + UIControl * pOver = mControl->overFind( mKM->getMousePosf() ); if ( pOver != mOverControl ) { if ( NULL != mOverControl ) { - SendMsg( mOverControl, UIMessage::MsgMouseExit ); - mOverControl->OnMouseExit( mKM->getMousePos(), 0 ); + sendMsg( mOverControl, UIMessage::MsgMouseExit ); + mOverControl->onMouseExit( mKM->getMousePos(), 0 ); } mOverControl = pOver; if ( NULL != mOverControl ) { - SendMsg( mOverControl, UIMessage::MsgMouseEnter ); - mOverControl->OnMouseEnter( mKM->getMousePos(), 0 ); + sendMsg( mOverControl, UIMessage::MsgMouseEnter ); + mOverControl->onMouseEnter( mKM->getMousePos(), 0 ); } } else { if ( NULL != mOverControl ) - mOverControl->OnMouseMove( mKM->getMousePos(), mKM->pressTrigger() ); + mOverControl->onMouseMove( mKM->getMousePos(), mKM->pressTrigger() ); } if ( mKM->pressTrigger() ) { @@ -212,8 +212,8 @@ void UIManager::Update() { FocusControl( mOverControl );*/ if ( NULL != mOverControl ) { - mOverControl->OnMouseDown( mKM->getMousePos(), mKM->pressTrigger() ); - SendMsg( mOverControl, UIMessage::MsgMouseDown, mKM->pressTrigger() ); + mOverControl->onMouseDown( mKM->getMousePos(), mKM->pressTrigger() ); + sendMsg( mOverControl, UIMessage::MsgMouseDown, mKM->pressTrigger() ); } if ( !mFirstPress ) { @@ -228,18 +228,18 @@ void UIManager::Update() { if ( NULL != mFocusControl ) { if ( !wasDraggingControl ) { if ( mOverControl != mFocusControl ) - FocusControl( mOverControl ); + focusControl( mOverControl ); - mFocusControl->OnMouseUp( mKM->getMousePos(), mKM->releaseTrigger() ); - SendMsg( mFocusControl, UIMessage::MsgMouseUp, mKM->releaseTrigger() ); + mFocusControl->onMouseUp( mKM->getMousePos(), mKM->releaseTrigger() ); + sendMsg( mFocusControl, UIMessage::MsgMouseUp, mKM->releaseTrigger() ); if ( mKM->clickTrigger() ) { // mDownControl == mOverControl && - SendMsg( mFocusControl, UIMessage::MsgClick, mKM->clickTrigger() ); - mFocusControl->OnMouseClick( mKM->getMousePos(), mKM->clickTrigger() ); + sendMsg( mFocusControl, UIMessage::MsgClick, mKM->clickTrigger() ); + mFocusControl->onMouseClick( mKM->getMousePos(), mKM->clickTrigger() ); if ( mKM->doubleClickTrigger() ) { - SendMsg( mFocusControl, UIMessage::MsgDoubleClick, mKM->doubleClickTrigger() ); - mFocusControl->OnMouseDoubleClick( mKM->getMousePos(), mKM->doubleClickTrigger() ); + sendMsg( mFocusControl, UIMessage::MsgDoubleClick, mKM->doubleClickTrigger() ); + mFocusControl->onMouseDoubleClick( mKM->getMousePos(), mKM->doubleClickTrigger() ); } } } @@ -248,121 +248,121 @@ void UIManager::Update() { mFirstPress = false; } - CheckClose(); + checkClose(); } -UIControl * UIManager::DownControl() const { +UIControl * UIManager::downControl() const { return mDownControl; } -void UIManager::Draw() { +void UIManager::draw() { GlobalBatchRenderer::instance()->draw(); - mControl->InternalDraw(); + mControl->internalDraw(); GlobalBatchRenderer::instance()->draw(); } -UIWindow * UIManager::MainControl() const { +UIWindow * UIManager::mainControl() const { return mControl; } -const Time& UIManager::Elapsed() const { +const Time& UIManager::elapsed() const { return mElapsed; } -Vector2i UIManager::GetMousePos() { +Vector2i UIManager::getMousePos() { return mKM->getMousePos(); } -Input * UIManager::GetInput() const { +Input * UIManager::getInput() const { return mKM; } -const Uint32& UIManager::PressTrigger() const { +const Uint32& UIManager::pressTrigger() const { return mKM->pressTrigger(); } -const Uint32& UIManager::LastPressTrigger() const { +const Uint32& UIManager::lastPressTrigger() const { return mKM->lastPressTrigger(); } -void UIManager::ClipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { +void UIManager::clipEnable( const Int32& x, const Int32& y, const Uint32& Width, const Uint32& Height ) { mWindow->clipPlaneEnable( x, y, Width, Height ); } -void UIManager::ClipDisable() { +void UIManager::clipDisable() { mWindow->clipPlaneDisable(); } -void UIManager::HighlightFocus( bool Highlight ) { +void UIManager::highlightFocus( bool Highlight ) { BitOp::setBitFlagValue( &mFlags, UI_MANAGER_HIGHLIGHT_FOCUS, Highlight ? 1 : 0 ); } -bool UIManager::HighlightFocus() const { +bool UIManager::highlightFocus() const { return 0 != ( mFlags & UI_MANAGER_HIGHLIGHT_FOCUS ); } -void UIManager::HighlightFocusColor( const ColorA& Color ) { +void UIManager::highlightFocusColor( const ColorA& Color ) { mHighlightFocusColor = Color; } -const ColorA& UIManager::HighlightFocusColor() const { +const ColorA& UIManager::highlightFocusColor() const { return mHighlightFocusColor; } -void UIManager::HighlightOver( bool Highlight ) { +void UIManager::highlightOver( bool Highlight ) { BitOp::setBitFlagValue( &mFlags, UI_MANAGER_HIGHLIGHT_OVER, Highlight ? 1 : 0 ); } -bool UIManager::HighlightOver() const { +bool UIManager::highlightOver() const { return 0 != ( mFlags & UI_MANAGER_HIGHLIGHT_OVER ); } -void UIManager::HighlightOverColor( const ColorA& Color ) { +void UIManager::highlightOverColor( const ColorA& Color ) { mHighlightOverColor = Color; } -const ColorA& UIManager::HighlightOverColor() const { +const ColorA& UIManager::highlightOverColor() const { return mHighlightOverColor; } -void UIManager::CheckTabPress( const Uint32& KeyCode ) { +void UIManager::checkTabPress( const Uint32& KeyCode ) { eeASSERT( NULL != mFocusControl ); if ( KeyCode == KEY_TAB ) { - UIControl * Ctrl = mFocusControl->NextComplexControl(); + UIControl * Ctrl = mFocusControl->nextComplexControl(); if ( NULL != Ctrl ) - Ctrl->SetFocus(); + Ctrl->setFocus(); } } -void UIManager::SendMouseClick( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { - SendMsg( ToCtrl, UIMessage::MsgClick, Flags ); - ToCtrl->OnMouseClick( Pos, Flags ); +void UIManager::sendMouseClick( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { + sendMsg( ToCtrl, UIMessage::MsgClick, Flags ); + ToCtrl->onMouseClick( Pos, Flags ); } -void UIManager::SendMouseUp( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { - SendMsg( ToCtrl, UIMessage::MsgMouseUp, Flags ); - ToCtrl->OnMouseUp( Pos, Flags ); +void UIManager::sendMouseUp( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { + sendMsg( ToCtrl, UIMessage::MsgMouseUp, Flags ); + ToCtrl->onMouseUp( Pos, Flags ); } -void UIManager::SendMouseDown( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { - SendMsg( ToCtrl, UIMessage::MsgMouseDown, Flags ); - ToCtrl->OnMouseDown( Pos, Flags ); +void UIManager::sendMouseDown( UIControl * ToCtrl, const Vector2i& Pos, const Uint32 Flags ) { + sendMsg( ToCtrl, UIMessage::MsgMouseDown, Flags ); + ToCtrl->onMouseDown( Pos, Flags ); } -EE::Window::Window * UIManager::GetWindow() const { +EE::Window::Window * UIManager::getWindow() const { return mWindow; } -void UIManager::SetFocusLastWindow( UIWindow * window ) { +void UIManager::setFocusLastWindow( UIWindow * window ) { if ( !mWindowsList.empty() && window != mWindowsList.front() ) { - FocusControl( mWindowsList.front() ); + focusControl( mWindowsList.front() ); } } -void UIManager::WindowAdd( UIWindow * win ) { - if ( !WindowExists( win ) ) { +void UIManager::windowAdd( UIWindow * win ) { + if ( !windowExists( win ) ) { mWindowsList.push_front( win ); } else { //! Send to front @@ -371,25 +371,25 @@ void UIManager::WindowAdd( UIWindow * win ) { } } -void UIManager::WindowRemove( UIWindow * win ) { - if ( WindowExists( win ) ) { +void UIManager::windowRemove( UIWindow * win ) { + if ( windowExists( win ) ) { mWindowsList.remove( win ); } } -bool UIManager::WindowExists( UIWindow * win ) { +bool UIManager::windowExists( UIWindow * win ) { return mWindowsList.end() != std::find( mWindowsList.begin(), mWindowsList.end(), win ); } -const bool& UIManager::IsShootingDown() const { +const bool& UIManager::isShootingDown() const { return mShootingDown; } -const Vector2i &UIManager::GetMouseDownPos() const { +const Vector2i &UIManager::getMouseDownPos() const { return mMouseDownPos; } -void UIManager::AddToCloseQueue( UIControl * Ctrl ) { +void UIManager::addToCloseQueue( UIControl * Ctrl ) { eeASSERT( NULL != Ctrl ); std::list::iterator it; @@ -398,7 +398,7 @@ void UIManager::AddToCloseQueue( UIControl * Ctrl ) { for ( it = mCloseList.begin(); it != mCloseList.end(); it++ ) { itCtrl = *it; - if ( NULL != itCtrl && itCtrl->IsParentOf( Ctrl ) ) { + if ( NULL != itCtrl && itCtrl->isParentOf( Ctrl ) ) { // If a parent will be removed, means that the control // that we are trying to queue will be removed by the father // so we skip it @@ -411,7 +411,7 @@ void UIManager::AddToCloseQueue( UIControl * Ctrl ) { for ( it = mCloseList.begin(); it != mCloseList.end(); it++ ) { itCtrl = *it; - if ( NULL != itCtrl && Ctrl->IsParentOf( itCtrl ) ) { + if ( NULL != itCtrl && Ctrl->isParentOf( itCtrl ) ) { // if the control added is parent of another control already added, // we remove the already added control because it will be deleted // by its parent @@ -432,7 +432,7 @@ void UIManager::AddToCloseQueue( UIControl * Ctrl ) { mCloseList.push_back( Ctrl ); } -void UIManager::CheckClose() { +void UIManager::checkClose() { if ( !mCloseList.empty() ) { for ( std::list::iterator it = mCloseList.begin(); it != mCloseList.end(); it++ ) { eeDelete( *it ); @@ -442,23 +442,23 @@ void UIManager::CheckClose() { } } -void UIManager::SetControlDragging( bool dragging ) { +void UIManager::setControlDragging( bool dragging ) { mControlDragging = dragging; } -const bool& UIManager::IsControlDragging() const { +const bool& UIManager::isControlDragging() const { return mControlDragging; } -void UIManager::UseGlobalCursors( const bool& use ) { +void UIManager::useGlobalCursors( const bool& use ) { mUseGlobalCursors = use; } -const bool& UIManager::UseGlobalCursors() { +const bool& UIManager::useGlobalCursors() { return mUseGlobalCursors; } -void UIManager::SetCursor( EE_CURSOR_TYPE cursor ) { +void UIManager::setCursor( EE_CURSOR_TYPE cursor ) { if ( mUseGlobalCursors ) { mWindow->getCursorManager()->set( cursor ); } diff --git a/src/eepp/ui/uimenu.cpp b/src/eepp/ui/uimenu.cpp index b0d61c8d0..0ea4ac39a 100644 --- a/src/eepp/ui/uimenu.cpp +++ b/src/eepp/ui/uimenu.cpp @@ -24,31 +24,31 @@ UIMenu::UIMenu( UIMenu::CreateParams& Params ) : mClickHide( false ), mLastTickMove( 0 ) { - OnSizeChange(); + onSizeChange(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIMenu::~UIMenu() { } -Uint32 UIMenu::Type() const { +Uint32 UIMenu::getType() const { return UI_TYPE_MENU; } -bool UIMenu::IsType( const Uint32& type ) const { - return UIMenu::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIMenu::isType( const Uint32& type ) const { + return UIMenu::getType() == type ? true : UIComplexControl::isType( type ); } -void UIMenu::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "menu" ); - DoAfterSetTheme(); +void UIMenu::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "menu" ); + doAftersetTheme(); } -void UIMenu::DoAfterSetTheme() { +void UIMenu::doAftersetTheme() { AutoPadding(); - OnSizeChange(); + onSizeChange(); } UIMenuItem * UIMenu::CreateMenuItem( const String& Text, SubTexture * Icon ) { @@ -73,9 +73,9 @@ UIMenuItem * UIMenu::CreateMenuItem( const String& Text, SubTexture * Icon ) { UIMenuItem * tCtrl = eeNew( UIMenuItem, ( Params ) ); - tCtrl->Text( Text ); - tCtrl->Visible( true ); - tCtrl->Enabled( true ); + tCtrl->text( Text ); + tCtrl->visible( true ); + tCtrl->enabled( true ); return tCtrl; } @@ -106,12 +106,12 @@ UIMenuCheckBox * UIMenu::CreateMenuCheckBox( const String& Text, const bool &Act UIMenuCheckBox * tCtrl = eeNew( UIMenuCheckBox, ( Params ) ); - tCtrl->Text( Text ); - tCtrl->Visible( true ); - tCtrl->Enabled( true ); + tCtrl->text( Text ); + tCtrl->visible( true ); + tCtrl->enabled( true ); if ( Active ) - tCtrl->Active( Active ); + tCtrl->active( Active ); return tCtrl; } @@ -143,9 +143,9 @@ UIMenuSubMenu * UIMenu::CreateSubMenu( const String& Text, SubTexture * Icon, UI UIMenuSubMenu * tCtrl = eeNew( UIMenuSubMenu, ( Params ) ); - tCtrl->Text( Text ); - tCtrl->Visible( true ); - tCtrl->Enabled( true ); + tCtrl->text( Text ); + tCtrl->visible( true ); + tCtrl->enabled( true ); return tCtrl; } @@ -155,19 +155,19 @@ Uint32 UIMenu::AddSubMenu( const String& Text, SubTexture * Icon, UIMenu * SubMe } bool UIMenu::CheckControlSize( UIControl * Control, const bool& Resize ) { - if ( Control->IsType( UI_TYPE_MENUITEM ) ) { + if ( Control->isType( UI_TYPE_MENUITEM ) ) { UIMenuItem * tItem = reinterpret_cast ( Control ); - if ( NULL != tItem->Icon() && tItem->IconHorizontalMargin() + tItem->Icon()->Size().width() > (Int32)mBiggestIcon ) { - mBiggestIcon = tItem->IconHorizontalMargin() + tItem->Icon()->Size().width(); + if ( NULL != tItem->icon() && tItem->iconHorizontalMargin() + tItem->icon()->size().width() > (Int32)mBiggestIcon ) { + mBiggestIcon = tItem->iconHorizontalMargin() + tItem->icon()->size().width(); } if ( mFlags & UI_AUTO_SIZE ) { - if ( Control->IsType( UI_TYPE_MENUSUBMENU ) ) { + if ( Control->isType( UI_TYPE_MENUSUBMENU ) ) { UIMenuSubMenu * tMenu = reinterpret_cast ( tItem ); - if ( tMenu->TextBox()->GetTextWidth() + mBiggestIcon + tMenu->Arrow()->Size().width() + mMinRightMargin > (Int32)mMaxWidth - mPadding.Left - mPadding.Right ) { - mMaxWidth = tMenu->TextBox()->GetTextWidth() + mBiggestIcon + mPadding.Left + mPadding.Right + tMenu->Arrow()->Size().width() + mMinRightMargin; + if ( tMenu->getTextBox()->getTextWidth() + mBiggestIcon + tMenu->getArrow()->size().width() + mMinRightMargin > (Int32)mMaxWidth - mPadding.Left - mPadding.Right ) { + mMaxWidth = tMenu->getTextBox()->getTextWidth() + mBiggestIcon + mPadding.Left + mPadding.Right + tMenu->getArrow()->size().width() + mMinRightMargin; if ( Resize ) { ResizeControls(); @@ -177,8 +177,8 @@ bool UIMenu::CheckControlSize( UIControl * Control, const bool& Resize ) { } } else { - if ( tItem->TextBox()->GetTextWidth() + mBiggestIcon + mMinRightMargin > (Int32)mMaxWidth - mPadding.Left - mPadding.Right ) { - mMaxWidth = tItem->TextBox()->GetTextWidth() + mBiggestIcon + mPadding.Left + mPadding.Right + mMinRightMargin; + if ( tItem->getTextBox()->getTextWidth() + mBiggestIcon + mMinRightMargin > (Int32)mMaxWidth - mPadding.Left - mPadding.Right ) { + mMaxWidth = tItem->getTextBox()->getTextWidth() + mBiggestIcon + mPadding.Left + mPadding.Right + mMinRightMargin; if ( Resize ) { ResizeControls(); @@ -194,14 +194,14 @@ bool UIMenu::CheckControlSize( UIControl * Control, const bool& Resize ) { } Uint32 UIMenu::Add( UIControl * Control ) { - if ( this != Control->Parent() ) - Control->Parent( this ); + if ( this != Control->parent() ) + Control->parent( this ); CheckControlSize( Control ); SetControlSize( Control, Count() ); - Control->Pos( mPadding.Left, mPadding.Top + mNextPosY ); + Control->position( mPadding.Left, mPadding.Top + mNextPosY ); mNextPosY += mRowHeight; @@ -213,10 +213,10 @@ Uint32 UIMenu::Add( UIControl * Control ) { } void UIMenu::SetControlSize( UIControl * Control, const Uint32& Pos ) { - if ( Control->IsType( UI_TYPE_MENUITEM ) ) { - Control->Size( mSize.width() - mPadding.Left - mPadding.Right, mRowHeight ); + if ( Control->isType( UI_TYPE_MENUITEM ) ) { + Control->size( mSize.width() - mPadding.Left - mPadding.Right, mRowHeight ); } else { - Control->Size( mSize.width() - mPadding.Left - mPadding.Right, Control->Size().height() ); + Control->size( mSize.width() - mPadding.Left - mPadding.Right, Control->size().height() ); } } @@ -228,10 +228,10 @@ Uint32 UIMenu::AddSeparator() { UISeparator * Control = eeNew( UISeparator, ( Params ) ); - Control->Visible( true ); - Control->Enabled( true ); + Control->visible( true ); + Control->enabled( true ); - mNextPosY += Control->Size().height(); + mNextPosY += Control->size().height(); mItems.push_back( Control ); @@ -247,10 +247,10 @@ UIControl * UIMenu::GetItem( const Uint32& Index ) { UIControl * UIMenu::GetItem( const String& Text ) { for ( Uint32 i = 0; i < mItems.size(); i++ ) { - if ( mItems[i]->IsType( UI_TYPE_MENUITEM ) ) { + if ( mItems[i]->isType( UI_TYPE_MENUITEM ) ) { UIMenuItem * tMenuItem = reinterpret_cast( mItems[i] ); - if ( tMenuItem->Text() == Text ) + if ( tMenuItem->text() == Text ) return tMenuItem; } } @@ -310,7 +310,7 @@ void UIMenu::Insert( const String& Text, SubTexture * Icon, const Uint32& Index void UIMenu::Insert( UIControl * Control, const Uint32& Index ) { mItems.insert( mItems.begin() + Index, Control ); - ChildAddAt( Control, Index ); + childAddAt( Control, Index ); ReposControls(); ResizeControls(); @@ -318,10 +318,10 @@ void UIMenu::Insert( UIControl * Control, const Uint32& Index ) { bool UIMenu::IsSubMenu( UIControl * Ctrl ) { for ( Uint32 i = 0; i < mItems.size(); i++ ) { - if ( mItems[i]->IsType( UI_TYPE_MENUSUBMENU ) ) { + if ( mItems[i]->isType( UI_TYPE_MENUSUBMENU ) ) { UIMenuSubMenu * tMenu = reinterpret_cast ( mItems[i] ); - if ( tMenu->SubMenu() == Ctrl ) + if ( tMenu->subMenu() == Ctrl ) return true; } } @@ -329,23 +329,23 @@ bool UIMenu::IsSubMenu( UIControl * Ctrl ) { return false; } -Uint32 UIMenu::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIMenu::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgMouseUp: { - if ( Msg->Sender()->Parent() == this && ( Msg->Flags() & EE_BUTTONS_LRM ) ) { - UIEvent ItemEvent( Msg->Sender(), UIEvent::EventOnItemClicked ); - SendEvent( &ItemEvent ); + if ( Msg->getSender()->parent() == this && ( Msg->getFlags() & EE_BUTTONS_LRM ) ) { + UIEvent ItemEvent( Msg->getSender(), UIEvent::EventOnItemClicked ); + sendEvent( &ItemEvent ); } return 1; } case UIMessage::MsgFocusLoss: { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( this != FocusCtrl && !IsParentOf( FocusCtrl ) && !IsSubMenu( FocusCtrl ) ) { - OnComplexControlFocusLoss(); + if ( this != FocusCtrl && !isParentOf( FocusCtrl ) && !IsSubMenu( FocusCtrl ) ) { + onComplexControlFocusLoss(); } return 1; @@ -355,19 +355,19 @@ Uint32 UIMenu::OnMessage( const UIMessage * Msg ) { return 0; } -void UIMenu::OnSizeChange() { +void UIMenu::onSizeChange() { if ( NULL != mFont && ( ( mFlags & UI_AUTO_SIZE ) || 0 == mRowHeight ) ) { mRowHeight = mFont->getFontHeight() + 8; } if ( 0 != mMinWidth && mSize.width() < (Int32)mMinWidth ) { - Size( mMinWidth, mNextPosY + mPadding.Top + mPadding.Bottom ); + size( mMinWidth, mNextPosY + mPadding.Top + mPadding.Bottom ); } } void UIMenu::AutoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPadding = MakePadding(); + mPadding = makePadding(); } } @@ -393,9 +393,9 @@ void UIMenu::ReposControls() { } for ( i = 0; i < mItems.size(); i++ ) { - mItems[i]->Pos( mPadding.Left, mPadding.Top + mNextPosY ); + mItems[i]->position( mPadding.Left, mPadding.Top + mNextPosY ); - mNextPosY += mItems[i]->Size().height(); + mNextPosY += mItems[i]->size().height(); } ResizeMe(); @@ -403,24 +403,24 @@ void UIMenu::ReposControls() { void UIMenu::ResizeMe() { if ( mFlags & UI_AUTO_SIZE ) { - Size( mMaxWidth, mNextPosY + mPadding.Top + mPadding.Bottom ); + size( mMaxWidth, mNextPosY + mPadding.Top + mPadding.Bottom ); } else { - Size( mSize.width(), mNextPosY + mPadding.Top + mPadding.Bottom ); + size( mSize.width(), mNextPosY + mPadding.Top + mPadding.Bottom ); } } -bool UIMenu::Show() { - Enabled( true ); - Visible( true ); +bool UIMenu::show() { + enabled( true ); + visible( true ); return true; } -bool UIMenu::Hide() { - Enabled( false ); - Visible( false ); +bool UIMenu::hide() { + enabled( false ); + visible( false ); if ( NULL != mItemSelected ) - mItemSelected->SetSkinState( UISkinState::StateNormal ); + mItemSelected->setSkinState( UISkinState::StateNormal ); mItemSelected = NULL; mItemSelectedIndex = eeINDEX_NOT_FOUND; @@ -430,18 +430,18 @@ bool UIMenu::Hide() { void UIMenu::SetItemSelected( UIControl * Item ) { if ( NULL != mItemSelected ) { - if ( mItemSelected->IsType( UI_TYPE_MENUSUBMENU ) ) { + if ( mItemSelected->isType( UI_TYPE_MENUSUBMENU ) ) { UIMenuSubMenu * tMenu = reinterpret_cast ( mItemSelected ); - if ( NULL != tMenu->SubMenu() ) - tMenu->SubMenu()->Hide(); + if ( NULL != tMenu->subMenu() ) + tMenu->subMenu()->hide(); } - mItemSelected->SetSkinState( UISkinState::StateNormal ); + mItemSelected->setSkinState( UISkinState::StateNormal ); } if ( NULL != Item ) - Item->SetSkinState( UISkinState::StateSelected ); + Item->setSkinState( UISkinState::StateSelected ); if ( mItemSelected != Item ) { mItemSelected = Item; @@ -451,7 +451,7 @@ void UIMenu::SetItemSelected( UIControl * Item ) { void UIMenu::TrySelect( UIControl * Ctrl, bool Up ) { if ( mItems.size() ) { - if ( !Ctrl->IsType( UI_TYPE_SEPARATOR ) ) { + if ( !Ctrl->isType( UI_TYPE_SEPARATOR ) ) { SetItemSelected( Ctrl ); } else { Uint32 Index = GetItemIndex( Ctrl ); @@ -460,7 +460,7 @@ void UIMenu::TrySelect( UIControl * Ctrl, bool Up ) { if ( Up ) { if ( Index > 0 ) { for ( Int32 i = (Int32)Index - 1; i >= 0; i-- ) { - if ( !mItems[i]->IsType( UI_TYPE_SEPARATOR ) ) { + if ( !mItems[i]->isType( UI_TYPE_SEPARATOR ) ) { SetItemSelected( mItems[i] ); return; } @@ -470,7 +470,7 @@ void UIMenu::TrySelect( UIControl * Ctrl, bool Up ) { SetItemSelected( mItems[ mItems.size() ] ); } else { for ( Uint32 i = Index + 1; i < mItems.size(); i++ ) { - if ( !mItems[i]->IsType( UI_TYPE_SEPARATOR ) ) { + if ( !mItems[i]->isType( UI_TYPE_SEPARATOR ) ) { SetItemSelected( mItems[i] ); return; } @@ -511,9 +511,9 @@ void UIMenu::PrevSel() { } } -Uint32 UIMenu::OnKeyDown( const UIEventKey& Event ) { +Uint32 UIMenu::onKeyDown( const UIEventKey& Event ) { if ( Sys::getTicks() - mLastTickMove > 50 ) { - switch ( Event.KeyCode() ) { + switch ( Event.getKeyCode() ) { case KEY_DOWN: mLastTickMove = Sys::getTicks(); NextSel(); @@ -525,34 +525,34 @@ Uint32 UIMenu::OnKeyDown( const UIEventKey& Event ) { break; case KEY_RIGHT: - if ( NULL != mItemSelected && ( mItemSelected->IsType( UI_TYPE_MENUSUBMENU ) ) ) { + if ( NULL != mItemSelected && ( mItemSelected->isType( UI_TYPE_MENUSUBMENU ) ) ) { UIMenuSubMenu * tMenu = reinterpret_cast ( mItemSelected ); - tMenu->ShowSubMenu(); + tMenu->showSubMenu(); } break; case KEY_LEFT: - Hide(); + hide(); break; case KEY_ESCAPE: - Hide(); + hide(); break; case KEY_RETURN: if ( NULL != mItemSelected ) { - mItemSelected->SendMouseEvent(UIEvent::EventMouseClick, UIManager::instance()->GetMousePos(), EE_BUTTONS_ALL ); + mItemSelected->sendMouseEvent(UIEvent::EventMouseClick, UIManager::instance()->getMousePos(), EE_BUTTONS_ALL ); UIMessage Msg( mItemSelected, UIMessage::MsgMouseUp, EE_BUTTONS_ALL ); - mItemSelected->MessagePost( &Msg ); + mItemSelected->messagePost( &Msg ); } break; } } - return UIComplexControl::OnKeyDown( Event ); + return UIComplexControl::onKeyDown( Event ); } const Recti& UIMenu::Padding() const { @@ -560,66 +560,66 @@ const Recti& UIMenu::Padding() const { } void UIMenu::FixMenuPos( Vector2i& Pos, UIMenu * Menu, UIMenu * Parent, UIMenuSubMenu * SubMenu ) { - eeAABB qScreen( 0.f, 0.f, UIManager::instance()->MainControl()->Size().width(), UIManager::instance()->MainControl()->Size().height() ); - eeAABB qPos( Pos.x, Pos.y, Pos.x + Menu->Size().width(), Pos.y + Menu->Size().height() ); + eeAABB qScreen( 0.f, 0.f, UIManager::instance()->mainControl()->size().width(), UIManager::instance()->mainControl()->size().height() ); + eeAABB qPos( Pos.x, Pos.y, Pos.x + Menu->size().width(), Pos.y + Menu->size().height() ); if ( NULL != Parent && NULL != SubMenu ) { Vector2i addToPos( 0, 0 ); if ( NULL != SubMenu ) { - addToPos.y = SubMenu->Size().height(); + addToPos.y = SubMenu->size().height(); } - Vector2i sPos = SubMenu->Pos(); - SubMenu->ControlToScreen( sPos ); + Vector2i sPos = SubMenu->position(); + SubMenu->controlToScreen( sPos ); - Vector2i pPos = Parent->Pos(); - Parent->ControlToScreen( pPos ); + Vector2i pPos = Parent->position(); + Parent->controlToScreen( pPos ); - eeAABB qParent( pPos.x, pPos.y, pPos.x + Parent->Size().width(), pPos.y + Parent->Size().height() ); + eeAABB qParent( pPos.x, pPos.y, pPos.x + Parent->size().width(), pPos.y + Parent->size().height() ); Pos.x = qParent.Right; Pos.y = sPos.y; qPos.Left = Pos.x; - qPos.Right = qPos.Left + Menu->Size().width(); + qPos.Right = qPos.Left + Menu->size().width(); qPos.Top = Pos.y; - qPos.Bottom = qPos.Top + Menu->Size().height(); + qPos.Bottom = qPos.Top + Menu->size().height(); if ( !qScreen.contains( qPos ) ) { - Pos.y = sPos.y + SubMenu->Size().height() - Menu->Size().height(); + Pos.y = sPos.y + SubMenu->size().height() - Menu->size().height(); qPos.Top = Pos.y; - qPos.Bottom = qPos.Top + Menu->Size().height(); + qPos.Bottom = qPos.Top + Menu->size().height(); if ( !qScreen.contains( qPos ) ) { - Pos.x = qParent.Left - Menu->Size().width(); + Pos.x = qParent.Left - Menu->size().width(); Pos.y = sPos.y; qPos.Left = Pos.x; - qPos.Right = qPos.Left + Menu->Size().width(); + qPos.Right = qPos.Left + Menu->size().width(); qPos.Top = Pos.y; - qPos.Bottom = qPos.Top + Menu->Size().height(); + qPos.Bottom = qPos.Top + Menu->size().height(); if ( !qScreen.contains( qPos ) ) { - Pos.y = sPos.y + SubMenu->Size().height() - Menu->Size().height(); + Pos.y = sPos.y + SubMenu->size().height() - Menu->size().height(); qPos.Top = Pos.y; - qPos.Bottom = qPos.Top + Menu->Size().height(); + qPos.Bottom = qPos.Top + Menu->size().height(); } } } } else { if ( !qScreen.contains( qPos ) ) { - Pos.y -= Menu->Size().height(); - qPos.Top -= Menu->Size().height(); - qPos.Bottom -= Menu->Size().height(); + Pos.y -= Menu->size().height(); + qPos.Top -= Menu->size().height(); + qPos.Bottom -= Menu->size().height(); if ( !qScreen.contains( qPos ) ) { - Pos.x -= Menu->Size().width(); - qPos.Left -= Menu->Size().width(); - qPos.Right -= Menu->Size().width(); + Pos.x -= Menu->size().width(); + qPos.Left -= Menu->size().width(); + qPos.Right -= Menu->size().width(); if ( !qScreen.contains( qPos ) ) { - Pos.y += Menu->Size().height(); - qPos.Top += Menu->Size().height(); - qPos.Bottom += Menu->Size().height(); + Pos.y += Menu->size().height(); + qPos.Top += Menu->size().height(); + qPos.Bottom += Menu->size().height(); } } } diff --git a/src/eepp/ui/uimenucheckbox.cpp b/src/eepp/ui/uimenucheckbox.cpp index 8eb771576..a7a668e82 100644 --- a/src/eepp/ui/uimenucheckbox.cpp +++ b/src/eepp/ui/uimenucheckbox.cpp @@ -9,94 +9,94 @@ UIMenuCheckBox::UIMenuCheckBox( UIMenuCheckBox::CreateParams& Params ) : mSkinActive( NULL ), mSkinInactive( NULL ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UIMenuCheckBox::~UIMenuCheckBox() { } -Uint32 UIMenuCheckBox::Type() const { +Uint32 UIMenuCheckBox::getType() const { return UI_TYPE_MENUCHECKBOX; } -bool UIMenuCheckBox::IsType( const Uint32& type ) const { - return UIMenuCheckBox::Type() == type ? true : UIMenuItem::IsType( type ); +bool UIMenuCheckBox::isType( const Uint32& type ) const { + return UIMenuCheckBox::getType() == type ? true : UIMenuItem::isType( type ); } -void UIMenuCheckBox::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "menuitem" ); +void UIMenuCheckBox::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "menuitem" ); - mSkinActive = Theme->getByName( Theme->Abbr() + "_" + "menucheckbox_active" ); - mSkinInactive = Theme->getByName( Theme->Abbr() + "_" + "menucheckbox_inactive" ); + mSkinActive = Theme->getByName( Theme->abbr() + "_" + "menucheckbox_active" ); + mSkinInactive = Theme->getByName( Theme->abbr() + "_" + "menucheckbox_inactive" ); - Active( mActive ); + active( mActive ); - DoAfterSetTheme(); + doAftersetTheme(); } -const bool& UIMenuCheckBox::Active() const { +const bool& UIMenuCheckBox::active() const { return mActive; } -const bool& UIMenuCheckBox::IsActive() const { - return Active(); +const bool& UIMenuCheckBox::isActive() const { + return active(); } -void UIMenuCheckBox::Active( const bool& active ) { +void UIMenuCheckBox::active( const bool& active ) { bool oActive = mActive; mActive = active; if ( mActive ) { if ( NULL != mSkinActive ) { - if ( mSkinState->GetState() == UISkinState::StateSelected ) - Icon( mSkinActive->GetSubTexture( UISkinState::StateMouseEnter ) ); + if ( mSkinState->getState() == UISkinState::StateSelected ) + icon( mSkinActive->getSubTexture( UISkinState::StateMouseEnter ) ); else - Icon( mSkinActive->GetSubTexture( UISkinState::StateNormal ) ); + icon( mSkinActive->getSubTexture( UISkinState::StateNormal ) ); } else - mIcon->SubTexture( NULL ); + mIcon->subTexture( NULL ); } else { if ( NULL != mSkinInactive ) - if ( mSkinState->GetState() == UISkinState::StateSelected ) - Icon( mSkinInactive->GetSubTexture( UISkinState::StateMouseEnter ) ); + if ( mSkinState->getState() == UISkinState::StateSelected ) + icon( mSkinInactive->getSubTexture( UISkinState::StateMouseEnter ) ); else - Icon( mSkinInactive->GetSubTexture( UISkinState::StateNormal ) ); + icon( mSkinInactive->getSubTexture( UISkinState::StateNormal ) ); else - mIcon->SubTexture( NULL ); + mIcon->subTexture( NULL ); } if ( oActive != active ) { - UIMenu * Menu = reinterpret_cast ( Parent() ); + UIMenu * Menu = reinterpret_cast ( parent() ); if ( !Menu->CheckControlSize( this ) ) { - if ( NULL != Icon()->SubTexture() ) { - Padding( Recti( 0, 0, 0, 0 ) ); + if ( NULL != icon()->subTexture() ) { + padding( Recti( 0, 0, 0, 0 ) ); } } - OnValueChange(); + onValueChange(); } } -void UIMenuCheckBox::SwitchActive() { - Active( !mActive ); +void UIMenuCheckBox::switchActive() { + active( !mActive ); } -Uint32 UIMenuCheckBox::OnMouseUp( const Vector2i &Pos, const Uint32 Flags ) { - UIMenuItem::OnMouseUp( Pos, Flags ); +Uint32 UIMenuCheckBox::onMouseUp( const Vector2i &Pos, const Uint32 Flags ) { + UIMenuItem::onMouseUp( Pos, Flags ); - if ( Parent()->Visible() && ( Flags & EE_BUTTONS_LRM ) ) - SwitchActive(); + if ( parent()->visible() && ( Flags & EE_BUTTONS_LRM ) ) + switchActive(); return 1; } -void UIMenuCheckBox::OnStateChange() { - UIMenuItem::OnStateChange(); +void UIMenuCheckBox::onStateChange() { + UIMenuItem::onStateChange(); - Active( mActive ); + active( mActive ); } -bool UIMenuCheckBox::InheritsFrom( const Uint32 Type ) { +bool UIMenuCheckBox::inheritsFrom( const Uint32 Type ) { if ( Type == UI_TYPE_MENUITEM ) return true; diff --git a/src/eepp/ui/uimenuitem.cpp b/src/eepp/ui/uimenuitem.cpp index 356af1df7..d448875f9 100644 --- a/src/eepp/ui/uimenuitem.cpp +++ b/src/eepp/ui/uimenuitem.cpp @@ -6,42 +6,42 @@ namespace EE { namespace UI { UIMenuItem::UIMenuItem( UIPushButton::CreateParams& Params ) : UIPushButton( Params ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UIMenuItem::~UIMenuItem() { } -Uint32 UIMenuItem::Type() const { +Uint32 UIMenuItem::getType() const { return UI_TYPE_MENUITEM; } -bool UIMenuItem::IsType( const Uint32& type ) const { - return UIMenuItem::Type() == type ? true : UIPushButton::IsType( type ); +bool UIMenuItem::isType( const Uint32& type ) const { + return UIMenuItem::getType() == type ? true : UIPushButton::isType( type ); } -void UIMenuItem::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "menuitem" ); - DoAfterSetTheme(); +void UIMenuItem::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "menuitem" ); + doAftersetTheme(); } -Uint32 UIMenuItem::OnMouseEnter( const Vector2i &Pos, const Uint32 Flags ) { - UIPushButton::OnMouseEnter( Pos, Flags ); +Uint32 UIMenuItem::onMouseEnter( const Vector2i &Pos, const Uint32 Flags ) { + UIPushButton::onMouseEnter( Pos, Flags ); - reinterpret_cast ( Parent() )->SetItemSelected( this ); + reinterpret_cast ( parent() )->SetItemSelected( this ); return 1; } -void UIMenuItem::OnStateChange() { - UIMenu * tMenu = reinterpret_cast ( Parent() ); +void UIMenuItem::onStateChange() { + UIMenu * tMenu = reinterpret_cast ( parent() ); - if ( mSkinState->GetState() == UISkinState::StateSelected ) { - mTextBox->Color( tMenu->mFontSelectedColor ); - } else if ( mSkinState->GetState() == UISkinState::StateMouseEnter ) { - mTextBox->Color( tMenu->mFontOverColor ); + if ( mSkinState->getState() == UISkinState::StateSelected ) { + mTextBox->color( tMenu->mFontSelectedColor ); + } else if ( mSkinState->getState() == UISkinState::StateMouseEnter ) { + mTextBox->color( tMenu->mFontOverColor ); } else { - mTextBox->Color( tMenu->mFontColor ); + mTextBox->color( tMenu->mFontColor ); } } diff --git a/src/eepp/ui/uimenusubmenu.cpp b/src/eepp/ui/uimenusubmenu.cpp index 1e7ce7ced..3633ecd8d 100644 --- a/src/eepp/ui/uimenusubmenu.cpp +++ b/src/eepp/ui/uimenusubmenu.cpp @@ -19,136 +19,136 @@ UIMenuSubMenu::UIMenuSubMenu( UIMenuSubMenu::CreateParams& Params ) : GfxParams.SubTexture = NULL; GfxParams.Flags = UI_AUTO_SIZE; mArrow = eeNew( UIGfx, ( GfxParams ) ); - mArrow->Visible( true ); - mArrow->Enabled( false ); + mArrow->visible( true ); + mArrow->enabled( false ); - SubMenu( Params.SubMenu ); + subMenu( Params.SubMenu ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIMenuSubMenu::~UIMenuSubMenu() { } -Uint32 UIMenuSubMenu::Type() const { +Uint32 UIMenuSubMenu::getType() const { return UI_TYPE_MENUSUBMENU; } -bool UIMenuSubMenu::IsType( const Uint32& type ) const { - return UIMenuSubMenu::Type() == type ? true : UIMenuItem::IsType( type ); +bool UIMenuSubMenu::isType( const Uint32& type ) const { + return UIMenuSubMenu::getType() == type ? true : UIMenuItem::isType( type ); } -void UIMenuSubMenu::SetTheme( UITheme * Theme ) { - UIMenuItem::SetTheme( Theme ); +void UIMenuSubMenu::setTheme( UITheme * Theme ) { + UIMenuItem::setTheme( Theme ); - mSkinArrow = Theme->getByName( Theme->Abbr() + "_" + "menuarrow" ); + mSkinArrow = Theme->getByName( Theme->abbr() + "_" + "menuarrow" ); - OnStateChange(); + onStateChange(); } -void UIMenuSubMenu::OnSizeChange() { - UIMenuItem::OnSizeChange(); +void UIMenuSubMenu::onSizeChange() { + UIMenuItem::onSizeChange(); - mArrow->Pos( Parent()->Size().width() - mArrow->Size().width() - 1, 0 ); - mArrow->CenterVertical(); + mArrow->position( parent()->size().width() - mArrow->size().width() - 1, 0 ); + mArrow->centerVertical(); } -void UIMenuSubMenu::OnStateChange() { - UIMenuItem::OnStateChange(); +void UIMenuSubMenu::onStateChange() { + UIMenuItem::onStateChange(); if ( NULL != mSkinArrow ) { - if ( mSkinState->GetState() == UISkinState::StateSelected ) - mArrow->SubTexture( mSkinArrow->GetSubTexture( UISkinState::StateMouseEnter ) ); + if ( mSkinState->getState() == UISkinState::StateSelected ) + mArrow->subTexture( mSkinArrow->getSubTexture( UISkinState::StateMouseEnter ) ); else - mArrow->SubTexture( mSkinArrow->GetSubTexture( UISkinState::StateNormal ) ); + mArrow->subTexture( mSkinArrow->getSubTexture( UISkinState::StateNormal ) ); - OnSizeChange(); + onSizeChange(); } } -void UIMenuSubMenu::SubMenu( UIMenu * SubMenu ) { +void UIMenuSubMenu::subMenu( UIMenu * SubMenu ) { if ( NULL != mSubMenu && mSubMenu != SubMenu ) { - mSubMenu->RemoveEventListener( mCbId ); - mSubMenu->RemoveEventListener( mCbId2 ); + mSubMenu->removeEventListener( mCbId ); + mSubMenu->removeEventListener( mCbId2 ); } mSubMenu = SubMenu; if ( NULL != mSubMenu ) { - mCbId = mSubMenu->AddEventListener( UIEvent::EventOnEnabledChange, cb::Make1( this, &UIMenuSubMenu::OnSubMenuFocusLoss ) ); - mCbId2 = mSubMenu->AddEventListener( UIEvent::EventOnHideByClick, cb::Make1( this, &UIMenuSubMenu::OnHideByClick ) ); + mCbId = mSubMenu->addEventListener( UIEvent::EventOnEnabledChange, cb::Make1( this, &UIMenuSubMenu::onSubMenuFocusLoss ) ); + mCbId2 = mSubMenu->addEventListener( UIEvent::EventOnHideByClick, cb::Make1( this, &UIMenuSubMenu::onHideByClick ) ); } } -UIMenu * UIMenuSubMenu::SubMenu() const { +UIMenu * UIMenuSubMenu::subMenu() const { return mSubMenu; } -Uint32 UIMenuSubMenu::OnMouseMove( const Vector2i &Pos, const Uint32 Flags ) { - UIMenuItem::OnMouseMove( Pos, Flags ); +Uint32 UIMenuSubMenu::onMouseMove( const Vector2i &Pos, const Uint32 Flags ) { + UIMenuItem::onMouseMove( Pos, Flags ); - if ( NULL != mSubMenu && !mSubMenu->Visible() ) { - mTimeOver += UIManager::instance()->Elapsed().asMilliseconds(); + if ( NULL != mSubMenu && !mSubMenu->visible() ) { + mTimeOver += UIManager::instance()->elapsed().asMilliseconds(); if ( mTimeOver >= mMaxTime ) { - ShowSubMenu(); + showSubMenu(); } } return 1; } -void UIMenuSubMenu::ShowSubMenu() { - mSubMenu->Parent( Parent()->Parent() ); +void UIMenuSubMenu::showSubMenu() { + mSubMenu->parent( parent()->parent() ); - Vector2i Pos = this->Pos(); - ControlToScreen( Pos ); - Pos.x += mSize.width() + reinterpret_cast ( Parent() )->Padding().Right; + Vector2i Pos = this->position(); + controlToScreen( Pos ); + Pos.x += mSize.width() + reinterpret_cast ( parent() )->Padding().Right; - UIMenu::FixMenuPos( Pos, mSubMenu, reinterpret_cast ( Parent() ), this ); + UIMenu::FixMenuPos( Pos, mSubMenu, reinterpret_cast ( parent() ), this ); - mSubMenu->Parent()->WorldToControl( Pos ); - mSubMenu->Pos( Pos ); + mSubMenu->parent()->worldToControl( Pos ); + mSubMenu->position( Pos ); - if ( !mSubMenu->Visible() ) { - mSubMenu->Show(); + if ( !mSubMenu->visible() ) { + mSubMenu->show(); } } -Uint32 UIMenuSubMenu::OnMouseExit( const Vector2i &Pos, const Uint32 Flags ) { - UIMenuItem::OnMouseExit( Pos, Flags ); +Uint32 UIMenuSubMenu::onMouseExit( const Vector2i &Pos, const Uint32 Flags ) { + UIMenuItem::onMouseExit( Pos, Flags ); mTimeOver = 0; return 1; } -UIGfx * UIMenuSubMenu::Arrow() const { +UIGfx * UIMenuSubMenu::getArrow() const { return mArrow; } -void UIMenuSubMenu::OnSubMenuFocusLoss( const UIEvent * Event ) { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); +void UIMenuSubMenu::onSubMenuFocusLoss( const UIEvent * Event ) { + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( Parent() != FocusCtrl && !Parent()->IsParentOf( FocusCtrl ) ) { - Parent()->SetFocus(); + if ( parent() != FocusCtrl && !parent()->isParentOf( FocusCtrl ) ) { + parent()->setFocus(); } if ( mSubMenu->mClickHide ) { - reinterpret_cast( Parent() )->Hide(); + reinterpret_cast( parent() )->hide(); mSubMenu->mClickHide = false; } } -void UIMenuSubMenu::OnHideByClick( const UIEvent * Event ) { - UIMenu * tMenu = reinterpret_cast( Parent() ); +void UIMenuSubMenu::onHideByClick( const UIEvent * Event ) { + UIMenu * tMenu = reinterpret_cast( parent() ); tMenu->mClickHide = true; - tMenu->Hide(); + tMenu->hide(); } -bool UIMenuSubMenu::InheritsFrom( const Uint32 Type ) { +bool UIMenuSubMenu::inheritsFrom( const Uint32 Type ) { if ( Type == UI_TYPE_MENUITEM ) return true; diff --git a/src/eepp/ui/uimessage.cpp b/src/eepp/ui/uimessage.cpp index 60039263f..14df4f37b 100644 --- a/src/eepp/ui/uimessage.cpp +++ b/src/eepp/ui/uimessage.cpp @@ -14,15 +14,15 @@ UIMessage::~UIMessage() { } -UIControl * UIMessage::Sender() const { +UIControl * UIMessage::getSender() const { return mCtrl; } -const Uint32& UIMessage::Msg() const { +const Uint32& UIMessage::getMsg() const { return mMsg; } -const Uint32& UIMessage::Flags() const { +const Uint32& UIMessage::getFlags() const { return mFlags; } diff --git a/src/eepp/ui/uimessagebox.cpp b/src/eepp/ui/uimessagebox.cpp index 5101be798..14fbb5186 100644 --- a/src/eepp/ui/uimessagebox.cpp +++ b/src/eepp/ui/uimessagebox.cpp @@ -8,119 +8,119 @@ UIMessageBox::UIMessageBox( const UIMessageBox::CreateParams& Params ) : mMsgBoxType( Params.Type ), mCloseWithKey( Params.CloseWithKey ) { - UITheme * Theme = UIThemeManager::instance()->DefaultTheme(); + UITheme * Theme = UIThemeManager::instance()->defaultTheme(); if ( NULL == Theme ) { UIPushButton::CreateParams ButtonParams; - ButtonParams.Parent( Container() ); + ButtonParams.Parent( getContainer() ); ButtonParams.SizeSet( 90, 22 ); - ButtonParams.PosSet( Container()->Size().width() - 96, Container()->Size().height() - ButtonParams.Size.height() - 8 ); + ButtonParams.PosSet( getContainer()->size().width() - 96, getContainer()->size().height() - ButtonParams.Size.height() - 8 ); ButtonParams.Flags = UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_VALIGN_CENTER | UI_AUTO_SIZE; mButtonOK = eeNew( UIPushButton, ( ButtonParams ) ); - mButtonOK->Visible( true ); - mButtonOK->Enabled( true ); + mButtonOK->visible( true ); + mButtonOK->enabled( true ); - ButtonParams.Pos.x = mButtonOK->Pos().x - mButtonOK->Size().width() - 8; + ButtonParams.Pos.x = mButtonOK->position().x - mButtonOK->size().width() - 8; mButtonCancel = eeNew( UIPushButton, ( ButtonParams ) ); - mButtonCancel->Visible( true ); - mButtonCancel->Enabled( true ); + mButtonCancel->visible( true ); + mButtonCancel->enabled( true ); } else { - mButtonOK = Theme->CreatePushButton( Container(), + mButtonOK = Theme->createPushButton( getContainer(), Sizei( 90, 22 ), - Vector2i( Container()->Size().width() - 96, Container()->Size().height() - 22 - 8 ), + Vector2i( getContainer()->size().width() - 96, getContainer()->size().height() - 22 - 8 ), UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_VALIGN_CENTER | UI_AUTO_SIZE ); - mButtonCancel = Theme->CreatePushButton( Container(), - mButtonOK->Size(), - Vector2i( mButtonOK->Pos().x - mButtonOK->Size().width() - 8, mButtonOK->Pos().y ), - mButtonOK->Flags() ); + mButtonCancel = Theme->createPushButton( getContainer(), + mButtonOK->size(), + Vector2i( mButtonOK->position().x - mButtonOK->size().width() - 8, mButtonOK->position().y ), + mButtonOK->flags() ); } UITextBox::CreateParams TxtParams; - TxtParams.Parent( Container() ); + TxtParams.Parent( getContainer() ); TxtParams.Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM; - TxtParams.SizeSet( Container()->Size().width(), mButtonOK->Pos().y ); + TxtParams.SizeSet( getContainer()->size().width(), mButtonOK->position().y ); mTextBox = eeNew( UITextBox, ( TxtParams ) ); - mTextBox->Visible( true ); - mTextBox->Enabled( true ); - mTextBox->Text( Params.Message ); + mTextBox->visible( true ); + mTextBox->enabled( true ); + mTextBox->text( Params.Message ); switch ( mMsgBoxType ) { case MSGBOX_OKCANCEL: { - mButtonOK->Text( "OK" ); - mButtonCancel->Text( "Cancel" ); + mButtonOK->text( "OK" ); + mButtonCancel->text( "Cancel" ); break; } case MSGBOX_YESNO: { - mButtonOK->Text( "Yes" ); - mButtonCancel->Text( "No" ); + mButtonOK->text( "Yes" ); + mButtonCancel->text( "No" ); break; } case MSGBOX_RETRYCANCEL: { - mButtonOK->Text( "Retry" ); - mButtonCancel->Text( "Cancel" ); + mButtonOK->text( "Retry" ); + mButtonCancel->text( "Cancel" ); break; } case MSGBOX_OK: { - mButtonOK->Text( "OK" ); - mButtonCancel->Visible( false ); - mButtonCancel->Enabled( false ); + mButtonOK->text( "OK" ); + mButtonCancel->visible( false ); + mButtonCancel->enabled( false ); break; } } - mButtonCancel->ToFront(); - mButtonOK->ToFront(); + mButtonCancel->toFront(); + mButtonOK->toFront(); - AutoSize(); + autoSize(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIMessageBox::~UIMessageBox() { } -void UIMessageBox::SetTheme( UITheme * Theme ) { - UIWindow::SetTheme( Theme ); +void UIMessageBox::setTheme( UITheme * Theme ) { + UIWindow::setTheme( Theme ); - if ( "Retry" != mButtonOK->Text() ) { - SubTexture * OKIcon = Theme->GetIconByName( "ok" ); - SubTexture * CancelIcon = Theme->GetIconByName( "cancel" ); + if ( "Retry" != mButtonOK->text() ) { + SubTexture * OKIcon = Theme->getIconByName( "ok" ); + SubTexture * CancelIcon = Theme->getIconByName( "cancel" ); if ( NULL != OKIcon ) { - mButtonOK->Icon( OKIcon ); + mButtonOK->icon( OKIcon ); } if ( NULL != CancelIcon ) { - mButtonCancel->Icon( CancelIcon ); + mButtonCancel->icon( CancelIcon ); } } - mButtonOK->Pos( mButtonOK->Pos().x, Container()->Size().height() - mButtonOK->Size().height() - 8 ); - mButtonCancel->Pos( mButtonCancel->Pos().x, mButtonOK->Pos().y ); + mButtonOK->position( mButtonOK->position().x, getContainer()->size().height() - mButtonOK->size().height() - 8 ); + mButtonCancel->position( mButtonCancel->position().x, mButtonOK->position().y ); } -Uint32 UIMessageBox::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIMessageBox::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - Vector2i mousei( UIManager::instance()->GetMousePos() ); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + Vector2i mousei( UIManager::instance()->getMousePos() ); Vector2f mouse( mousei.x, mousei.y ); - if ( Msg->Sender() == mButtonOK && mButtonOK->GetPolygon().pointInside( mouse ) ) { - SendCommonEvent( UIEvent::EventMsgBoxConfirmClick ); + if ( Msg->getSender() == mButtonOK && mButtonOK->getPolygon().pointInside( mouse ) ) { + sendCommonEvent( UIEvent::EventMsgBoxConfirmClick ); CloseWindow(); - } else if ( Msg->Sender() == mButtonCancel ) { + } else if ( Msg->getSender() == mButtonCancel ) { CloseWindow(); } } @@ -129,51 +129,51 @@ Uint32 UIMessageBox::OnMessage( const UIMessage * Msg ) { } } - return UIWindow::OnMessage( Msg ); + return UIWindow::onMessage( Msg ); } -UITextBox * UIMessageBox::TextBox() const { +UITextBox * UIMessageBox::getTextBox() const { return mTextBox; } -UIPushButton * UIMessageBox::ButtonOK() const { +UIPushButton * UIMessageBox::getButtonOK() const { return mButtonOK; } -UIPushButton * UIMessageBox::ButtonCancel() const { +UIPushButton * UIMessageBox::getButtonCancel() const { return mButtonCancel; } -void UIMessageBox::AutoSize() { - Sizei nSize( mTextBox->GetTextWidth() + 48, mTextBox->GetTextHeight() + mButtonOK->Size().height() + mDecoSize.height() + 8 ); +void UIMessageBox::autoSize() { + Sizei nSize( mTextBox->getTextWidth() + 48, mTextBox->getTextHeight() + mButtonOK->size().height() + mDecoSize.height() + 8 ); - if ( !( nSize.width() > Container()->Size().width() ) ) { - nSize.x = Container()->Size().width(); + if ( !( nSize.width() > getContainer()->size().width() ) ) { + nSize.x = getContainer()->size().width(); } - if ( !( nSize.height() > Container()->Size().height() ) ) { - nSize.y = Container()->Size().height(); + if ( !( nSize.height() > getContainer()->size().height() ) ) { + nSize.y = getContainer()->size().height(); } - if ( nSize.x != Container()->Size().width() || nSize.y != Container()->Size().height() ) { - Size( nSize ); + if ( nSize.x != getContainer()->size().width() || nSize.y != getContainer()->size().height() ) { + size( nSize ); mMinWindowSize = nSize; } } -Uint32 UIMessageBox::OnKeyUp( const UIEventKey & Event ) { - if ( mCloseWithKey && Event.KeyCode() == mCloseWithKey ) { +Uint32 UIMessageBox::onKeyUp( const UIEventKey & Event ) { + if ( mCloseWithKey && Event.getKeyCode() == mCloseWithKey ) { CloseWindow(); } return 1; } -bool UIMessageBox::Show() { - bool b = UIWindow::Show(); +bool UIMessageBox::show() { + bool b = UIWindow::show(); - mButtonOK->SetFocus(); + mButtonOK->setFocus(); return b; } diff --git a/src/eepp/ui/uipopupmenu.cpp b/src/eepp/ui/uipopupmenu.cpp index 3c775c979..f5708ab25 100644 --- a/src/eepp/ui/uipopupmenu.cpp +++ b/src/eepp/ui/uipopupmenu.cpp @@ -6,42 +6,42 @@ namespace EE { namespace UI { UIPopUpMenu::UIPopUpMenu( UIPopUpMenu::CreateParams Params ) : UIMenu( Params ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UIPopUpMenu::~UIPopUpMenu() { - OnClose(); + onClose(); } -Uint32 UIPopUpMenu::Type() const { +Uint32 UIPopUpMenu::getType() const { return UI_TYPE_POPUPMENU; } -bool UIPopUpMenu::IsType( const Uint32& type ) const { - return UIPopUpMenu::Type() == type ? true : UIMenu::IsType( type ); +bool UIPopUpMenu::isType( const Uint32& type ) const { + return UIPopUpMenu::getType() == type ? true : UIMenu::isType( type ); } -void UIPopUpMenu::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "popupmenu" ); - DoAfterSetTheme(); +void UIPopUpMenu::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "popupmenu" ); + doAftersetTheme(); } -bool UIPopUpMenu::Show() { - if ( !Visible() || 0.f == mAlpha ) { +bool UIPopUpMenu::show() { + if ( !visible() || 0.f == mAlpha ) { #ifdef EE_PLATFORM_TOUCH mTE.Restart(); #endif - Enabled( true ); - Visible( true ); + enabled( true ); + visible( true ); - ToFront(); + toFront(); - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - StartAlphaAnim( 255.f == mAlpha ? 0.f : mAlpha, 255.f, UIThemeManager::instance()->ControlsFadeInTime() ); + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + startAlphaAnim( 255.f == mAlpha ? 0.f : mAlpha, 255.f, UIThemeManager::instance()->controlsFadeInTime() ); } - SetFocus(); + setFocus(); return true; } @@ -49,20 +49,20 @@ bool UIPopUpMenu::Show() { return false; } -bool UIPopUpMenu::Hide() { - if ( Visible() ) { - if ( !FadingOut() ) { +bool UIPopUpMenu::hide() { + if ( visible() ) { + if ( !isFadingOut() ) { if ( NULL != mItemSelected ) - mItemSelected->SetSkinState( UISkinState::StateNormal ); + mItemSelected->setSkinState( UISkinState::StateNormal ); mItemSelected = NULL; mItemSelectedIndex = eeINDEX_NOT_FOUND; - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - DisableFadeOut( UIThemeManager::instance()->ControlsFadeOutTime() ); + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + disableFadeOut( UIThemeManager::instance()->controlsFadeOutTime() ); } else { - Enabled( false ); - Visible( false ); + enabled( false ); + visible( false ); } } @@ -72,26 +72,26 @@ bool UIPopUpMenu::Hide() { return false; } -void UIPopUpMenu::OnComplexControlFocusLoss() { - Hide(); +void UIPopUpMenu::onComplexControlFocusLoss() { + hide(); - UIMenu::OnComplexControlFocusLoss(); + UIMenu::onComplexControlFocusLoss(); } -Uint32 UIPopUpMenu::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIPopUpMenu::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgMouseUp: { #ifdef EE_PLATFORM_TOUCH if ( mTE.Elapsed().AsMilliseconds() > 250.f ) { #endif - if ( !Msg->Sender()->IsType( UI_TYPE_MENUSUBMENU ) && ( Msg->Flags() & EE_BUTTONS_LRM ) ) { - SendCommonEvent( UIEvent::EventOnHideByClick ); + if ( !Msg->getSender()->isType( UI_TYPE_MENUSUBMENU ) && ( Msg->getFlags() & EE_BUTTONS_LRM ) ) { + sendCommonEvent( UIEvent::EventOnHideByClick ); - if ( Visible() ) - UIManager::instance()->MainControl()->SetFocus(); + if ( visible() ) + UIManager::instance()->mainControl()->setFocus(); - Hide(); + hide(); } #ifdef EE_PLATFORM_TOUCH } @@ -99,7 +99,7 @@ Uint32 UIPopUpMenu::OnMessage( const UIMessage * Msg ) { } } - return UIMenu::OnMessage( Msg ); + return UIMenu::onMessage( Msg ); } }} diff --git a/src/eepp/ui/uiprogressbar.cpp b/src/eepp/ui/uiprogressbar.cpp index eb459e29c..d7c5e8c02 100644 --- a/src/eepp/ui/uiprogressbar.cpp +++ b/src/eepp/ui/uiprogressbar.cpp @@ -19,27 +19,27 @@ UIProgressBar::UIProgressBar( const UIProgressBar::CreateParams& Params ) : TxtBoxParams.PosSet( 0, 0 ); mTextBox = eeNew( UITextBox, ( TxtBoxParams ) ); - mTextBox->Enabled( false ); + mTextBox->enabled( false ); - UpdateTextBox(); + updateTextBox(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIProgressBar::~UIProgressBar() { eeSAFE_DELETE( mParallax ); } -Uint32 UIProgressBar::Type() const { +Uint32 UIProgressBar::getType() const { return UI_TYPE_PROGRESSBAR; } -bool UIProgressBar::IsType( const Uint32& type ) const { - return UIProgressBar::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIProgressBar::isType( const Uint32& type ) const { + return UIProgressBar::getType() == type ? true : UIComplexControl::isType( type ); } -void UIProgressBar::Draw() { - UIControlAnim::Draw(); +void UIProgressBar::draw() { + UIControlAnim::draw(); if ( NULL != mParallax && 0.f != mAlpha ) { ColorA C( mParallax->color() ); @@ -51,22 +51,22 @@ void UIProgressBar::Draw() { } } -void UIProgressBar::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "progressbar" ); +void UIProgressBar::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "progressbar" ); if ( mFlags & UI_AUTO_SIZE ) { - Size( mSize.x, GetSkinSize().height() ); + size( mSize.x, getSkinSize().height() ); } - UISkin * tSkin = Theme->getByName( Theme->Abbr() + "_progressbar_filler" ); + UISkin * tSkin = Theme->getByName( Theme->abbr() + "_progressbar_filler" ); if ( tSkin ) { - SubTexture * tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + SubTexture * tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { eeSAFE_DELETE( mParallax ); - Float Height = (Float)GetSkinSize().height(); + Float Height = (Float)getSkinSize().height(); if ( !mVerticalExpand ) Height = (Float)tSubTexture->realSize().height(); @@ -79,15 +79,15 @@ void UIProgressBar::SetTheme( UITheme * Theme ) { } } -Uint32 UIProgressBar::OnValueChange() { - UIControlAnim::OnValueChange(); +Uint32 UIProgressBar::onValueChange() { + UIControlAnim::onValueChange(); - OnSizeChange(); + onSizeChange(); return 1; } -void UIProgressBar::OnSizeChange() { +void UIProgressBar::onSizeChange() { if ( NULL != mParallax ) { Float Height = (Float)mSize.height(); @@ -100,89 +100,89 @@ void UIProgressBar::OnSizeChange() { mParallax->size( Sizef( ( ( mSize.width() - mFillerMargin.Left - mFillerMargin.Right ) * mProgress ) / mTotalSteps, Height - mFillerMargin.Top - mFillerMargin.Bottom ) ); } - UpdateTextBox(); + updateTextBox(); } -void UIProgressBar::Progress( Float Val ) { +void UIProgressBar::progress( Float Val ) { mProgress = Val; - OnValueChange(); - UpdateTextBox(); + onValueChange(); + updateTextBox(); } -const Float& UIProgressBar::Progress() const { +const Float& UIProgressBar::progress() const { return mProgress; } -void UIProgressBar::TotalSteps( const Float& Steps ) { +void UIProgressBar::totalSteps( const Float& Steps ) { mTotalSteps = Steps; - OnSizeChange(); - UpdateTextBox(); + onSizeChange(); + updateTextBox(); } -const Float& UIProgressBar::TotalSteps() const { +const Float& UIProgressBar::totalSteps() const { return mTotalSteps; } -void UIProgressBar::MovementSpeed( const Vector2f& Speed ) { +void UIProgressBar::movementSpeed( const Vector2f& Speed ) { mSpeed = Speed; if ( NULL != mParallax ) mParallax->speed( mSpeed ); } -const Vector2f& UIProgressBar::MovementSpeed() const { +const Vector2f& UIProgressBar::movementSpeed() const { return mSpeed; } -void UIProgressBar::VerticalExpand( const bool& VerticalExpand ) { +void UIProgressBar::verticalExpand( const bool& VerticalExpand ) { if ( VerticalExpand != mVerticalExpand ) { mVerticalExpand = VerticalExpand; - OnSizeChange(); + onSizeChange(); } } -const bool& UIProgressBar::VerticalExpand() const { +const bool& UIProgressBar::verticalExpand() const { return mVerticalExpand; } -void UIProgressBar::FillerMargin( const Rectf& margin ) { +void UIProgressBar::fillerMargin( const Rectf& margin ) { mFillerMargin = margin; - OnPosChange(); - OnSizeChange(); + onPositionChange(); + onSizeChange(); } -const Rectf& UIProgressBar::FillerMargin() const { +const Rectf& UIProgressBar::fillerMargin() const { return mFillerMargin; } -void UIProgressBar::DisplayPercent( const bool& DisplayPercent ) { +void UIProgressBar::displayPercent( const bool& DisplayPercent ) { mDisplayPercent = DisplayPercent; - UpdateTextBox(); + updateTextBox(); } -const bool& UIProgressBar::DisplayPercent() const { +const bool& UIProgressBar::displayPercent() const { return mDisplayPercent; } -void UIProgressBar::UpdateTextBox() { - mTextBox->Visible( mDisplayPercent ); - mTextBox->Size( mSize ); - mTextBox->Text( String::toStr( (Int32)( ( mProgress / mTotalSteps ) * 100.f ) ) + "%" ); +void UIProgressBar::updateTextBox() { + mTextBox->visible( mDisplayPercent ); + mTextBox->size( mSize ); + mTextBox->text( String::toStr( (Int32)( ( mProgress / mTotalSteps ) * 100.f ) ) + "%" ); } -UITextBox * UIProgressBar::TextBox() const { +UITextBox * UIProgressBar::getTextBox() const { return mTextBox; } -void UIProgressBar::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UIProgressBar::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mTextBox->Alpha( mAlpha ); + mTextBox->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uipushbutton.cpp b/src/eepp/ui/uipushbutton.cpp index 9d070725b..43c61bfc6 100644 --- a/src/eepp/ui/uipushbutton.cpp +++ b/src/eepp/ui/uipushbutton.cpp @@ -23,13 +23,13 @@ UIPushButton::UIPushButton( const UIPushButton::CreateParams& Params ) : mIcon = eeNew( UIGfx, ( GfxParams ) ); if ( Params.IconMinSize.x != 0 && Params.IconMinSize.y != 0 ) { - mIcon->Size( Params.IconMinSize ); + mIcon->size( Params.IconMinSize ); } - mIcon->Visible( true ); - mIcon->Enabled( false ); + mIcon->visible( true ); + mIcon->enabled( false ); - Icon( Params.Icon ); + icon( Params.Icon ); UITextBox::CreateParams TxtParams = Params; TxtParams.Parent( this ); @@ -42,47 +42,47 @@ UIPushButton::UIPushButton( const UIPushButton::CreateParams& Params ) : TxtParams.Flags &= ~UI_CLIP_ENABLE; mTextBox = eeNew( UITextBox, ( TxtParams ) ); - mTextBox->Visible( true ); - mTextBox->Enabled( false ); + mTextBox->visible( true ); + mTextBox->enabled( false ); if ( Params.IconAutoMargin ) mControlFlags |= UI_CTRL_FLAG_FREE_USE; - OnSizeChange(); + onSizeChange(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIPushButton::~UIPushButton() { } -Uint32 UIPushButton::Type() const { +Uint32 UIPushButton::getType() const { return UI_TYPE_PUSHBUTTON; } -bool UIPushButton::IsType( const Uint32& type ) const { - return UIPushButton::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIPushButton::isType( const Uint32& type ) const { + return UIPushButton::getType() == type ? true : UIComplexControl::isType( type ); } -void UIPushButton::OnSizeChange() { +void UIPushButton::onSizeChange() { if ( NULL != mTextBox ) { - mTextBox->Size( mSize ); - mTextBox->Pos( 0, 0 ); + mTextBox->size( mSize ); + mTextBox->position( 0, 0 ); } - mIcon->Pos( mIconSpace, 0 ); - mIcon->CenterVertical(); + mIcon->position( mIconSpace, 0 ); + mIcon->centerVertical(); if ( NULL != mTextBox ) { - switch ( FontHAlignGet( Flags() ) ) { + switch ( FontHAlignGet( flags() ) ) { case UI_HALIGN_LEFT: - mTextBox->Pos( mIcon->Pos().x + mIcon->Size().width(), 0 ); - mTextBox->Size( mSize.width() - mIcon->Pos().x + mIcon->Size().width(), mSize.height() ); + mTextBox->position( mIcon->position().x + mIcon->size().width(), 0 ); + mTextBox->size( mSize.width() - mIcon->position().x + mIcon->size().width(), mSize.height() ); break; case UI_HALIGN_CENTER: - if ( NULL != mIcon->SubTexture() ) { - if ( mIcon->Pos().x + mIcon->Size().width() >= mTextBox->AlignOffset().x ) { - mTextBox->Pos( mIcon->Pos().x + mIcon->Size().width() + 1 - mTextBox->AlignOffset().x, mTextBox->Pos().y ); + if ( NULL != mIcon->subTexture() ) { + if ( mIcon->position().x + mIcon->size().width() >= mTextBox->alignOffset().x ) { + mTextBox->position( mIcon->position().x + mIcon->size().width() + 1 - mTextBox->alignOffset().x, mTextBox->position().y ); } } @@ -90,8 +90,8 @@ void UIPushButton::OnSizeChange() { } } - if ( NULL != mTextBox && 0 == mTextBox->Text().size() ) { - mIcon->Center(); + if ( NULL != mTextBox && 0 == mTextBox->text().size() ) { + mIcon->center(); } /** Auto Size only for height? May be set another flag to this... */ @@ -100,14 +100,14 @@ void UIPushButton::OnSizeChange() { if ( NULL != mTextBox ) { Recti P = MakePadding(); - mSize.Height( mIcon->Size().height() + P.Top + P.Bottom ); + mSize.Height( mIcon->size().height() + P.Top + P.Bottom ); if ( 0 == mTextBox->Text().size() ) { - mSize.Width ( mIcon->Size().width() + P.Left + P.Right ); + mSize.Width ( mIcon->size().width() + P.Left + P.Right ); mIcon->Center(); } else { - mSize.Width( mIconSpace + mIcon->Pos().x + mIcon->Size().width() + mTextBox->Size().width() ); + mSize.Width( mIconSpace + mIcon->position(.x + mIcon->size().width() + mTextBox->size().width() ); if ( mSize.Height() < P.Top + P.Bottom + mTextBox->GetTextHeight() ) mSize.Height( P.Top + P.Bottom + mTextBox->GetTextHeight() ); @@ -121,127 +121,127 @@ void UIPushButton::OnSizeChange() { */ } -void UIPushButton::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "button" ); +void UIPushButton::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "button" ); - DoAfterSetTheme(); + doAftersetTheme(); } -void UIPushButton::DoAfterSetTheme() { - if ( NULL != mTextBox && NULL == mTextBox->Font() && NULL != mSkinState && NULL != mSkinState->GetSkin() && NULL != mSkinState->GetSkin()->Theme() && NULL != mSkinState->GetSkin()->Theme()->Font() ) - mTextBox->Font( mSkinState->GetSkin()->Theme()->Font() ); +void UIPushButton::doAftersetTheme() { + if ( NULL != mTextBox && NULL == mTextBox->font() && NULL != mSkinState && NULL != mSkinState->getSkin() && NULL != mSkinState->getSkin()->theme() && NULL != mSkinState->getSkin()->theme()->font() ) + mTextBox->font( mSkinState->getSkin()->theme()->font() ); if ( mControlFlags & UI_CTRL_FLAG_FREE_USE ) { - Recti RMargin = MakePadding( true, false, false, false, true ); + Recti RMargin = makePadding( true, false, false, false, true ); mIconSpace = RMargin.Left; } if ( mFlags & UI_AUTO_SIZE ) { - mSize.height( GetSkinSize().height() ); + mSize.height( getSkinSize().height() ); } - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UIPushButton::AutoPadding() { +void UIPushButton::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - Padding( MakePadding( true, false, true, false ) ); + padding( makePadding( true, false, true, false ) ); } } -void UIPushButton::Icon( SubTexture * Icon ) { - mIcon->SubTexture( Icon ); - OnSizeChange(); +void UIPushButton::icon( SubTexture * Icon ) { + mIcon->subTexture( Icon ); + onSizeChange(); } -UIGfx * UIPushButton::Icon() const { +UIGfx * UIPushButton::icon() const { return mIcon; } -void UIPushButton::Text( const String& text ) { - mTextBox->Text( text ); - OnSizeChange(); +void UIPushButton::text( const String& text ) { + mTextBox->text( text ); + onSizeChange(); } -const String& UIPushButton::Text() { - return mTextBox->Text(); +const String& UIPushButton::text() { + return mTextBox->text(); } -void UIPushButton::Padding( const Recti& padding ) { - mTextBox->Padding( padding ); +void UIPushButton::padding( const Recti& padding ) { + mTextBox->padding( padding ); } -const Recti& UIPushButton::Padding() const { - return mTextBox->Padding(); +const Recti& UIPushButton::padding() const { + return mTextBox->padding(); } -void UIPushButton::IconHorizontalMargin( Int32 margin ) { +void UIPushButton::iconHorizontalMargin( Int32 margin ) { mIconSpace = margin; - OnSizeChange(); + onSizeChange(); } -const Int32& UIPushButton::IconHorizontalMargin() const { +const Int32& UIPushButton::iconHorizontalMargin() const { return mIconSpace; } -UITextBox * UIPushButton::TextBox() const { +UITextBox * UIPushButton::getTextBox() const { return mTextBox; } -void UIPushButton::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UIPushButton::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mIcon->Alpha( mAlpha ); - mTextBox->Alpha( mAlpha ); + mIcon->alpha( mAlpha ); + mTextBox->alpha( mAlpha ); } -void UIPushButton::OnStateChange() { - if ( mSkinState->GetState() == UISkinState::StateMouseEnter ) { - mTextBox->Color( mFontOverColor ); +void UIPushButton::onStateChange() { + if ( mSkinState->getState() == UISkinState::StateMouseEnter ) { + mTextBox->color( mFontOverColor ); } else { - mTextBox->Color( mFontColor ); + mTextBox->color( mFontColor ); } - mTextBox->Alpha( mAlpha ); + mTextBox->alpha( mAlpha ); } -Uint32 UIPushButton::OnKeyDown( const UIEventKey& Event ) { - if ( Event.KeyCode() == KEY_RETURN ) { +Uint32 UIPushButton::onKeyDown( const UIEventKey& Event ) { + if ( Event.getKeyCode() == KEY_RETURN ) { UIMessage Msg( this, UIMessage::MsgClick, EE_BUTTON_LMASK ); - MessagePost( &Msg ); - OnMouseClick( Vector2i(0,0), EE_BUTTON_LMASK ); + messagePost( &Msg ); + onMouseClick( Vector2i(0,0), EE_BUTTON_LMASK ); - SetSkinState( UISkinState::StateMouseDown ); + setSkinState( UISkinState::StateMouseDown ); } - return UIComplexControl::OnKeyDown( Event ); + return UIComplexControl::onKeyDown( Event ); } -Uint32 UIPushButton::OnKeyUp( const UIEventKey& Event ) { - if ( Event.KeyCode() == KEY_RETURN ) { - SetPrevSkinState(); +Uint32 UIPushButton::onKeyUp( const UIEventKey& Event ) { + if ( Event.getKeyCode() == KEY_RETURN ) { + setPrevSkinState(); } - return UIComplexControl::OnKeyUp( Event ); + return UIComplexControl::onKeyUp( Event ); } -const ColorA& UIPushButton::FontColor() const { +const ColorA& UIPushButton::fontColor() const { return mFontColor; } -void UIPushButton::FontColor( const ColorA& color ) { +void UIPushButton::fontColor( const ColorA& color ) { mFontColor = color; - OnStateChange(); + onStateChange(); } -const ColorA& UIPushButton::FontOverColor() const { +const ColorA& UIPushButton::fontOverColor() const { return mFontOverColor; } -void UIPushButton::FontOverColor( const ColorA& color ) { +void UIPushButton::fontOverColor( const ColorA& color ) { mFontOverColor = color; - OnStateChange(); + onStateChange(); } }} diff --git a/src/eepp/ui/uiradiobutton.cpp b/src/eepp/ui/uiradiobutton.cpp index 48818585a..0bafc5c08 100644 --- a/src/eepp/ui/uiradiobutton.cpp +++ b/src/eepp/ui/uiradiobutton.cpp @@ -18,90 +18,90 @@ UIRadioButton::UIRadioButton( const UITextBox::CreateParams& Params ) : ButtonParams.Size = Sizei( 16, 16 ); mActiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); - mActiveButton->Visible( false ); - mActiveButton->Enabled( true ); + mActiveButton->visible( false ); + mActiveButton->enabled( true ); mInactiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); - mInactiveButton->Visible( true ); - mInactiveButton->Enabled( true ); + mInactiveButton->visible( true ); + mInactiveButton->enabled( true ); - Padding( Recti(0,0,0,0) ); + padding( Recti(0,0,0,0) ); - AutoActivate(); + autoActivate(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIRadioButton::~UIRadioButton() { } -Uint32 UIRadioButton::Type() const { +Uint32 UIRadioButton::getType() const { return UI_TYPE_RADIOBUTTON; } -bool UIRadioButton::IsType( const Uint32& type ) const { - return UIRadioButton::Type() == type ? true : UITextBox::IsType( type ); +bool UIRadioButton::isType( const Uint32& type ) const { + return UIRadioButton::getType() == type ? true : UITextBox::isType( type ); } -void UIRadioButton::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "radiobutton" ); +void UIRadioButton::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "radiobutton" ); - mActiveButton->SetThemeControl ( Theme, "radiobutton_active" ); - mInactiveButton->SetThemeControl( Theme, "radiobutton_inactive" ); + mActiveButton->setThemeControl ( Theme, "radiobutton_active" ); + mInactiveButton->setThemeControl( Theme, "radiobutton_inactive" ); SubTexture * tSubTexture = NULL; - UISkin * tSkin = mActiveButton->GetSkin(); + UISkin * tSkin = mActiveButton->getSkin(); if ( tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mActiveButton->Size( tSubTexture->realSize() ); - mActiveButton->CenterVertical(); + mActiveButton->size( tSubTexture->realSize() ); + mActiveButton->centerVertical(); } } - tSkin = mInactiveButton->GetSkin(); + tSkin = mInactiveButton->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mInactiveButton->Size( tSubTexture->realSize() ); - mInactiveButton->CenterVertical(); + mInactiveButton->size( tSubTexture->realSize() ); + mInactiveButton->centerVertical(); } } - Padding( Recti(0,0,0,0) ); + padding( Recti(0,0,0,0) ); } -void UIRadioButton::AutoSize() { - UITextBox::AutoSize(); +void UIRadioButton::autoSize() { + UITextBox::autoSize(); if ( mFlags & UI_AUTO_SIZE ) { - mActiveButton->CenterVertical(); - mInactiveButton->CenterVertical(); + mActiveButton->centerVertical(); + mInactiveButton->centerVertical(); - mSize.width( (int)mTextCache->getTextWidth() + mActiveButton->Size().width() ); + mSize.width( (int)mTextCache->getTextWidth() + mActiveButton->size().width() ); } } -void UIRadioButton::OnSizeChange() { - UITextBox::OnSizeChange(); +void UIRadioButton::onSizeChange() { + UITextBox::onSizeChange(); - mActiveButton->CenterVertical(); - mInactiveButton->CenterVertical(); + mActiveButton->centerVertical(); + mInactiveButton->centerVertical(); } -Uint32 UIRadioButton::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIRadioButton::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - SwitchState(); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + switchState(); } - if ( Msg->Sender() == mActiveButton || Msg->Sender() == mInactiveButton ) { - SendMouseEvent( UIEvent::EventMouseClick, UIManager::instance()->GetMousePos(), UIManager::instance()->PressTrigger() ); + if ( Msg->getSender() == mActiveButton || Msg->getSender() == mInactiveButton ) { + sendMouseEvent( UIEvent::EventMouseClick, UIManager::instance()->getMousePos(), UIManager::instance()->pressTrigger() ); } return 1; @@ -111,130 +111,130 @@ Uint32 UIRadioButton::OnMessage( const UIMessage * Msg ) { return 0; } -void UIRadioButton::SwitchState() { - Active( !mActive ); +void UIRadioButton::switchState() { + active( !mActive ); } -void UIRadioButton::Active( const bool& active ) { +void UIRadioButton::active( const bool& active ) { if ( !active ) { - if ( CheckActives() ) { - mActiveButton->Visible( false ); - mInactiveButton->Visible( true ); + if ( checkActives() ) { + mActiveButton->visible( false ); + mInactiveButton->visible( true ); mActive = false; - OnValueChange(); + onValueChange(); } } else { - mActiveButton->Visible( true ); - mInactiveButton->Visible( false ); + mActiveButton->visible( true ); + mInactiveButton->visible( false ); mActive = true; - OnValueChange(); + onValueChange(); } if ( active && NULL != mParentCtrl ) { - UIControl * tChild = mParentCtrl->ChildGetFirst(); + UIControl * tChild = mParentCtrl->childGetFirst(); while ( NULL != tChild ) { - if ( tChild->IsType( UI_TYPE_RADIOBUTTON ) ) { + if ( tChild->isType( UI_TYPE_RADIOBUTTON ) ) { if ( tChild != this ) { UIRadioButton * tRB = reinterpret_cast ( tChild ); - if ( tRB->Active() ) - tRB->Active( false ); + if ( tRB->active() ) + tRB->active( false ); } } - tChild = tChild->NextGet(); + tChild = tChild->nextGet(); } } } -bool UIRadioButton::CheckActives() { +bool UIRadioButton::checkActives() { if ( NULL != mParentCtrl ) { - UIControl * tChild = mParentCtrl->ChildGetFirst(); + UIControl * tChild = mParentCtrl->childGetFirst(); while ( NULL != tChild ) { - if ( tChild->IsType( UI_TYPE_RADIOBUTTON ) ) { + if ( tChild->isType( UI_TYPE_RADIOBUTTON ) ) { if ( tChild != this ) { UIRadioButton * tRB = reinterpret_cast ( tChild ); - if ( tRB->Active() ) + if ( tRB->active() ) return true; } } - tChild = tChild->NextGet(); + tChild = tChild->nextGet(); } } return false; } -void UIRadioButton::AutoActivate() { +void UIRadioButton::autoActivate() { eeASSERT( NULL != mParentCtrl ); if ( NULL != mParentCtrl ) { - UIControl * tChild = mParentCtrl->ChildGetFirst(); + UIControl * tChild = mParentCtrl->childGetFirst(); while ( NULL != tChild ) { - if ( tChild->IsType( UI_TYPE_RADIOBUTTON ) ) { + if ( tChild->isType( UI_TYPE_RADIOBUTTON ) ) { if ( tChild != this ) { UIRadioButton * tRB = reinterpret_cast ( tChild ); - if ( tRB->Active() ) { + if ( tRB->active() ) { return; } } } - tChild = tChild->NextGet(); + tChild = tChild->nextGet(); } } - Active( true ); + active( true ); } -const bool& UIRadioButton::Active() const { +const bool& UIRadioButton::active() const { return mActive; } -const bool& UIRadioButton::IsActive() const { - return Active(); +const bool& UIRadioButton::isActive() const { + return active(); } -void UIRadioButton::Padding( const Recti& padding ) { +void UIRadioButton::padding( const Recti& padding ) { mPadding = padding; - mPadding.Left = mPadding.Left + mActiveButton->Size().width(); + mPadding.Left = mPadding.Left + mActiveButton->size().width(); } -UIControlAnim * UIRadioButton::ActiveButton() const { +UIControlAnim * UIRadioButton::activeButton() const { return mActiveButton; } -UIControlAnim * UIRadioButton::InactiveButton() const { +UIControlAnim * UIRadioButton::inactiveButton() const { return mInactiveButton; } -Uint32 UIRadioButton::OnKeyDown( const UIEventKey& Event ) { - if ( Event.KeyCode() == KEY_SPACE ) { +Uint32 UIRadioButton::onKeyDown( const UIEventKey& Event ) { + if ( Event.getKeyCode() == KEY_SPACE ) { if ( Sys::getTicks() - mLastTick > 250 ) { mLastTick = Sys::getTicks(); - Active( true ); + active( true ); } } - return UITextBox::OnKeyDown( Event ); + return UITextBox::onKeyDown( Event ); } -void UIRadioButton::OnAlphaChange() { - UITextBox::OnAlphaChange(); +void UIRadioButton::onAlphaChange() { + UITextBox::onAlphaChange(); - mActiveButton->Alpha( mAlpha ); - mInactiveButton->Alpha( mAlpha ); + mActiveButton->alpha( mAlpha ); + mInactiveButton->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp index 409140778..16649fbe9 100644 --- a/src/eepp/ui/uiscrollbar.cpp +++ b/src/eepp/ui/uiscrollbar.cpp @@ -14,10 +14,10 @@ UIScrollBar::UIScrollBar( const UIScrollBar::CreateParams& Params ) : mBtnDown = eeNew( UIControlAnim, ( CParams ) ); mBtnUp = eeNew( UIControlAnim, ( CParams ) ); - mBtnDown->Visible( true ); - mBtnDown->Enabled( true ); - mBtnUp->Visible( true ); - mBtnUp->Enabled( true ); + mBtnDown->visible( true ); + mBtnDown->enabled( true ); + mBtnUp->visible( true ); + mBtnUp->enabled( true ); UISlider::CreateParams SParams; SParams.Background = Params.Background; @@ -32,146 +32,146 @@ UIScrollBar::UIScrollBar( const UIScrollBar::CreateParams& Params ) : SParams.ExpandBackground = true; mSlider = eeNew( UISlider, ( SParams ) ); - mSlider->Visible( true ); - mSlider->Enabled( true ); + mSlider->visible( true ); + mSlider->enabled( true ); - mSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIScrollBar::OnValueChangeCb ) ); + mSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UIScrollBar::onValueChangeCb ) ); - AdjustChilds(); + adjustChilds(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIScrollBar::~UIScrollBar() { } -Uint32 UIScrollBar::Type() const { +Uint32 UIScrollBar::getType() const { return UI_TYPE_SCROLLBAR; } -bool UIScrollBar::IsType( const Uint32& type ) const { - return UIScrollBar::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIScrollBar::isType( const Uint32& type ) const { + return UIScrollBar::getType() == type ? true : UIComplexControl::isType( type ); } -void UIScrollBar::SetTheme( UITheme * Theme ) { - if ( !IsVertical() ) { - UIControl::SetThemeControl( Theme, "hscrollbar" ); - mSlider->SetThemeControl( Theme, "hscrollbar_slider" ); - mSlider->GetBackSlider()->SetThemeControl( Theme, "hscrollbar_bg" ); - mSlider->GetSliderButton()->SetThemeControl( Theme, "hscrollbar_button" ); - mBtnUp->SetThemeControl( Theme, "hscrollbar_btnup" ); - mBtnDown->SetThemeControl( Theme, "hscrollbar_btndown" ); +void UIScrollBar::setTheme( UITheme * Theme ) { + if ( !isVertical() ) { + UIControl::setThemeControl( Theme, "hscrollbar" ); + mSlider->setThemeControl( Theme, "hscrollbar_slider" ); + mSlider->getBackSlider()->setThemeControl( Theme, "hscrollbar_bg" ); + mSlider->getSliderButton()->setThemeControl( Theme, "hscrollbar_button" ); + mBtnUp->setThemeControl( Theme, "hscrollbar_btnup" ); + mBtnDown->setThemeControl( Theme, "hscrollbar_btndown" ); } else { - UIControl::SetThemeControl( Theme, "vscrollbar" ); - mSlider->SetThemeControl( Theme, "vscrollbar_slider" ); - mSlider->GetBackSlider()->SetThemeControl( Theme, "vscrollbar_bg" ); - mSlider->GetSliderButton()->SetThemeControl( Theme, "vscrollbar_button" ); - mBtnUp->SetThemeControl( Theme, "vscrollbar_btnup" ); - mBtnDown->SetThemeControl( Theme, "vscrollbar_btndown" ); + UIControl::setThemeControl( Theme, "vscrollbar" ); + mSlider->setThemeControl( Theme, "vscrollbar_slider" ); + mSlider->getBackSlider()->setThemeControl( Theme, "vscrollbar_bg" ); + mSlider->getSliderButton()->setThemeControl( Theme, "vscrollbar_button" ); + mBtnUp->setThemeControl( Theme, "vscrollbar_btnup" ); + mBtnDown->setThemeControl( Theme, "vscrollbar_btndown" ); } SubTexture * tSubTexture = NULL; UISkin * tSkin = NULL; - tSkin = mBtnUp->GetSkin(); + tSkin = mBtnUp->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mBtnUp->Size( tSubTexture->realSize() ); + mBtnUp->size( tSubTexture->realSize() ); } } - tSkin = mBtnDown->GetSkin(); + tSkin = mBtnDown->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mBtnDown->Size( tSubTexture->realSize() ); + mBtnDown->size( tSubTexture->realSize() ); } } if ( mFlags & UI_AUTO_SIZE ) { - tSkin = mSlider->GetBackSlider()->GetSkin(); + tSkin = mSlider->getBackSlider()->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - if ( mSlider->IsVertical() ) { - mSlider->Size( tSubTexture->realSize().width() , mSize.height() ); - Size( tSubTexture->realSize().width() , mSize.height() ); + if ( mSlider->isVertical() ) { + mSlider->size( tSubTexture->realSize().width() , mSize.height() ); + size( tSubTexture->realSize().width() , mSize.height() ); mMinControlSize.x = mSize.width(); } else { - mSlider->Size( mSize.width(), tSubTexture->realSize().height() ); - Size( mSize.width(), tSubTexture->realSize().height() ); + mSlider->size( mSize.width(), tSubTexture->realSize().height() ); + size( mSize.width(), tSubTexture->realSize().height() ); mMinControlSize.y = mSize.height(); } } } } - AdjustChilds(); + adjustChilds(); - mSlider->AdjustChilds(); + mSlider->adjustChilds(); } -void UIScrollBar::OnSizeChange() { - AdjustChilds(); - mSlider->AdjustChilds(); - UIComplexControl::OnSizeChange(); +void UIScrollBar::onSizeChange() { + adjustChilds(); + mSlider->adjustChilds(); + UIComplexControl::onSizeChange(); } -void UIScrollBar::AdjustChilds() { - mBtnUp->Pos( 0, 0 ); +void UIScrollBar::adjustChilds() { + mBtnUp->position( 0, 0 ); - if ( !IsVertical() ) { - mBtnDown->Pos( mSize.width() - mBtnDown->Size().width(), 0 ); - mSlider->Size( mSize.width() - mBtnDown->Size().width() - mBtnUp->Size().width(), mSlider->Size().height() ); - mSlider->Pos( mBtnUp->Size().width(), 0 ); + if ( !isVertical() ) { + mBtnDown->position( mSize.width() - mBtnDown->size().width(), 0 ); + mSlider->size( mSize.width() - mBtnDown->size().width() - mBtnUp->size().width(), mSlider->size().height() ); + mSlider->position( mBtnUp->size().width(), 0 ); - mBtnDown->CenterVertical(); - mBtnUp->CenterVertical(); - mSlider->CenterVertical(); + mBtnDown->centerVertical(); + mBtnUp->centerVertical(); + mSlider->centerVertical(); } else { - mBtnDown->Pos( 0, mSize.height() - mBtnDown->Size().height() ); - mSlider->Size( mSlider->Size().width(), mSize.height() - mBtnDown->Size().height() - mBtnUp->Size().height() ); - mSlider->Pos( 0, mBtnUp->Size().height() ); + mBtnDown->position( 0, mSize.height() - mBtnDown->size().height() ); + mSlider->size( mSlider->size().width(), mSize.height() - mBtnDown->size().height() - mBtnUp->size().height() ); + mSlider->position( 0, mBtnUp->size().height() ); - mBtnDown->CenterHorizontal(); - mBtnUp->CenterHorizontal(); - mSlider->CenterHorizontal(); + mBtnDown->centerHorizontal(); + mBtnUp->centerHorizontal(); + mSlider->centerHorizontal(); } } -void UIScrollBar::Update() { - UIControlAnim::Update(); +void UIScrollBar::update() { + UIControlAnim::update(); - if ( mBtnUp->IsMouseOver() || mBtnDown->IsMouseOver() ) { - ManageClick( UIManager::instance()->GetInput()->clickTrigger() ); + if ( mBtnUp->isMouseOver() || mBtnDown->isMouseOver() ) { + manageClick( UIManager::instance()->getInput()->clickTrigger() ); } } -void UIScrollBar::ManageClick( const Uint32& Flags ) { +void UIScrollBar::manageClick( const Uint32& Flags ) { if ( Flags & EE_BUTTONS_WUWD ) { if ( Flags & EE_BUTTON_WUMASK ) - mSlider->Value( Value() + ClickStep() ); + mSlider->value( value() + clickStep() ); else - mSlider->Value( Value() - ClickStep() ); + mSlider->value( value() - clickStep() ); } } -Uint32 UIScrollBar::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIScrollBar::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - if ( Msg->Sender() == mBtnUp ) { - mSlider->Value( Value() - ClickStep() ); - } else if ( Msg->Sender() == mBtnDown ) { - mSlider->Value( Value() + ClickStep() ); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + if ( Msg->getSender() == mBtnUp ) { + mSlider->value( value() - clickStep() ); + } else if ( Msg->getSender() == mBtnDown ) { + mSlider->value( value() + clickStep() ); } } @@ -182,64 +182,64 @@ Uint32 UIScrollBar::OnMessage( const UIMessage * Msg ) { return 0; } -void UIScrollBar::Value( Float Val ) { - mSlider->Value( Val ); +void UIScrollBar::value( Float Val ) { + mSlider->value( Val ); } -const Float& UIScrollBar::Value() const { - return mSlider->Value(); +const Float& UIScrollBar::value() const { + return mSlider->value(); } -void UIScrollBar::MinValue( const Float& MinVal ) { - mSlider->MinValue( MinVal ); +void UIScrollBar::minValue( const Float& MinVal ) { + mSlider->minValue( MinVal ); } -const Float& UIScrollBar::MinValue() const { - return mSlider->MinValue(); +const Float& UIScrollBar::minValue() const { + return mSlider->minValue(); } -void UIScrollBar::MaxValue( const Float& MaxVal ) { - mSlider->MaxValue( MaxVal ); +void UIScrollBar::maxValue( const Float& MaxVal ) { + mSlider->maxValue( MaxVal ); } -const Float& UIScrollBar::MaxValue() const { - return mSlider->MaxValue(); +const Float& UIScrollBar::maxValue() const { + return mSlider->maxValue(); } -void UIScrollBar::ClickStep( const Float& step ) { - mSlider->ClickStep( step ); +void UIScrollBar::clickStep( const Float& step ) { + mSlider->clickStep( step ); } -const Float& UIScrollBar::ClickStep() const { - return mSlider->ClickStep(); +const Float& UIScrollBar::clickStep() const { + return mSlider->clickStep(); } -const bool& UIScrollBar::IsVertical() const { - return mSlider->IsVertical(); +const bool& UIScrollBar::isVertical() const { + return mSlider->isVertical(); } -void UIScrollBar::OnValueChangeCb( const UIEvent * Event ) { - OnValueChange(); +void UIScrollBar::onValueChangeCb( const UIEvent * Event ) { + onValueChange(); } -UISlider * UIScrollBar::Slider() const { +UISlider * UIScrollBar::getSlider() const { return mSlider; } -UIControlAnim * UIScrollBar::ButtonUp() const { +UIControlAnim * UIScrollBar::getButtonUp() const { return mBtnUp; } -UIControlAnim * UIScrollBar::ButtonDown() const { +UIControlAnim * UIScrollBar::getButtonDown() const { return mBtnDown; } -void UIScrollBar::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UIScrollBar::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mSlider->Alpha( mAlpha ); - mBtnUp->Alpha( mAlpha ); - mBtnDown->Alpha( mAlpha ); + mSlider->alpha( mAlpha ); + mBtnUp->alpha( mAlpha ); + mBtnDown->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uiselectbutton.cpp b/src/eepp/ui/uiselectbutton.cpp index 3d5c694b2..2b2aecfe3 100644 --- a/src/eepp/ui/uiselectbutton.cpp +++ b/src/eepp/ui/uiselectbutton.cpp @@ -11,54 +11,54 @@ UISelectButton::UISelectButton( const UIPushButton::CreateParams& Params ) : UISelectButton::~UISelectButton() { } -Uint32 UISelectButton::Type() const { +Uint32 UISelectButton::getType() const { return UI_TYPE_SELECTBUTTON; } -bool UISelectButton::IsType( const Uint32& type ) const { - return UISelectButton::Type() == type ? true : UIPushButton::IsType( type ); +bool UISelectButton::isType( const Uint32& type ) const { + return UISelectButton::getType() == type ? true : UIPushButton::isType( type ); } -void UISelectButton::Select() { - bool wasSelected = Selected(); +void UISelectButton::select() { + bool wasSelected = selected(); - SetSkinState( UISkinState::StateSelected ); + setSkinState( UISkinState::StateSelected ); mControlFlags |= UI_CTRL_FLAG_SELECTED; if ( !wasSelected ) { UIMessage tMsg( this, UIMessage::MsgSelected, 0 ); - MessagePost( &tMsg ); + messagePost( &tMsg ); } } -void UISelectButton::Unselect() { +void UISelectButton::unselect() { if ( mControlFlags & UI_CTRL_FLAG_SELECTED ) mControlFlags &= ~UI_CTRL_FLAG_SELECTED; - SetSkinState( UISkinState::StateNormal ); + setSkinState( UISkinState::StateNormal ); } -bool UISelectButton::Selected() const { +bool UISelectButton::selected() const { return 0 != ( mControlFlags & UI_CTRL_FLAG_SELECTED ); } -void UISelectButton::OnStateChange() { - if ( mSkinState->GetState() != UISkinState::StateSelected && Selected() ) { - if ( mSkinState->StateExists( UISkinState::StateSelected ) ) { - SetSkinState( UISkinState::StateSelected ); +void UISelectButton::onStateChange() { + if ( mSkinState->getState() != UISkinState::StateSelected && selected() ) { + if ( mSkinState->stateExists( UISkinState::StateSelected ) ) { + setSkinState( UISkinState::StateSelected ); } } - if ( Parent()->Type() & UI_TYPE_WINMENU ) { - UIWinMenu * Menu = reinterpret_cast ( Parent() ); + if ( parent()->getType() & UI_TYPE_WINMENU ) { + UIWinMenu * Menu = reinterpret_cast ( parent() ); - if ( mSkinState->GetState() == UISkinState::StateSelected ) { - TextBox()->Color( Menu->FontSelectedColor() ); - } else if ( mSkinState->GetState() == UISkinState::StateMouseEnter ) { - TextBox()->Color( Menu->FontOverColor() ); + if ( mSkinState->getState() == UISkinState::StateSelected ) { + getTextBox()->color( Menu->fontSelectedColor() ); + } else if ( mSkinState->getState() == UISkinState::StateMouseEnter ) { + getTextBox()->color( Menu->fontOverColor() ); } else { - TextBox()->Color( Menu->FontColor() ); + getTextBox()->color( Menu->fontColor() ); } } } diff --git a/src/eepp/ui/uiseparator.cpp b/src/eepp/ui/uiseparator.cpp index 5cb3100b7..e468d0517 100644 --- a/src/eepp/ui/uiseparator.cpp +++ b/src/eepp/ui/uiseparator.cpp @@ -6,25 +6,25 @@ namespace EE { namespace UI { UISeparator::UISeparator( UIControlAnim::CreateParams Params ) : UIControlAnim( Params ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UISeparator::~UISeparator() { } -Uint32 UISeparator::Type() const { +Uint32 UISeparator::getType() const { return UI_TYPE_SEPARATOR; } -bool UISeparator::IsType( const Uint32& type ) const { - return UISeparator::Type() == type ? true : UIControlAnim::IsType( type ); +bool UISeparator::isType( const Uint32& type ) const { + return UISeparator::getType() == type ? true : UIControlAnim::isType( type ); } -void UISeparator::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "separator" ); +void UISeparator::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "separator" ); - if ( NULL != mSkinState && NULL != mSkinState->GetSkin() && NULL != mSkinState->GetSkin()->GetSubTexture( UISkinState::StateNormal ) ) { - Size( mSize.width(), mSkinState->GetSkin()->GetSubTexture( UISkinState::StateNormal )->realSize().height() ); + if ( NULL != mSkinState && NULL != mSkinState->getSkin() && NULL != mSkinState->getSkin()->getSubTexture( UISkinState::StateNormal ) ) { + size( mSize.width(), mSkinState->getSkin()->getSubTexture( UISkinState::StateNormal )->realSize().height() ); } } diff --git a/src/eepp/ui/uiskin.cpp b/src/eepp/ui/uiskin.cpp index e1a67f86c..3ec86d3db 100644 --- a/src/eepp/ui/uiskin.cpp +++ b/src/eepp/ui/uiskin.cpp @@ -12,7 +12,7 @@ const char * UISkinStatesNames[] = { "mdown" }; -const char * UISkin::GetSkinStateName( const Uint32& State ) { +const char * UISkin::getSkinStateName( const Uint32& State ) { return UISkinStatesNames[ State ]; } @@ -34,7 +34,7 @@ UISkin::UISkin( const std::string& Name, const Uint32& Type ) : UISkin::~UISkin() { } -void UISkin::SetColor( const Uint32& State, const ColorA& Color ) { +void UISkin::setColor( const Uint32& State, const ColorA& Color ) { eeASSERT ( State < UISkinState::StateCount ); BitOp::writeBitKey( &mColorDefault, State, 0 ); @@ -42,7 +42,7 @@ void UISkin::SetColor( const Uint32& State, const ColorA& Color ) { mColor[ State ] = Color; } -const ColorA& UISkin::GetColor( const Uint32& State ) const { +const ColorA& UISkin::getColor( const Uint32& State ) const { eeASSERT ( State < UISkinState::StateCount ); return mColor[ State ]; @@ -61,24 +61,24 @@ const Uint32& UISkin::getId() const { return mNameHash; } -void UISkin::SetSkins() { +void UISkin::setSkins() { for ( Int32 i = 0; i < UISkinState::StateCount; i++ ) - SetSkin( i ); + setSkin( i ); } -UITheme * UISkin::Theme() const { +UITheme * UISkin::theme() const { return mTheme; } -void UISkin::Theme( UITheme * theme ) { +void UISkin::theme( UITheme * theme ) { mTheme = theme; } -const Uint32& UISkin::GetType() const { +const Uint32& UISkin::getType() const { return mType; } -bool UISkin::GetColorDefault( const Uint32& State ) { +bool UISkin::getColorDefault( const Uint32& State ) { return BitOp::readBitKey( &mColorDefault, State ); } diff --git a/src/eepp/ui/uiskincomplex.cpp b/src/eepp/ui/uiskincomplex.cpp index 707d7bfc0..505ca4b04 100644 --- a/src/eepp/ui/uiskincomplex.cpp +++ b/src/eepp/ui/uiskincomplex.cpp @@ -20,14 +20,14 @@ UISkinComplex::UISkinComplex( const std::string& Name ) : for ( Int32 y = 0; y < SideCount; y++ ) mSubTexture[ x ][ y ] = NULL; - SetSkins(); + setSkins(); } UISkinComplex::~UISkinComplex() { } -void UISkinComplex::Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) { +void UISkinComplex::draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) { if ( 0 == Alpha ) return; @@ -142,31 +142,31 @@ void UISkinComplex::Draw( const Float& X, const Float& Y, const Float& Width, co } } -void UISkinComplex::SetSkin( const Uint32& State ) { +void UISkinComplex::setSkin( const Uint32& State ) { eeASSERT ( State < UISkinState::StateCount ); for ( Uint32 Side = 0; Side < SideCount; Side++ ) { - SubTexture * SubTexture = TextureAtlasManager::instance()->getSubTextureByName( std::string( mName + "_" + UISkin::GetSkinStateName( State ) + "_" + SideSuffix[ Side ] ) ); + SubTexture * SubTexture = TextureAtlasManager::instance()->getSubTextureByName( std::string( mName + "_" + UISkin::getSkinStateName( State ) + "_" + SideSuffix[ Side ] ) ); if ( NULL != SubTexture ) mSubTexture[ State ][ Side ] = SubTexture; } } -SubTexture * UISkinComplex::GetSubTexture( const Uint32& State ) const { +SubTexture * UISkinComplex::getSubTexture( const Uint32& State ) const { eeASSERT ( State < UISkinState::StateCount ); return mSubTexture[ State ][ Center ]; } -SubTexture * UISkinComplex::GetSubTextureSide( const Uint32& State, const Uint32& Side ) { +SubTexture * UISkinComplex::getSubTextureSide( const Uint32& State, const Uint32& Side ) { eeASSERT ( State < UISkinState::StateCount && Side < UISkinComplex::SideCount ); return mSubTexture[ State ][ Side ]; } -void UISkinComplex::StateNormalToState( const Uint32& State ) { +void UISkinComplex::stateNormalToState( const Uint32& State ) { if ( NULL == mSubTexture[ State ][ 0 ] ) { for ( Uint32 Side = 0; Side < SideCount; Side++ ) { mSubTexture[ State ][ Side ] = mSubTexture[ UISkinState::StateNormal ][ Side ]; @@ -174,7 +174,7 @@ void UISkinComplex::StateNormalToState( const Uint32& State ) { } } -UISkinComplex * UISkinComplex::Copy( const std::string& NewName, const bool& CopyColorsState ) { +UISkinComplex * UISkinComplex::copy( const std::string& NewName, const bool& CopyColorsState ) { UISkinComplex * SkinC = eeNew( UISkinComplex, ( NewName ) ); if ( CopyColorsState ) { @@ -188,8 +188,8 @@ UISkinComplex * UISkinComplex::Copy( const std::string& NewName, const bool& Cop return SkinC; } -UISkin * UISkinComplex::Copy() { - return Copy( mName, true ); +UISkin * UISkinComplex::copy() { + return copy( mName, true ); } }} diff --git a/src/eepp/ui/uiskinsimple.cpp b/src/eepp/ui/uiskinsimple.cpp index 56cbbed2f..d8c0a1b63 100644 --- a/src/eepp/ui/uiskinsimple.cpp +++ b/src/eepp/ui/uiskinsimple.cpp @@ -9,13 +9,13 @@ UISkinSimple::UISkinSimple( const std::string& Name ) : for ( Int32 i = 0; i < UISkinState::StateCount; i++ ) mSubTexture[ i ] = NULL; - SetSkins(); + setSkins(); } UISkinSimple::~UISkinSimple() { } -void UISkinSimple::Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) { +void UISkinSimple::draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha, const Uint32& State ) { if ( 0 == Alpha ) return; @@ -35,26 +35,26 @@ void UISkinSimple::Draw( const Float& X, const Float& Y, const Float& Width, con } } -void UISkinSimple::SetSkin( const Uint32& State ) { +void UISkinSimple::setSkin( const Uint32& State ) { eeASSERT ( State < UISkinState::StateCount ); - std::string Name( mName + "_" + UISkin::GetSkinStateName( State ) ); + std::string Name( mName + "_" + UISkin::getSkinStateName( State ) ); mSubTexture[ State ] = TextureAtlasManager::instance()->getSubTextureByName( Name ); } -SubTexture * UISkinSimple::GetSubTexture( const Uint32& State ) const { +SubTexture * UISkinSimple::getSubTexture( const Uint32& State ) const { eeASSERT ( State < UISkinState::StateCount ); return mSubTexture[ State ]; } -void UISkinSimple::StateNormalToState( const Uint32& State ) { +void UISkinSimple::stateNormalToState( const Uint32& State ) { if ( NULL == mSubTexture[ State ] ) mSubTexture[ State ] = mSubTexture[ UISkinState::StateNormal ]; } -UISkinSimple * UISkinSimple::Copy( const std::string& NewName, const bool& CopyColorsState ) { +UISkinSimple * UISkinSimple::copy( const std::string& NewName, const bool& CopyColorsState ) { UISkinSimple * SkinS = eeNew( UISkinSimple, ( NewName ) ); if ( CopyColorsState ) { @@ -68,8 +68,8 @@ UISkinSimple * UISkinSimple::Copy( const std::string& NewName, const bool& CopyC return SkinS; } -UISkin * UISkinSimple::Copy() { - return Copy( mName, true ); +UISkin * UISkinSimple::copy() { + return copy( mName, true ); } }} diff --git a/src/eepp/ui/uiskinstate.cpp b/src/eepp/ui/uiskinstate.cpp index 03abb880e..90174a700 100644 --- a/src/eepp/ui/uiskinstate.cpp +++ b/src/eepp/ui/uiskinstate.cpp @@ -14,12 +14,12 @@ UISkinState::UISkinState( UISkin * Skin ) : UISkinState::~UISkinState() { } -void UISkinState::Draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha ) { +void UISkinState::draw( const Float& X, const Float& Y, const Float& Width, const Float& Height, const Uint32& Alpha ) { if ( NULL != mSkin ) - mSkin->Draw( X, Y, Width, Height, Alpha, mCurState ); + mSkin->draw( X, Y, Width, Height, Alpha, mCurState ); } -void UISkinState::StateBack( const Uint32& State ) { +void UISkinState::stateBack( const Uint32& State ) { if ( ( StateFocus == State ) && StateMouseEnter == mCurState && StateNormal == mLastState ) { return; } @@ -34,7 +34,7 @@ void UISkinState::StateBack( const Uint32& State ) { } } -void UISkinState::SetPrevState() { +void UISkinState::setPrevState() { if ( StateMouseDown == mCurState ) { Uint32 State = mCurState; mCurState = mLastState; @@ -42,62 +42,62 @@ void UISkinState::SetPrevState() { } } -const Uint32& UISkinState::GetPrevState() const { +const Uint32& UISkinState::getPrevState() const { return mLastState; } -const Uint32& UISkinState::GetState() const { +const Uint32& UISkinState::getState() const { return mCurState; } -void UISkinState::SetState( const Uint32& State ) { +void UISkinState::setState( const Uint32& State ) { eeASSERT ( State < UISkinState::StateCount ); - switch ( mSkin->GetType() ) + switch ( mSkin->getType() ) { case UISkin::SkinSimple: case UISkin::SkinComplex: - SetStateTypeSimple( State ); + setStateTypeSimple( State ); break; default: - SetStateTypeDefault( State ); + setStateTypeDefault( State ); } } -void UISkinState::SetStateTypeSimple( const Uint32& State ) { +void UISkinState::setStateTypeSimple( const Uint32& State ) { eeASSERT ( State < UISkinState::StateCount ); if ( mCurState == State ) return; - if ( !mSkin->GetColorDefault( State ) || NULL != mSkin->GetSubTexture( State ) ) { - mSkin->StateNormalToState( State ); + if ( !mSkin->getColorDefault( State ) || NULL != mSkin->getSubTexture( State ) ) { + mSkin->stateNormalToState( State ); mLastState = mCurState; mCurState = State; } else - StateBack( State ); + stateBack( State ); } -void UISkinState::SetStateTypeDefault( const Uint32& State ) { +void UISkinState::setStateTypeDefault( const Uint32& State ) { eeASSERT ( State < UISkinState::StateCount ); - if ( !mSkin->GetColorDefault( State ) ) + if ( !mSkin->getColorDefault( State ) ) mCurState = State; else - StateBack( State ); + stateBack( State ); } -UISkin * UISkinState::GetSkin() const { +UISkin * UISkinState::getSkin() const { return mSkin; } -bool UISkinState::StateExists( const Uint32& State ) { - switch ( mSkin->GetType() ) +bool UISkinState::stateExists( const Uint32& State ) { + switch ( mSkin->getType() ) { case UISkin::SkinSimple: case UISkin::SkinComplex: - return NULL != mSkin->GetSubTexture( State ); + return NULL != mSkin->getSubTexture( State ); } return true; diff --git a/src/eepp/ui/uislider.cpp b/src/eepp/ui/uislider.cpp index f0f40945f..70b676901 100644 --- a/src/eepp/ui/uislider.cpp +++ b/src/eepp/ui/uislider.cpp @@ -26,9 +26,9 @@ UISlider::UISlider( const UISlider::CreateParams& Params ) : BgParams.Size = Sizei( 8, mSize.width() - 16 ); mBackSlider = eeNew( UIControlAnim, ( BgParams ) ); - mBackSlider->Visible( true ); - mBackSlider->Enabled( true ); - mBackSlider->Center(); + mBackSlider->visible( true ); + mBackSlider->enabled( true ); + mBackSlider->center(); UIDragable::CreateParams SlideParams; SlideParams.Parent( this ); @@ -36,75 +36,75 @@ UISlider::UISlider( const UISlider::CreateParams& Params ) : SlideParams.PosSet( Vector2i( 0, 0 ) ); mSlider = eeNew( Private::UISliderButton, ( SlideParams ) ); - mSlider->Enabled( true ); - mSlider->Visible( true ); - mSlider->DragEnable( true ); + mSlider->enabled( true ); + mSlider->visible( true ); + mSlider->dragEnable( true ); if ( !mVertical ) - mSlider->CenterVertical(); + mSlider->centerVertical(); else - mSlider->CenterHorizontal(); + mSlider->centerHorizontal(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UISlider::~UISlider() { } -Uint32 UISlider::Type() const { +Uint32 UISlider::getType() const { return UI_TYPE_SLIDER; } -bool UISlider::IsType( const Uint32& type ) const { - return UISlider::Type() == type ? true : UIComplexControl::IsType( type ); +bool UISlider::isType( const Uint32& type ) const { + return UISlider::getType() == type ? true : UIComplexControl::isType( type ); } -void UISlider::SetTheme( UITheme * Theme ) { +void UISlider::setTheme( UITheme * Theme ) { if ( !mVertical ) { - UIControl::SetThemeControl( Theme, "hslider" ); + UIControl::setThemeControl( Theme, "hslider" ); - mBackSlider->SetThemeControl( Theme, "hslider_bg" ); - mSlider->SetThemeControl( Theme, "hslider_button" ); + mBackSlider->setThemeControl( Theme, "hslider_bg" ); + mSlider->setThemeControl( Theme, "hslider_button" ); } else { - UIControl::SetThemeControl( Theme, "vslider" ); + UIControl::setThemeControl( Theme, "vslider" ); - mBackSlider->SetThemeControl( Theme, "vslider_bg" ); - mSlider->SetThemeControl( Theme, "vslider_button" ); + mBackSlider->setThemeControl( Theme, "vslider_bg" ); + mSlider->setThemeControl( Theme, "vslider_button" ); } - AdjustChilds(); + adjustChilds(); - Value( mValue ); + value( mValue ); } -void UISlider::OnSizeChange() { - UIComplexControl::OnSizeChange(); - AdjustChilds(); +void UISlider::onSizeChange() { + UIComplexControl::onSizeChange(); + adjustChilds(); } -void UISlider::AdjustChilds() { +void UISlider::adjustChilds() { SubTexture * tSubTexture = NULL; UISkin * tSkin = NULL; - tSkin = mSlider->GetSkin(); + tSkin = mSlider->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mSlider->Size( tSubTexture->realSize() ); + mSlider->size( tSubTexture->realSize() ); if ( !mVertical ) - mSlider->CenterVertical(); + mSlider->centerVertical(); else - mSlider->CenterHorizontal(); + mSlider->centerHorizontal(); } } - tSkin = mBackSlider->GetSkin(); + tSkin = mBackSlider->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { if ( !mVertical ) { @@ -116,9 +116,9 @@ void UISlider::AdjustChilds() { Height = tSubTexture->realSize().height(); if ( mAllowHalfSliderOut ) - mBackSlider->Size( Sizei( mSize.width() - mSlider->Size().width(), Height ) ); + mBackSlider->size( Sizei( mSize.width() - mSlider->size().width(), Height ) ); else - mBackSlider->Size( Sizei( mSize.width(), Height ) ); + mBackSlider->size( Sizei( mSize.width(), Height ) ); } else { Int32 Width; @@ -128,67 +128,67 @@ void UISlider::AdjustChilds() { Width = tSubTexture->realSize().width(); if ( mAllowHalfSliderOut ) - mBackSlider->Size( Sizei( Width, mSize.height() - mSlider->Size().height() ) ); + mBackSlider->size( Sizei( Width, mSize.height() - mSlider->size().height() ) ); else - mBackSlider->Size( Sizei( Width, mSize.height() ) ); + mBackSlider->size( Sizei( Width, mSize.height() ) ); } - mBackSlider->Center(); + mBackSlider->center(); } } } -void UISlider::FixSliderPos() { +void UISlider::fixSliderPos() { if ( !mOnPosChange ) { mOnPosChange = true; if ( !mVertical ) { - mSlider->Pos( mSlider->Pos().x, 0 ); + mSlider->position( mSlider->position().x, 0 ); - if ( mSlider->Pos().x < 0 ) - mSlider->Pos( 0, 0 ); + if ( mSlider->position().x < 0 ) + mSlider->position( 0, 0 ); if ( mAllowHalfSliderOut ) { - if ( mSlider->Pos().x > mBackSlider->Size().width() ) - mSlider->Pos( mBackSlider->Size().width(), 0 ); + if ( mSlider->position().x > mBackSlider->size().width() ) + mSlider->position( mBackSlider->size().width(), 0 ); } else { - if ( mSlider->Pos().x > mBackSlider->Size().width() - mSlider->Size().width() ) - mSlider->Pos( mBackSlider->Size().width() - mSlider->Size().width(), 0 ); + if ( mSlider->position().x > mBackSlider->size().width() - mSlider->size().width() ) + mSlider->position( mBackSlider->size().width() - mSlider->size().width(), 0 ); } - mSlider->CenterVertical(); + mSlider->centerVertical(); if ( mAllowHalfSliderOut ) - Value( mMinValue + (Float)mSlider->Pos().x * ( mMaxValue - mMinValue ) / (Float)mBackSlider->Size().width() ); + value( mMinValue + (Float)mSlider->position().x * ( mMaxValue - mMinValue ) / (Float)mBackSlider->size().width() ); else - Value( mMinValue + (Float)mSlider->Pos().x * ( mMaxValue - mMinValue ) / ( (Float)mSize.width() - mSlider->Size().width() ) ); + value( mMinValue + (Float)mSlider->position().x * ( mMaxValue - mMinValue ) / ( (Float)mSize.width() - mSlider->size().width() ) ); } else { - mSlider->Pos( 0, mSlider->Pos().y ); + mSlider->position( 0, mSlider->position().y ); - if ( mSlider->Pos().y < 0 ) - mSlider->Pos( 0, 0 ); + if ( mSlider->position().y < 0 ) + mSlider->position( 0, 0 ); if ( mAllowHalfSliderOut ) { - if ( mSlider->Pos().y > mBackSlider->Size().height() ) - mSlider->Pos( 0, mBackSlider->Size().height() ); + if ( mSlider->position().y > mBackSlider->size().height() ) + mSlider->position( 0, mBackSlider->size().height() ); } else { - if ( mSlider->Pos().y > mBackSlider->Size().height() - mSlider->Size().height() ) - mSlider->Pos( 0, mBackSlider->Size().height() - mSlider->Size().height() ); + if ( mSlider->position().y > mBackSlider->size().height() - mSlider->size().height() ) + mSlider->position( 0, mBackSlider->size().height() - mSlider->size().height() ); } - mSlider->CenterHorizontal(); + mSlider->centerHorizontal(); if ( mAllowHalfSliderOut ) - Value( mMinValue + (Float)mSlider->Pos().y * ( mMaxValue - mMinValue ) / (Float)mBackSlider->Size().height() ); + value( mMinValue + (Float)mSlider->position().y * ( mMaxValue - mMinValue ) / (Float)mBackSlider->size().height() ); else - Value( mMinValue + (Float)mSlider->Pos().y * ( mMaxValue - mMinValue ) / ( (Float)mSize.height() - mSlider->Size().height() ) ); + value( mMinValue + (Float)mSlider->position().y * ( mMaxValue - mMinValue ) / ( (Float)mSize.height() - mSlider->size().height() ) ); } mOnPosChange = false; } } -void UISlider::Value( Float Val ) { +void UISlider::value( Float Val ) { if ( Val < mMinValue ) Val = mMinValue; if ( Val > mMaxValue ) Val = mMaxValue; @@ -202,144 +202,144 @@ void UISlider::Value( Float Val ) { if ( !mVertical ) { if ( mAllowHalfSliderOut ) - mSlider->Pos( (Int32)( (Float)mBackSlider->Size().width() * Percent ), mSlider->Pos().y ); + mSlider->position( (Int32)( (Float)mBackSlider->size().width() * Percent ), mSlider->position().y ); else - mSlider->Pos( (Int32)( ( (Float)mSize.width() - mSlider->Size().width() ) * Percent ), mSlider->Pos().y ); + mSlider->position( (Int32)( ( (Float)mSize.width() - mSlider->size().width() ) * Percent ), mSlider->position().y ); } else { if ( mAllowHalfSliderOut ) - mSlider->Pos( mSlider->Pos().x, (Int32)( (Float)mBackSlider->Size().height() * Percent ) ); + mSlider->position( mSlider->position().x, (Int32)( (Float)mBackSlider->size().height() * Percent ) ); else - mSlider->Pos( mSlider->Pos().x, (Int32)( ( (Float)mSize.height() - mSlider->Size().height() ) * Percent ) ); + mSlider->position( mSlider->position().x, (Int32)( ( (Float)mSize.height() - mSlider->size().height() ) * Percent ) ); } mOnPosChange = false; } - OnValueChange(); + onValueChange(); } } -const Float& UISlider::Value() const { +const Float& UISlider::value() const { return mValue; } -void UISlider::MinValue( const Float& MinVal ) { +void UISlider::minValue( const Float& MinVal ) { mMinValue = MinVal; if ( mValue < mMinValue ) mValue = mMinValue; - FixSliderPos(); + fixSliderPos(); } -const Float& UISlider::MinValue() const { +const Float& UISlider::minValue() const { return mMinValue; } -void UISlider::MaxValue( const Float& MaxVal ) { +void UISlider::maxValue( const Float& MaxVal ) { mMaxValue = MaxVal; if ( mValue > mMaxValue ) mValue = mMaxValue; - FixSliderPos(); + fixSliderPos(); } -const Float& UISlider::MaxValue() const { +const Float& UISlider::maxValue() const { return mMaxValue; } -void UISlider::ClickStep( const Float& step ) { +void UISlider::clickStep( const Float& step ) { mClickStep = step; } -const Float& UISlider::ClickStep() const { +const Float& UISlider::clickStep() const { return mClickStep; } -const bool& UISlider::IsVertical() const { +const bool& UISlider::isVertical() const { return mVertical; } -void UISlider::Update() { - UIControlAnim::Update(); +void UISlider::update() { + UIControlAnim::update(); - if ( IsMouseOver() || mBackSlider->IsMouseOver() || mSlider->IsMouseOver() ) { - ManageClick( UIManager::instance()->GetInput()->clickTrigger() ); + if ( isMouseOver() || mBackSlider->isMouseOver() || mSlider->isMouseOver() ) { + manageClick( UIManager::instance()->getInput()->clickTrigger() ); } } -Uint32 UISlider::OnKeyDown( const UIEventKey &Event ) { +Uint32 UISlider::onKeyDown( const UIEventKey &Event ) { if ( Sys::getTicks() - mLastTickMove > 100 ) { - if ( Event.KeyCode() == KEY_DOWN ) { + if ( Event.getKeyCode() == KEY_DOWN ) { mLastTickMove = Sys::getTicks(); - Value( mValue + mClickStep ); - } else if ( Event.KeyCode() == KEY_UP ) { + value( mValue + mClickStep ); + } else if ( Event.getKeyCode() == KEY_UP ) { mLastTickMove = Sys::getTicks(); - Value( mValue - mClickStep ); - } else if ( Event.KeyCode() == KEY_PAGEUP ) { + value( mValue - mClickStep ); + } else if ( Event.getKeyCode() == KEY_PAGEUP ) { mLastTickMove = Sys::getTicks(); - Value( mMinValue ); - } else if ( Event.KeyCode() == KEY_PAGEDOWN ) { + value( mMinValue ); + } else if ( Event.getKeyCode() == KEY_PAGEDOWN ) { mLastTickMove = Sys::getTicks(); - Value( mMaxValue ); + value( mMaxValue ); } } - return UIComplexControl::OnKeyDown( Event ); + return UIComplexControl::onKeyDown( Event ); } -void UISlider::ManageClick( const Uint32& Flags ) { +void UISlider::manageClick( const Uint32& Flags ) { if ( Flags ) { - Vector2i ControlPos = UIManager::instance()->GetMousePos(); - mSlider->WorldToControl( ControlPos ); + Vector2i ControlPos = UIManager::instance()->getMousePos(); + mSlider->worldToControl( ControlPos ); - if ( Flags & EE_BUTTON_LMASK && !mSlider->IsMouseOver() ) { + if ( Flags & EE_BUTTON_LMASK && !mSlider->isMouseOver() ) { if ( !mVertical ) { if ( ControlPos.x < 0 ) - Value( mValue - mClickStep ); + value( mValue - mClickStep ); else - Value( mValue + mClickStep ); + value( mValue + mClickStep ); } else { if ( ControlPos.y < 0 ) - Value( mValue - mClickStep ); + value( mValue - mClickStep ); else - Value( mValue + mClickStep ); + value( mValue + mClickStep ); } } else if ( Flags & EE_BUTTONS_WUWD ) { if ( Flags & EE_BUTTON_WUMASK ) - Value( mValue - mClickStep ); + value( mValue - mClickStep ); else - Value( mValue + mClickStep ); + value( mValue + mClickStep ); } } } -UIControl * UISlider::GetBackSlider() const { +UIControl * UISlider::getBackSlider() const { return mBackSlider; } -UIDragable * UISlider::GetSliderButton() const { +UIDragable * UISlider::getSliderButton() const { return mSlider; } -const bool& UISlider::AllowHalfSliderOut() const { +const bool& UISlider::allowHalfSliderOut() const { return mAllowHalfSliderOut; } -const bool& UISlider::ExpandBackground() const { +const bool& UISlider::expandBackground() const { return mExpandBackground; } -void UISlider::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UISlider::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mBackSlider->Alpha( mAlpha ); - mSlider->Alpha( mAlpha ); + mBackSlider->alpha( mAlpha ); + mSlider->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uisliderbutton.cpp b/src/eepp/ui/uisliderbutton.cpp index 876de673e..858ce347a 100644 --- a/src/eepp/ui/uisliderbutton.cpp +++ b/src/eepp/ui/uisliderbutton.cpp @@ -6,17 +6,17 @@ namespace EE { namespace UI { namespace Private { UISliderButton::UISliderButton( const UIControlAnim::CreateParams& Params ) : UIControlAnim( Params ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UISliderButton::~UISliderButton() { } -void UISliderButton::OnPosChange() { - UIControlAnim::OnPosChange(); +void UISliderButton::onPositionChange() { + UIControlAnim::onPositionChange(); UISlider * Slider = reinterpret_cast ( mParentCtrl ); - Slider->FixSliderPos(); + Slider->fixSliderPos(); } }}} diff --git a/src/eepp/ui/uispinbox.cpp b/src/eepp/ui/uispinbox.cpp index 05d5753b3..eca78c5e2 100644 --- a/src/eepp/ui/uispinbox.cpp +++ b/src/eepp/ui/uispinbox.cpp @@ -34,107 +34,107 @@ UISpinBox::UISpinBox( const UISpinBox::CreateParams& Params ) : mPushUp = eeNew( UIControlAnim, ( BtnParams ) ); mPushDown = eeNew( UIControlAnim, ( BtnParams ) ); - mInput->Visible ( true ); - mInput->Enabled ( true ); - mPushUp->Visible ( true ); - mPushUp->Enabled ( true ); - mPushDown->Visible ( true ); - mPushDown->Enabled ( true ); + mInput->visible ( true ); + mInput->enabled ( true ); + mPushUp->visible ( true ); + mPushUp->enabled ( true ); + mPushDown->visible ( true ); + mPushDown->enabled ( true ); - mInput->GetInputTextBuffer()->allowOnlyNumbers( true, Params.AllowDotsInNumbers ); + mInput->getInputTextBuffer()->allowOnlyNumbers( true, Params.AllowDotsInNumbers ); - InternalValue( mValue, true ); + internalValue( mValue, true ); - AdjustChilds(); + adjustChilds(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UISpinBox::~UISpinBox() { } -Uint32 UISpinBox::Type() const { +Uint32 UISpinBox::getType() const { return UI_TYPE_SPINBOX; } -bool UISpinBox::IsType( const Uint32& type ) const { - return UISpinBox::Type() == type ? true : UIComplexControl::IsType( type ); +bool UISpinBox::isType( const Uint32& type ) const { + return UISpinBox::getType() == type ? true : UIComplexControl::isType( type ); } -void UISpinBox::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl ( Theme, "spinbox" ); +void UISpinBox::setTheme( UITheme * Theme ) { + UIControl::setThemeControl ( Theme, "spinbox" ); - mInput->SetThemeControl ( Theme, "spinbox_input" ); - mPushUp->SetThemeControl ( Theme, "spinbox_btnup" ); - mPushDown->SetThemeControl ( Theme, "spinbox_btndown" ); + mInput->setThemeControl ( Theme, "spinbox_input" ); + mPushUp->setThemeControl ( Theme, "spinbox_btnup" ); + mPushDown->setThemeControl ( Theme, "spinbox_btndown" ); SubTexture * tSubTexture = NULL; UISkin * tSkin = NULL; - tSkin = mPushUp->GetSkin(); + tSkin = mPushUp->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mPushUp->Size( tSubTexture->realSize() ); + mPushUp->size( tSubTexture->realSize() ); } } - tSkin = mPushDown->GetSkin(); + tSkin = mPushDown->getSkin(); if ( NULL != tSkin ) { - tSubTexture = tSkin->GetSubTexture( UISkinState::StateNormal ); + tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal ); if ( NULL != tSubTexture ) { - mPushDown->Size( tSubTexture->realSize() ); + mPushDown->size( tSubTexture->realSize() ); } } if ( mFlags & UI_AUTO_SIZE ) { - mSize.height( mInput->GetSkinSize().height() ); + mSize.height( mInput->getSkinSize().height() ); } - AdjustChilds(); + adjustChilds(); } -void UISpinBox::AdjustChilds() { - mPushUp->Pos( mSize.width() - mPushUp->Size().width(), 0 ); - mPushDown->Pos( mSize.width() - mPushDown->Size().width(), mPushUp->Size().height() ); - mInput->Size( mSize.width() - mPushUp->Size().width(), mSize.height() ); +void UISpinBox::adjustChilds() { + mPushUp->position( mSize.width() - mPushUp->size().width(), 0 ); + mPushDown->position( mSize.width() - mPushDown->size().width(), mPushUp->size().height() ); + mInput->size( mSize.width() - mPushUp->size().width(), mSize.height() ); } -void UISpinBox::Padding( const Recti& padding ) { - mInput->Padding( padding ); +void UISpinBox::padding( const Recti& padding ) { + mInput->padding( padding ); } -const Recti& UISpinBox::Padding() const { - return mInput->Padding(); +const Recti& UISpinBox::padding() const { + return mInput->padding(); } -void UISpinBox::ClickStep( const Float& step ) { +void UISpinBox::clickStep( const Float& step ) { mClickStep = step; } -const Float& UISpinBox::ClickStep() const { +const Float& UISpinBox::clickStep() const { return mClickStep; } -Uint32 UISpinBox::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UISpinBox::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgClick: { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { - if ( Msg->Sender() == mPushUp ) { - AddValue( mClickStep ); - } else if ( Msg->Sender() == mPushDown ) { - AddValue( -mClickStep ); + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { + if ( Msg->getSender() == mPushUp ) { + addValue( mClickStep ); + } else if ( Msg->getSender() == mPushDown ) { + addValue( -mClickStep ); } - } else if ( Msg->Flags() & EE_BUTTONS_WUWD ) { - if ( Msg->Flags() & EE_BUTTON_WUMASK ) - AddValue( mClickStep ); + } else if ( Msg->getFlags() & EE_BUTTONS_WUWD ) { + if ( Msg->getFlags() & EE_BUTTON_WUMASK ) + addValue( mClickStep ); else - AddValue( -mClickStep ); + addValue( -mClickStep ); } return 1; @@ -144,106 +144,106 @@ Uint32 UISpinBox::OnMessage( const UIMessage * Msg ) { return 0; } -void UISpinBox::AddValue( const Float& value ) { - if ( !mInput->Text().size() ) - mInput->Text( String::toStr( static_cast( mMinValue ) ) ); +void UISpinBox::addValue( const Float& value ) { + if ( !mInput->text().size() ) + mInput->text( String::toStr( static_cast( mMinValue ) ) ); - Value( mValue + value ); + this->value( mValue + value ); } -void UISpinBox::InternalValue( const Float& Val, const bool& Force ) { +void UISpinBox::internalValue( const Float& Val, const bool& Force ) { if ( Force || Val != mValue ) { if ( Val >= mMinValue && Val <= mMaxValue ) { Float iValN = (Float)(Int32) Val; Float fValN = (Float)iValN; if ( fValN == Val ) { - mInput->Text( String::toStr( iValN ) ); + mInput->text( String::toStr( iValN ) ); } else { - mInput->Text( String::toStr( Val ) ); + mInput->text( String::toStr( Val ) ); } mValue = Val; - OnValueChange(); + onValueChange(); } } } -void UISpinBox::Value( const Float& Val ) { - InternalValue( Val, false ); +void UISpinBox::value( const Float& Val ) { + internalValue( Val, false ); } -const Float& UISpinBox::Value() const { +const Float& UISpinBox::value() const { return mValue; } -void UISpinBox::MinValue( const Float& MinVal ) { +void UISpinBox::minValue( const Float& MinVal ) { mMinValue = MinVal; if ( mValue < mMinValue ) mValue = mMinValue; } -const Float& UISpinBox::MinValue() const { +const Float& UISpinBox::minValue() const { return mMinValue; } -void UISpinBox::MaxValue( const Float& MaxVal ) { +void UISpinBox::maxValue( const Float& MaxVal ) { mMaxValue = MaxVal; if ( mValue > mMaxValue ) mValue = mMaxValue; } -const Float& UISpinBox::MaxValue() const { +const Float& UISpinBox::maxValue() const { return mMaxValue; } -void UISpinBox::Update() { - bool Changed = mInput->GetInputTextBuffer()->changedSinceLastUpdate(); +void UISpinBox::update() { + bool Changed = mInput->getInputTextBuffer()->changedSinceLastUpdate(); - UIControlAnim::Update(); + UIControlAnim::update(); if ( Changed ) { - if ( !mInput->Text().size() ) { - Value( 0 ); + if ( !mInput->text().size() ) { + value( 0 ); } else { Float Val = mValue; - if ( '.' == mInput->Text()[ mInput->Text().size() - 1 ] ) { - Uint32 pos = (Uint32)mInput->Text().find_first_of( "." ); + if ( '.' == mInput->text()[ mInput->text().size() - 1 ] ) { + Uint32 pos = (Uint32)mInput->text().find_first_of( "." ); - if ( pos != mInput->Text().size() - 1 ) - mInput->Text( mInput->Text().substr( 0, mInput->Text().size() - 1 ) ); + if ( pos != mInput->text().size() - 1 ) + mInput->text( mInput->text().substr( 0, mInput->text().size() - 1 ) ); } else { - bool Res = String::fromString( Val, mInput->Text() ); + bool Res = String::fromString( Val, mInput->text() ); if ( Res ) - Value( Val ); + value( Val ); } } } } -UIControlAnim * UISpinBox::ButtonPushUp() const { +UIControlAnim * UISpinBox::getButtonPushUp() const { return mPushUp; } -UIControlAnim * UISpinBox::ButtonPushDown() const { +UIControlAnim * UISpinBox::getButtonPushDown() const { return mPushDown; } -UITextInput * UISpinBox::TextInput() const { +UITextInput * UISpinBox::getTextInput() const { return mInput; } -void UISpinBox::OnAlphaChange() { - UIControlAnim::OnAlphaChange(); +void UISpinBox::onAlphaChange() { + UIControlAnim::onAlphaChange(); - mInput->Alpha( mAlpha ); - mPushUp->Alpha( mAlpha ); - mPushDown->Alpha( mAlpha ); + mInput->alpha( mAlpha ); + mPushUp->alpha( mAlpha ); + mPushDown->alpha( mAlpha ); } }} diff --git a/src/eepp/ui/uisprite.cpp b/src/eepp/ui/uisprite.cpp index dc911392e..39222c7a3 100644 --- a/src/eepp/ui/uisprite.cpp +++ b/src/eepp/ui/uisprite.cpp @@ -13,102 +13,102 @@ UISprite::UISprite( const UISprite::CreateParams& Params ) : if ( Params.DealloSprite ) mControlFlags |= UI_CTRL_FLAG_FREE_USE; - if ( ( Flags() & UI_AUTO_SIZE ) || ( Params.Size.x == -1 && Params.Size.y == -1 ) ) { + if ( ( flags() & UI_AUTO_SIZE ) || ( Params.Size.x == -1 && Params.Size.y == -1 ) ) { if ( NULL != mSprite && NULL != mSprite->getCurrentSubTexture() ) { - Size( mSprite->getCurrentSubTexture()->size() ); + size( mSprite->getCurrentSubTexture()->size() ); } } } UISprite::~UISprite() { - if ( DealloSprite() ) + if ( deallocSprite() ) eeSAFE_DELETE( mSprite ); } -Uint32 UISprite::Type() const { +Uint32 UISprite::getType() const { return UI_TYPE_SPRITE; } -bool UISprite::IsType( const Uint32& type ) const { - return UISprite::Type() == type ? true : UIComplexControl::IsType( type ); +bool UISprite::isType( const Uint32& type ) const { + return UISprite::getType() == type ? true : UIComplexControl::isType( type ); } -Uint32 UISprite::DealloSprite() { +Uint32 UISprite::deallocSprite() { return mControlFlags & UI_CTRL_FLAG_FREE_USE; } -void UISprite::Sprite( Graphics::Sprite * sprite ) { - if ( DealloSprite() ) +void UISprite::sprite( Graphics::Sprite * sprite ) { + if ( deallocSprite() ) eeSAFE_DELETE( mSprite ); mSprite = sprite; - UpdateSize(); + updateSize(); } -void UISprite::Draw() { - UIControlAnim::Draw(); +void UISprite::draw() { + UIControlAnim::draw(); if ( mVisible ) { if ( NULL != mSprite && 0.f != mAlpha ) { - CheckSubTextureUpdate(); + checkSubTextureUpdate(); mSprite->position( (Float)( mScreenPos.x + mAlignOffset.x ), (Float)( mScreenPos.y + mAlignOffset.y ) ); - mSprite->draw( Blend(), mRender ); + mSprite->draw( blend(), mRender ); } } } -void UISprite::CheckSubTextureUpdate() { +void UISprite::checkSubTextureUpdate() { if ( NULL != mSprite && NULL != mSprite->getCurrentSubTexture() && mSprite->getCurrentSubTexture() != mSubTextureLast ) { - UpdateSize(); - AutoAlign(); + updateSize(); + autoAlign(); mSubTextureLast = mSprite->getCurrentSubTexture(); } } -void UISprite::Alpha( const Float& alpha ) { - UIControlAnim::Alpha( alpha ); +void UISprite::alpha( const Float& alpha ) { + UIControlAnim::alpha( alpha ); if ( NULL != mSprite ) mSprite->alpha( alpha ); } -Graphics::Sprite * UISprite::Sprite() const { +Graphics::Sprite * UISprite::sprite() const { return mSprite; } -ColorA UISprite::Color() const { +ColorA UISprite::color() const { if ( NULL != mSprite ) return mSprite->color(); return ColorA(); } -void UISprite::Color( const ColorA& color ) { +void UISprite::color( const ColorA& color ) { if ( NULL != mSprite ) mSprite->color( color ); - Alpha( color.a() ); + alpha( color.a() ); } -const EE_RENDER_MODE& UISprite::RenderMode() const { +const EE_RENDER_MODE& UISprite::renderMode() const { return mRender; } -void UISprite::RenderMode( const EE_RENDER_MODE& render ) { +void UISprite::renderMode( const EE_RENDER_MODE& render ) { mRender = render; } -void UISprite::UpdateSize() { - if ( Flags() & UI_AUTO_SIZE ) { +void UISprite::updateSize() { + if ( flags() & UI_AUTO_SIZE ) { if ( NULL != mSprite ) { if ( NULL != mSprite->getCurrentSubTexture() && mSprite->getCurrentSubTexture()->size() != mSize ) - Size( mSprite->getCurrentSubTexture()->size() ); + size( mSprite->getCurrentSubTexture()->size() ); } } } -void UISprite::AutoAlign() { +void UISprite::autoAlign() { if ( NULL == mSprite || NULL == mSprite->getCurrentSubTexture() ) return; @@ -131,12 +131,12 @@ void UISprite::AutoAlign() { } } -const Vector2i& UISprite::AlignOffset() const { +const Vector2i& UISprite::alignOffset() const { return mAlignOffset; } -void UISprite::OnSizeChange() { - AutoAlign(); +void UISprite::onSizeChange() { + autoAlign(); } }} diff --git a/src/eepp/ui/uitab.cpp b/src/eepp/ui/uitab.cpp index 5c7886435..29f5acaf6 100644 --- a/src/eepp/ui/uitab.cpp +++ b/src/eepp/ui/uitab.cpp @@ -8,139 +8,139 @@ UITab::UITab( UISelectButton::CreateParams& Params, UIControl * CtrlOwned ) : UISelectButton( Params ), mCtrlOwned( CtrlOwned ) { - ApplyDefaultTheme(); + applyDefaultTheme(); } UITab::~UITab() { } -Uint32 UITab::Type() const { +Uint32 UITab::getType() const { return UI_TYPE_TAB; } -bool UITab::IsType( const Uint32& type ) const { - return UITab::Type() == type ? true : UISelectButton::IsType( type ); +bool UITab::isType( const Uint32& type ) const { + return UITab::getType() == type ? true : UISelectButton::isType( type ); } -UITabWidget * UITab::GetTabWidget() { - if ( Parent()->Parent()->IsType( UI_TYPE_TABWIDGET ) ) { - return reinterpret_cast ( Parent()->Parent() ); +UITabWidget * UITab::getTabWidget() { + if ( parent()->parent()->isType( UI_TYPE_TABWIDGET ) ) { + return reinterpret_cast ( parent()->parent() ); } return NULL; } -void UITab::SetTheme( UITheme * Theme ) { +void UITab::setTheme( UITheme * Theme ) { std::string tabPos = "tab"; - UITabWidget * tTabW = GetTabWidget(); + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { if ( tTabW->mSpecialBorderTabs ) { - if ( 0 == tTabW->GetTabIndex( this ) ) { + if ( 0 == tTabW->getTabIndex( this ) ) { tabPos = "tab_left"; - } else if ( tTabW->Count() > 0 && ( tTabW->Count() - 1 ) == tTabW->GetTabIndex( this ) ) { + } else if ( tTabW->count() > 0 && ( tTabW->count() - 1 ) == tTabW->getTabIndex( this ) ) { tabPos = "tab_right"; } } } - UIControl::SetThemeControl( Theme, tabPos ); + UIControl::setThemeControl( Theme, tabPos ); - DoAfterSetTheme(); + doAftersetTheme(); } -Uint32 UITab::OnMouseClick( const Vector2i &Pos, const Uint32 Flags ) { - UISelectButton::OnMouseClick( Pos, Flags ); +Uint32 UITab::onMouseClick( const Vector2i &Pos, const Uint32 Flags ) { + UISelectButton::onMouseClick( Pos, Flags ); - UITabWidget * tTabW = GetTabWidget(); + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { if ( Flags & EE_BUTTON_LMASK ) { - tTabW->SetTabSelected( this ); + tTabW->setTabSelected( this ); } } return 1; } -void UITab::OnStateChange() { - UISelectButton::OnStateChange(); +void UITab::onStateChange() { + UISelectButton::onStateChange(); - UITabWidget * tTabW = GetTabWidget(); + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { - Size( mSize.width(), GetSkinSize( GetSkin(), mSkinState->GetState() ).height() ); + size( mSize.width(), getSkinSize( getSkin(), mSkinState->getState() ).height() ); - if ( mSkinState->GetState() == UISkinState::StateSelected ) { - mTextBox->Color( tTabW->mFontSelectedColor ); - } else if ( mSkinState->GetState() == UISkinState::StateMouseEnter ) { - mTextBox->Color( tTabW->mFontOverColor ); + if ( mSkinState->getState() == UISkinState::StateSelected ) { + mTextBox->color( tTabW->mFontSelectedColor ); + } else if ( mSkinState->getState() == UISkinState::StateMouseEnter ) { + mTextBox->color( tTabW->mFontOverColor ); } else { - mTextBox->Color( tTabW->mFontColor ); + mTextBox->color( tTabW->mFontColor ); } } } -const String& UITab::Text() { - return UIPushButton::Text(); +const String& UITab::text() { + return UIPushButton::text(); } -void UITab::Text( const String &text ) { - UITabWidget * tTabW = GetTabWidget(); +void UITab::text( const String &text ) { + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { if ( text.size() > tTabW->mMaxTextLength ) { - UIPushButton::Text( text.substr( 0, tTabW->mMaxTextLength ) ); + UIPushButton::text( text.substr( 0, tTabW->mMaxTextLength ) ); - SetRealSize(); + setRealSize(); return; } } - UIPushButton::Text( text ); + UIPushButton::text( text ); - SetRealSize(); + setRealSize(); } -void UITab::SetRealSize() { +void UITab::setRealSize() { if ( mFlags & UI_AUTO_SIZE ) { - Uint32 w = mTextBox->GetTextWidth() + GetSkinSize().width(); + Uint32 w = mTextBox->getTextWidth() + getSkinSize().width(); - UITabWidget * tTabW = GetTabWidget(); + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { w = eemax( w, tTabW->mMinTabWidth ); w = eemin( w, tTabW->mMaxTabWidth ); } - Size( w, mSize.height() ); + size( w, mSize.height() ); } } -UIControl * UITab::CtrlOwned() const { +UIControl * UITab::ctrlOwned() const { return mCtrlOwned; } -void UITab::Update() { - UISelectButton::Update(); +void UITab::update() { + UISelectButton::update(); if ( mEnabled && mVisible ) { - if ( IsMouseOver() ) { - UITabWidget * tTabW = GetTabWidget(); + if ( isMouseOver() ) { + UITabWidget * tTabW = getTabWidget(); if ( NULL != tTabW ) { - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); if ( Flags & EE_BUTTONS_WUWD ) { if ( Flags & EE_BUTTON_WUMASK ) { - tTabW->SelectPrev(); + tTabW->selectPrev(); } else if ( Flags & EE_BUTTON_WDMASK ) { - tTabW->SelectNext(); + tTabW->selectNext(); } } else if ( tTabW->mTabsClosable && ( Flags & EE_BUTTON_MMASK ) ) { - tTabW->Remove( this ); + tTabW->remove( this ); } } } diff --git a/src/eepp/ui/uitabwidget.cpp b/src/eepp/ui/uitabwidget.cpp index b6e9059f2..79473e22b 100644 --- a/src/eepp/ui/uitabwidget.cpp +++ b/src/eepp/ui/uitabwidget.cpp @@ -32,8 +32,8 @@ UITabWidget::UITabWidget( UITabWidget::CreateParams& Params ) : TabParams.SizeSet( mSize.width(), mTabWidgetHeight ); mTabContainer = eeNew( UIComplexControl, ( TabParams ) ); - mTabContainer->Visible( true ); - mTabContainer->Enabled( true ); + mTabContainer->visible( true ); + mTabContainer->enabled( true ); UIComplexControl::CreateParams CtrlParams; CtrlParams.Parent( this ); @@ -42,76 +42,76 @@ UITabWidget::UITabWidget( UITabWidget::CreateParams& Params ) : CtrlParams.Flags |= UI_CLIP_ENABLE | UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT; mCtrlContainer = eeNew( UIComplexControl, ( CtrlParams ) ); - mCtrlContainer->Visible( true ); - mCtrlContainer->Enabled( true ); + mCtrlContainer->visible( true ); + mCtrlContainer->enabled( true ); - OnSizeChange(); + onSizeChange(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UITabWidget::~UITabWidget() { } -Uint32 UITabWidget::Type() const { +Uint32 UITabWidget::getType() const { return UI_TYPE_TABWIDGET; } -bool UITabWidget::IsType( const Uint32& type ) const { - return UITabWidget::Type() == type ? true : UIComplexControl::IsType( type ); +bool UITabWidget::isType( const Uint32& type ) const { + return UITabWidget::getType() == type ? true : UIComplexControl::isType( type ); } -void UITabWidget::SetTheme( UITheme * Theme ) { - mTabContainer->SetThemeControl( Theme, "tabwidget" ); +void UITabWidget::setTheme( UITheme * Theme ) { + mTabContainer->setThemeControl( Theme, "tabwidget" ); - mCtrlContainer->SetThemeControl( Theme, "tabcontainer" ); + mCtrlContainer->setThemeControl( Theme, "tabcontainer" ); if ( 0 == mTabWidgetHeight ) { - UISkin * tSkin = Theme->getByName( Theme->Abbr() + "_" + "tab" ); + UISkin * tSkin = Theme->getByName( Theme->abbr() + "_" + "tab" ); - Sizei tSize1 = GetSkinSize( tSkin ); - Sizei tSize2 = GetSkinSize( tSkin, UISkinState::StateSelected ); + Sizei tSize1 = getSkinSize( tSkin ); + Sizei tSize2 = getSkinSize( tSkin, UISkinState::StateSelected ); mTabWidgetHeight = eemax( tSize1.height(), tSize2.height() ); - SeContainerSize(); - OrderTabs(); + seContainerSize(); + orderTabs(); } - DoAfterSetTheme(); + doAftersetTheme(); } -void UITabWidget::DoAfterSetTheme() { - OnSizeChange(); +void UITabWidget::doAftersetTheme() { + onSizeChange(); } -void UITabWidget::SeContainerSize() { - mTabContainer->Size( mSize.width(), mTabWidgetHeight ); - mCtrlContainer->Pos( 0, mTabWidgetHeight ); - mCtrlContainer->Size( mSize.width(), mSize.height() - mTabWidgetHeight ); +void UITabWidget::seContainerSize() { + mTabContainer->size( mSize.width(), mTabWidgetHeight ); + mCtrlContainer->position( 0, mTabWidgetHeight ); + mCtrlContainer->size( mSize.width(), mSize.height() - mTabWidgetHeight ); } -void UITabWidget::Draw() { +void UITabWidget::draw() { if ( mDrawLineBelowTabs ) { bool smooth = GLi->isLineSmooth(); if ( smooth ) GLi->lineSmooth( false ); Primitives P; - Vector2i p1( mPos.x, mPos.y + mTabContainer->Size().height() + mLineBewowTabsYOffset ); - Vector2i p2( mPos.x + mTabContainer->Pos().x, p1.y ); + Vector2i p1( mPos.x, mPos.y + mTabContainer->size().height() + mLineBewowTabsYOffset ); + Vector2i p2( mPos.x + mTabContainer->position().x, p1.y ); - ControlToScreen( p1 ); - ControlToScreen( p2 ); + controlToScreen( p1 ); + controlToScreen( p2 ); P.lineWidth( 1 ); P.setColor( mLineBelowTabsColor ); P.drawLine( Line2f( Vector2f( p1.x, p1.y ), Vector2f( p2.x, p2.y ) ) ); - Vector2i p3( mPos.x + mTabContainer->Pos().x + mTabContainer->Size().width(), mPos.y + mTabContainer->Size().height() + mLineBewowTabsYOffset ); + Vector2i p3( mPos.x + mTabContainer->position().x + mTabContainer->size().width(), mPos.y + mTabContainer->size().height() + mLineBewowTabsYOffset ); Vector2i p4( mPos.x + mSize.width(), p3.y ); - ControlToScreen( p3 ); - ControlToScreen( p4 ); + controlToScreen( p3 ); + controlToScreen( p4 ); P.drawLine( Line2f( Vector2f( p3.x, p3.y ), Vector2f( p4.x, p4.y ) ) ); @@ -119,34 +119,34 @@ void UITabWidget::Draw() { } } -void UITabWidget::SetTabContainerSize() { +void UITabWidget::setTabContainerSize() { Uint32 s = 0; if ( mTabs.size() > 0 ) { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { - s += mTabs[i]->Size().width() + mTabSeparation; + s += mTabs[i]->size().width() + mTabSeparation; } s -= mTabSeparation; } - mTabContainer->Size( s, mTabWidgetHeight ); + mTabContainer->size( s, mTabWidgetHeight ); switch ( HAlignGet( mFlags ) ) { case UI_HALIGN_LEFT: - mTabContainer->Pos( 0, 0 ); + mTabContainer->position( 0, 0 ); break; case UI_HALIGN_CENTER: - mTabContainer->CenterHorizontal(); + mTabContainer->centerHorizontal(); break; case UI_HALIGN_RIGHT: - mTabContainer->Pos( mSize.width() - mTabContainer->Size().width(), 0 ); + mTabContainer->position( mSize.width() - mTabContainer->size().width(), 0 ); break; } } -void UITabWidget::PosTabs() { +void UITabWidget::posTabs() { Uint32 w = 0; Uint32 h = 0; Uint32 VA = VAlignGet( mFlags ); @@ -155,43 +155,43 @@ void UITabWidget::PosTabs() { switch ( VA ) { case UI_VALIGN_BOTTOM: - h = mTabWidgetHeight - mTabs[i]->Size().height(); + h = mTabWidgetHeight - mTabs[i]->size().height(); break; case UI_VALIGN_TOP: h = 0; break; case UI_VALIGN_CENTER: - h = mTabWidgetHeight / 2 - mTabs[i]->Size().height() / 2; + h = mTabWidgetHeight / 2 - mTabs[i]->size().height() / 2; break; } - mTabs[i]->Pos( w, h ); + mTabs[i]->position( w, h ); - w += mTabs[i]->Size().width() + mTabSeparation; + w += mTabs[i]->size().width() + mTabSeparation; } } -void UITabWidget::ZOrderTabs() { +void UITabWidget::zorderTabs() { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { - mTabs[i]->ToBack(); + mTabs[i]->toBack(); } if ( NULL != mTabSelected ) { - mTabSelected->ToFront(); + mTabSelected->toFront(); } } -void UITabWidget::OrderTabs() { - ApplyThemeToTabs(); +void UITabWidget::orderTabs() { + applyThemeToTabs(); - ZOrderTabs(); + zorderTabs(); - SetTabContainerSize(); + setTabContainerSize(); - PosTabs(); + posTabs(); } -UITab * UITabWidget::CreateTab( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ) { +UITab * UITabWidget::createTab( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ) { UITab::CreateParams Params; Params.Parent( mTabContainer ); Params.Font = mFont; @@ -203,46 +203,46 @@ UITab * UITabWidget::CreateTab( const String& Text, UIControl * CtrlOwned, SubTe UITab * tCtrl = eeNew( UITab, ( Params, CtrlOwned ) ); - tCtrl->Text( Text ); - tCtrl->Visible( true ); - tCtrl->Enabled( true ); + tCtrl->text( Text ); + tCtrl->visible( true ); + tCtrl->enabled( true ); - CtrlOwned->Parent( mCtrlContainer ); - CtrlOwned->Visible( false ); - CtrlOwned->Enabled( true ); + CtrlOwned->parent( mCtrlContainer ); + CtrlOwned->visible( false ); + CtrlOwned->enabled( true ); return tCtrl; } -Uint32 UITabWidget::Add( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ) { - return Add( CreateTab( Text, CtrlOwned, Icon ) ); +Uint32 UITabWidget::add( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ) { + return add( createTab( Text, CtrlOwned, Icon ) ); } -Uint32 UITabWidget::Add( UITab * Tab ) { - Tab->Parent( mTabContainer ); +Uint32 UITabWidget::add( UITab * Tab ) { + Tab->parent( mTabContainer ); mTabs.push_back( Tab ); if ( NULL == mTabSelected ) { - SetTabSelected( Tab ); + setTabSelected( Tab ); } else { - OrderTabs(); + orderTabs(); } return mTabs.size() - 1; } -UITab * UITabWidget::GetTab( const Uint32& Index ) { +UITab * UITabWidget::getTab( const Uint32& Index ) { eeASSERT( Index < mTabs.size() ); return mTabs[ Index ]; } -UITab * UITabWidget::GetTab( const String& Text ) { +UITab * UITabWidget::getTab( const String& Text ) { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { - if ( mTabs[i]->IsType( UI_TYPE_TAB ) ) { + if ( mTabs[i]->isType( UI_TYPE_TAB ) ) { UITab * tTab = reinterpret_cast( mTabs[i] ); - if ( tTab->Text() == Text ) + if ( tTab->text() == Text ) return tTab; } } @@ -250,7 +250,7 @@ UITab * UITabWidget::GetTab( const String& Text ) { return NULL; } -Uint32 UITabWidget::GetTabIndex( UITab * Tab ) { +Uint32 UITabWidget::getTabIndex( UITab * Tab ) { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { if ( mTabs[i] == Tab ) return i; @@ -259,15 +259,15 @@ Uint32 UITabWidget::GetTabIndex( UITab * Tab ) { return eeINDEX_NOT_FOUND; } -Uint32 UITabWidget::Count() const { +Uint32 UITabWidget::count() const { return mTabs.size(); } -void UITabWidget::Remove( const Uint32& Index ) { +void UITabWidget::remove( const Uint32& Index ) { eeASSERT( Index < mTabs.size() ); if ( mTabs[ Index ] == mTabSelected ) { - mTabSelected->CtrlOwned()->Visible( false ); + mTabSelected->ctrlOwned()->visible( false ); } eeSAFE_DELETE( mTabs[ Index ] ); @@ -279,12 +279,12 @@ void UITabWidget::Remove( const Uint32& Index ) { if ( Index == mTabSelectedIndex ) { if ( mTabs.size() > 0 ) { if ( mTabSelectedIndex < mTabs.size() ) { - SetTabSelected( mTabs[ mTabSelectedIndex ] ); + setTabSelected( mTabs[ mTabSelectedIndex ] ); } else { if ( mTabSelectedIndex > 0 && mTabSelectedIndex - 1 < mTabs.size() ) { - SetTabSelected( mTabs[ mTabSelectedIndex - 1 ] ); + setTabSelected( mTabs[ mTabSelectedIndex - 1 ] ); } else { - SetTabSelected( mTabs[ 0 ] ); + setTabSelected( mTabs[ 0 ] ); } } } else { @@ -293,14 +293,14 @@ void UITabWidget::Remove( const Uint32& Index ) { } } - OrderTabs(); + orderTabs(); } -void UITabWidget::Remove( UITab * Tab ) { - Remove( GetTabIndex( Tab ) ); +void UITabWidget::remove( UITab * Tab ) { + remove( getTabIndex( Tab ) ); } -void UITabWidget::RemoveAll() { +void UITabWidget::removeAll() { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { eeSAFE_DELETE( mTabs[ i ] ); } @@ -310,98 +310,98 @@ void UITabWidget::RemoveAll() { mTabSelected = NULL; mTabSelectedIndex = eeINDEX_NOT_FOUND; - OrderTabs(); + orderTabs(); } -void UITabWidget::Insert( const String& Text, UIControl * CtrlOwned, SubTexture * Icon, const Uint32& Index ) { - Insert( CreateTab( Text, CtrlOwned, Icon ), Index ); +void UITabWidget::insert( const String& Text, UIControl * CtrlOwned, SubTexture * Icon, const Uint32& Index ) { + insert( createTab( Text, CtrlOwned, Icon ), Index ); } -void UITabWidget::Insert( UITab * Tab, const Uint32& Index ) { +void UITabWidget::insert( UITab * Tab, const Uint32& Index ) { mTabs.insert( mTabs.begin() + Index, Tab ); - ChildAddAt( Tab, Index ); + childAddAt( Tab, Index ); - OrderTabs(); + orderTabs(); } -void UITabWidget::SetTabSelected( UITab * Tab ) { +void UITabWidget::setTabSelected( UITab * Tab ) { if ( Tab == mTabSelected ) { return; } if ( NULL != mTabSelected ) { - mTabSelected->Unselect(); - mTabSelected->CtrlOwned()->Visible( false ); + mTabSelected->unselect(); + mTabSelected->ctrlOwned()->visible( false ); } if ( NULL != Tab ) { - Tab->Select(); + Tab->select(); } else { return; } - Uint32 TabIndex = GetTabIndex( Tab ); + Uint32 TabIndex = getTabIndex( Tab ); if ( eeINDEX_NOT_FOUND != TabIndex ) { mTabSelected = Tab; mTabSelectedIndex = TabIndex; - mTabSelected->CtrlOwned()->Visible( true ); - mTabSelected->CtrlOwned()->Size( mCtrlContainer->Size() ); - mTabSelected->CtrlOwned()->Pos( 0, 0 ); + mTabSelected->ctrlOwned()->visible( true ); + mTabSelected->ctrlOwned()->size( mCtrlContainer->size() ); + mTabSelected->ctrlOwned()->position( 0, 0 ); - OrderTabs(); + orderTabs(); - SendCommonEvent( UIEvent::EventOnTabSelected ); + sendCommonEvent( UIEvent::EventOnTabSelected ); } } -void UITabWidget::SelectPrev() { +void UITabWidget::selectPrev() { if ( eeINDEX_NOT_FOUND != mTabSelectedIndex && mTabSelectedIndex > 0 ) { - SetTabSelected( GetTab( mTabSelectedIndex - 1 ) ); + setTabSelected( getTab( mTabSelectedIndex - 1 ) ); } } -void UITabWidget::SelectNext() { +void UITabWidget::selectNext() { if ( mTabSelectedIndex + 1 < mTabs.size() ) { - SetTabSelected( GetTab( mTabSelectedIndex + 1 ) ); + setTabSelected( getTab( mTabSelectedIndex + 1 ) ); } } -UITab * UITabWidget::GetSelectedTab() const { +UITab * UITabWidget::getSelectedTab() const { return mTabSelected; } -Uint32 UITabWidget::GetSelectedTabIndex() const { +Uint32 UITabWidget::getSelectedTabIndex() const { return mTabSelectedIndex; } -void UITabWidget::OnSizeChange() { - SeContainerSize(); - SetTabContainerSize(); - PosTabs(); +void UITabWidget::onSizeChange() { + seContainerSize(); + setTabContainerSize(); + posTabs(); if ( NULL != mTabSelected ) { - mTabSelected->CtrlOwned()->Size( mCtrlContainer->Size() ); + mTabSelected->ctrlOwned()->size( mCtrlContainer->size() ); } - UIControl::OnSizeChange(); + UIControl::onSizeChange(); } -void UITabWidget::ApplyThemeToTabs() { +void UITabWidget::applyThemeToTabs() { if ( mSpecialBorderTabs ) { for ( Uint32 i = 0; i < mTabs.size(); i++ ) { - mTabs[ i ]->ApplyDefaultTheme(); + mTabs[ i ]->applyDefaultTheme(); } } } -UIComplexControl * UITabWidget::TabContainer() const { +UIComplexControl * UITabWidget::getTabContainer() const { return mTabContainer; } -UIComplexControl * UITabWidget::ControlContainer() const { +UIComplexControl * UITabWidget::getControlContainer() const { return mCtrlContainer; } diff --git a/src/eepp/ui/uitextbox.cpp b/src/eepp/ui/uitextbox.cpp index 5784b1536..3cc11e4dd 100644 --- a/src/eepp/ui/uitextbox.cpp +++ b/src/eepp/ui/uitextbox.cpp @@ -23,36 +23,36 @@ UITextBox::UITextBox( const UITextBox::CreateParams& Params ) : mTextCache->shadowColor( mFontShadowColor ); if ( NULL == Params.Font ) { - if ( NULL != UIThemeManager::instance()->DefaultFont() ) - mTextCache->font( UIThemeManager::instance()->DefaultFont() ); + if ( NULL != UIThemeManager::instance()->defaultFont() ) + mTextCache->font( UIThemeManager::instance()->defaultFont() ); else eePRINTL( "UITextBox::UITextBox : Created a UI TextBox without a defined font." ); } - AutoAlign(); + autoAlign(); } UITextBox::~UITextBox() { eeSAFE_DELETE( mTextCache ); } -Uint32 UITextBox::Type() const { +Uint32 UITextBox::getType() const { return UI_TYPE_TEXTBOX; } -bool UITextBox::IsType( const Uint32& type ) const { - return UITextBox::Type() == type ? true : UIComplexControl::IsType( type ); +bool UITextBox::isType( const Uint32& type ) const { + return UITextBox::getType() == type ? true : UIComplexControl::isType( type ); } -void UITextBox::Draw() { +void UITextBox::draw() { if ( mVisible && 0.f != mAlpha ) { - UIControlAnim::Draw(); + UIControlAnim::draw(); - DrawSelection(); + drawSelection(); if ( mTextCache->getTextWidth() ) { if ( mFlags & UI_CLIP_ENABLE ) { - UIManager::instance()->ClipEnable( + UIManager::instance()->clipEnable( mScreenPos.x + mPadding.Left, mScreenPos.y + mPadding.Top, mSize.width() - mPadding.Left - mPadding.Right, @@ -60,38 +60,38 @@ void UITextBox::Draw() { ); } - mTextCache->flags( Flags() ); - mTextCache->draw( (Float)mScreenPos.x + mAlignOffset.x + (Float)mPadding.Left, (Float)mScreenPos.y + mAlignOffset.y + (Float)mPadding.Top, Vector2f::One, 0.f, Blend() ); + mTextCache->flags( flags() ); + mTextCache->draw( (Float)mScreenPos.x + mAlignOffset.x + (Float)mPadding.Left, (Float)mScreenPos.y + mAlignOffset.y + (Float)mPadding.Top, Vector2f::One, 0.f, blend() ); if ( mFlags & UI_CLIP_ENABLE ) { - UIManager::instance()->ClipDisable(); + UIManager::instance()->clipDisable(); } } } } -Graphics::Font * UITextBox::Font() const { +Graphics::Font * UITextBox::font() const { return mTextCache->font(); } -void UITextBox::Font( Graphics::Font * font ) { +void UITextBox::font( Graphics::Font * font ) { if ( mTextCache->font() != font ) { mTextCache->font( font ); - AutoShrink(); - AutoSize(); - AutoAlign(); - OnFontChanged(); + autoShrink(); + autoSize(); + autoAlign(); + onFontChanged(); } } -const String& UITextBox::Text() { +const String& UITextBox::text() { if ( mFlags & UI_AUTO_SHRINK_TEXT ) return mString; return mTextCache->text(); } -void UITextBox::Text( const String& text ) { +void UITextBox::text( const String& text ) { if ( mFlags & UI_AUTO_SHRINK_TEXT ) { mString = text; mTextCache->text( mString ); @@ -99,55 +99,55 @@ void UITextBox::Text( const String& text ) { mTextCache->text( text ); } - AutoShrink(); - AutoSize(); - AutoAlign(); - OnTextChanged(); + autoShrink(); + autoSize(); + autoAlign(); + onTextChanged(); } -const ColorA& UITextBox::Color() const { +const ColorA& UITextBox::color() const { return mFontColor; } -void UITextBox::Color( const ColorA& color ) { +void UITextBox::color( const ColorA& color ) { mFontColor = color; mTextCache->color( color ); - Alpha( color.a() ); + alpha( color.a() ); } -const ColorA& UITextBox::ShadowColor() const { +const ColorA& UITextBox::shadowColor() const { return mFontShadowColor; } -void UITextBox::ShadowColor( const ColorA& color ) { +void UITextBox::shadowColor( const ColorA& color ) { mFontShadowColor = color; mTextCache->shadowColor( mFontColor ); } -const ColorA& UITextBox::SelectionBackColor() const { +const ColorA& UITextBox::selectionBackColor() const { return mFontSelectionBackColor; } -void UITextBox::SelectionBackColor( const ColorA& color ) { +void UITextBox::selectionBackColor( const ColorA& color ) { mFontSelectionBackColor = color; } -void UITextBox::Alpha( const Float& alpha ) { - UIControlAnim::Alpha( alpha ); +void UITextBox::alpha( const Float& alpha ) { + UIControlAnim::alpha( alpha ); mFontColor.Alpha = (Uint8)alpha; mFontShadowColor.Alpha = (Uint8)alpha; mTextCache->alpha( mFontColor.Alpha ); } -void UITextBox::AutoShrink() { +void UITextBox::autoShrink() { if ( mFlags & UI_AUTO_SHRINK_TEXT ) { - ShrinkText( mSize.width() ); + shrinkText( mSize.width() ); } } -void UITextBox::ShrinkText( const Uint32& MaxWidth ) { +void UITextBox::shrinkText( const Uint32& MaxWidth ) { if ( mFlags & UI_AUTO_SHRINK_TEXT ) { mTextCache->text( mString ); } @@ -155,15 +155,15 @@ void UITextBox::ShrinkText( const Uint32& MaxWidth ) { mTextCache->font()->shrinkText( mTextCache->text(), MaxWidth ); } -void UITextBox::AutoSize() { +void UITextBox::autoSize() { if ( mFlags & UI_AUTO_SIZE ) { mSize.width( (int)mTextCache->getTextWidth() ); mSize.height( (int)mTextCache->getTextHeight() ); } } -void UITextBox::AutoAlign() { - switch ( FontHAlignGet( Flags() ) ) { +void UITextBox::autoAlign() { + switch ( FontHAlignGet( flags() ) ) { case UI_HALIGN_CENTER: mAlignOffset.x = (Float)( (Int32)( mSize.x - mTextCache->getTextWidth() ) / 2 ); break; @@ -175,7 +175,7 @@ void UITextBox::AutoAlign() { break; } - switch ( FontVAlignGet( Flags() ) ) { + switch ( FontVAlignGet( flags() ) ) { case UI_VALIGN_CENTER: mAlignOffset.y = (Float)( ( (Int32)( mSize.y - mTextCache->getTextHeight() ) ) / 2 ) - 1; break; @@ -188,71 +188,71 @@ void UITextBox::AutoAlign() { } } -Uint32 UITextBox::OnFocusLoss() { - SelCurInit( -1 ); - SelCurEnd( -1 ); +Uint32 UITextBox::onFocusLoss() { + selCurInit( -1 ); + selCurEnd( -1 ); return 1; } -void UITextBox::OnSizeChange() { - AutoShrink(); - AutoSize(); - AutoAlign(); +void UITextBox::onSizeChange() { + autoShrink(); + autoSize(); + autoAlign(); - UIControlAnim::OnSizeChange(); + UIControlAnim::onSizeChange(); mTextCache->cache(); } -void UITextBox::OnTextChanged() { - SendCommonEvent( UIEvent::EventOnTextChanged ); +void UITextBox::onTextChanged() { + sendCommonEvent( UIEvent::EventOnTextChanged ); } -void UITextBox::OnFontChanged() { - SendCommonEvent( UIEvent::EventOnFontChanged ); +void UITextBox::onFontChanged() { + sendCommonEvent( UIEvent::EventOnFontChanged ); } -void UITextBox::Padding( const Recti& padding ) { +void UITextBox::padding( const Recti& padding ) { mPadding = padding; } -const Recti& UITextBox::Padding() const { +const Recti& UITextBox::padding() const { return mPadding; } -void UITextBox::SetTheme( UITheme * Theme ) { - UIControlAnim::SetTheme( Theme ); +void UITextBox::setTheme( UITheme * Theme ) { + UIControlAnim::setTheme( Theme ); - if ( NULL == mTextCache->font() && NULL != Theme->Font() ) { - mTextCache->font( Theme->Font() ); + if ( NULL == mTextCache->font() && NULL != Theme->font() ) { + mTextCache->font( Theme->font() ); } } -TextCache * UITextBox::GetTextCache() { +TextCache * UITextBox::getTextCache() { return mTextCache; } -Float UITextBox::GetTextWidth() { +Float UITextBox::getTextWidth() { return mTextCache->getTextWidth(); } -Float UITextBox::GetTextHeight() { +Float UITextBox::getTextHeight() { return mTextCache->getTextHeight(); } -const int& UITextBox::GetNumLines() const { +const int& UITextBox::getNumLines() const { return mTextCache->getNumLines(); } -const Vector2f& UITextBox::AlignOffset() const { +const Vector2f& UITextBox::alignOffset() const { return mAlignOffset; } -Uint32 UITextBox::OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { - if ( IsTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { +Uint32 UITextBox::onMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { + if ( isTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { Vector2i controlPos( Pos ); - WorldToControl( controlPos ); + worldToControl( controlPos ); Int32 curPos = mTextCache->font()->findClosestCursorPosFromPoint( mTextCache->text(), controlPos ); @@ -261,21 +261,21 @@ Uint32 UITextBox::OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) mTextCache->font()->selectSubStringFromCursor( mTextCache->text(), curPos, tSelCurInit, tSelCurEnd ); - SelCurInit( tSelCurInit ); - SelCurEnd( tSelCurEnd ); + selCurInit( tSelCurInit ); + selCurEnd( tSelCurEnd ); mControlFlags &= ~UI_CTRL_FLAG_SELECTING; } } - return UIComplexControl::OnMouseDoubleClick( Pos, Flags ); + return UIComplexControl::onMouseDoubleClick( Pos, Flags ); } -Uint32 UITextBox::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { - if ( IsTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { - if ( SelCurInit() == SelCurEnd() ) { - SelCurInit( -1 ); - SelCurEnd( -1 ); +Uint32 UITextBox::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { + if ( isTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { + if ( selCurInit() == selCurEnd() ) { + selCurInit( -1 ); + selCurEnd( -1 ); } mControlFlags &= ~UI_CTRL_FLAG_SELECTING; @@ -284,32 +284,32 @@ Uint32 UITextBox::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { return 1; } -Uint32 UITextBox::OnMouseDown( const Vector2i& Pos, const Uint32 Flags ) { - if ( IsTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { +Uint32 UITextBox::onMouseDown( const Vector2i& Pos, const Uint32 Flags ) { + if ( isTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) ) { Vector2i controlPos( Pos ); - WorldToControl( controlPos ); + worldToControl( controlPos ); Int32 curPos = mTextCache->font()->findClosestCursorPosFromPoint( mTextCache->text(), controlPos ); if ( -1 != curPos ) { - if ( -1 == SelCurInit() || !( mControlFlags & UI_CTRL_FLAG_SELECTING ) ) { - SelCurInit( curPos ); - SelCurEnd( curPos ); + if ( -1 == selCurInit() || !( mControlFlags & UI_CTRL_FLAG_SELECTING ) ) { + selCurInit( curPos ); + selCurEnd( curPos ); } else { - SelCurEnd( curPos ); + selCurEnd( curPos ); } } mControlFlags |= UI_CTRL_FLAG_SELECTING; } - return UIComplexControl::OnMouseDown( Pos, Flags ); + return UIComplexControl::onMouseDown( Pos, Flags ); } -void UITextBox::DrawSelection() { - if ( SelCurInit() != SelCurEnd() ) { - Int32 init = eemin( SelCurInit(), SelCurEnd() ); - Int32 end = eemax( SelCurInit(), SelCurEnd() ); +void UITextBox::drawSelection() { + if ( selCurInit() != selCurEnd() ) { + Int32 init = eemin( selCurInit(), selCurEnd() ); + Int32 end = eemax( selCurInit(), selCurEnd() ); if ( init < 0 && end > (Int32)mTextCache->text().size() ) { return; @@ -342,23 +342,23 @@ void UITextBox::DrawSelection() { } } -bool UITextBox::IsTextSelectionEnabled() const { +bool UITextBox::isTextSelectionEnabled() const { return 0 != ( mFlags & UI_TEXT_SELECTION_ENABLED ); } -void UITextBox::SelCurInit( const Int32& init ) { +void UITextBox::selCurInit( const Int32& init ) { mSelCurInit = init; } -void UITextBox::SelCurEnd( const Int32& end ) { +void UITextBox::selCurEnd( const Int32& end ) { mSelCurEnd = end; } -Int32 UITextBox::SelCurInit() { +Int32 UITextBox::selCurInit() { return mSelCurInit; } -Int32 UITextBox::SelCurEnd() { +Int32 UITextBox::selCurEnd() { return mSelCurEnd; } diff --git a/src/eepp/ui/uitextedit.cpp b/src/eepp/ui/uitextedit.cpp index a1ac627ef..b7eb9ce52 100644 --- a/src/eepp/ui/uitextedit.cpp +++ b/src/eepp/ui/uitextedit.cpp @@ -41,13 +41,13 @@ UITextEdit::UITextEdit( UITextEdit::CreateParams& Params ) : mFlags |= UI_AUTO_SHRINK_TEXT; mTextInput = eeNew( UITextInput, ( TIParams ) ); - mTextInput->GetInputTextBuffer()->supportNewLine( true ); - mTextInput->Visible( true ); - mTextInput->Enabled( true ); - mTextInput->AddEventListener( UIEvent::EventOnSizeChange , cb::Make1( this, &UITextEdit::OnInputSizeChange ) ); - mTextInput->AddEventListener( UIEvent::EventOnTextChanged , cb::Make1( this, &UITextEdit::OnInputSizeChange ) ); - mTextInput->AddEventListener( UIEvent::EventOnPressEnter , cb::Make1( this, &UITextEdit::OnInputSizeChange ) ); - mTextInput->AddEventListener( UIEvent::EventOnCursorPosChange , cb::Make1( this, &UITextEdit::OnCursorPosChange ) ); + mTextInput->getInputTextBuffer()->supportNewLine( true ); + mTextInput->visible( true ); + mTextInput->enabled( true ); + mTextInput->addEventListener( UIEvent::EventOnSizeChange , cb::Make1( this, &UITextEdit::onInputSizeChange ) ); + mTextInput->addEventListener( UIEvent::EventOnTextChanged , cb::Make1( this, &UITextEdit::onInputSizeChange ) ); + mTextInput->addEventListener( UIEvent::EventOnPressEnter , cb::Make1( this, &UITextEdit::onInputSizeChange ) ); + mTextInput->addEventListener( UIEvent::EventOnCursorPosChange , cb::Make1( this, &UITextEdit::onCursorPosChange ) ); UIScrollBar::CreateParams ScrollBarP; ScrollBarP.Parent( this ); @@ -56,123 +56,123 @@ UITextEdit::UITextEdit( UITextEdit::CreateParams& Params ) : ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); - mVScrollBar->Value( 1 ); + mVScrollBar->value( 1 ); ScrollBarP.PosSet( 0, mSize.height() - 15 ); - ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->Size().width(), 15 ); + ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); - mVScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UITextEdit::OnVScrollValueChange ) ); - mHScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UITextEdit::OnHScrollValueChange ) ); + mVScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UITextEdit::onVScrollValueChange ) ); + mHScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &UITextEdit::onHScrollValueChange ) ); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); - ApplyDefaultTheme(); + applyDefaultTheme(); - mTextInput->Size( mSize - Sizei( mPadding.Left + mPadding.Right, mPadding.Top + mPadding.Bottom ) ); + mTextInput->size( mSize - Sizei( mPadding.Left + mPadding.Right, mPadding.Top + mPadding.Bottom ) ); } UITextEdit::~UITextEdit() { } -Uint32 UITextEdit::Type() const { +Uint32 UITextEdit::getType() const { return UI_TYPE_TEXTEDIT; } -bool UITextEdit::IsType( const Uint32& type ) const { - return UITextEdit::Type() == type ? true : UIComplexControl::IsType( type ); +bool UITextEdit::isType( const Uint32& type ) const { + return UITextEdit::getType() == type ? true : UIComplexControl::isType( type ); } -void UITextEdit::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "textedit" ); +void UITextEdit::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "textedit" ); - mTextInput->SetThemeControl( Theme, "textedit_box" ); + mTextInput->setThemeControl( Theme, "textedit_box" ); - AutoPadding(); + autoPadding(); - OnSizeChange(); + onSizeChange(); } -void UITextEdit::OnSizeChange() { - mHScrollBar->Pos( 0, mSize.height() - mHScrollBar->Size().height() ); - mVScrollBar->Pos( mSize.width() - mVScrollBar->Size().width(), 0 ); +void UITextEdit::onSizeChange() { + mHScrollBar->position( 0, mSize.height() - mHScrollBar->size().height() ); + mVScrollBar->position( mSize.width() - mVScrollBar->size().width(), 0 ); - mHScrollBar->Size( mSize.width(), mHScrollBar->Size().height() ); - mVScrollBar->Size( mVScrollBar->Size().width(), mSize.height() ); + mHScrollBar->size( mSize.width(), mHScrollBar->size().height() ); + mVScrollBar->size( mVScrollBar->size().width(), mSize.height() ); - mTextInput->Pos( mPadding.Left, mPadding.Top ); + mTextInput->position( mPadding.Left, mPadding.Top ); - ScrollbarsSet(); + scrollbarsSet(); - FixScroll(); + fixScroll(); } -void UITextEdit::OnParentSizeChange( const Vector2i& SizeChange ) { - UIComplexControl::OnParentSizeChange( SizeChange ); +void UITextEdit::onParentSizeChange( const Vector2i& SizeChange ) { + UIComplexControl::onParentSizeChange( SizeChange ); - OnInputSizeChange( NULL ); + onInputSizeChange( NULL ); } -void UITextEdit::OnAlphaChange() { - mTextInput->Alpha( mAlpha ); - mHScrollBar->Alpha( mAlpha ); - mVScrollBar->Alpha( mAlpha ); +void UITextEdit::onAlphaChange() { + mTextInput->alpha( mAlpha ); + mHScrollBar->alpha( mAlpha ); + mVScrollBar->alpha( mAlpha ); - UIComplexControl::OnAlphaChange(); + UIComplexControl::onAlphaChange(); } -void UITextEdit::FixScroll() { +void UITextEdit::fixScroll() { int Width = mSize.width() - mPadding.Left - mPadding.Right; int Height = mSize.height() - mPadding.Top - mPadding.Bottom; - if ( mHScrollBar->Visible() ) - Height -= mHScrollBar->Size().height(); + if ( mHScrollBar->visible() ) + Height -= mHScrollBar->size().height(); int diff; Float pos; - if ( mTextInput->Size().height() - Height >= 0 ) { - diff = mTextInput->Size().height() - Height; + if ( mTextInput->size().height() - Height >= 0 ) { + diff = mTextInput->size().height() - Height; - pos = diff * mVScrollBar->Value(); + pos = diff * mVScrollBar->value(); - mTextInput->Pos( mTextInput->Pos().x, mPadding.Top - pos ); + mTextInput->position( mTextInput->position().x, mPadding.Top - pos ); } - if ( mTextInput->Size().width() - Width >= 0 ) { - diff = mTextInput->Size().width() - Width; + if ( mTextInput->size().width() - Width >= 0 ) { + diff = mTextInput->size().width() - Width; - pos = diff * mHScrollBar->Value(); + pos = diff * mHScrollBar->value(); - mTextInput->Pos( mPadding.Left - pos, mTextInput->Pos().y ); + mTextInput->position( mPadding.Left - pos, mTextInput->position().y ); } } -void UITextEdit::ScrollbarsSet() { +void UITextEdit::scrollbarsSet() { switch ( mHScrollBarMode ) { case UI_SCROLLBAR_ALWAYS_OFF: { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); break; } case UI_SCROLLBAR_ALWAYS_ON: { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); break; } case UI_SCROLLBAR_AUTO: { - if ( mTextInput->GetTextWidth() > mSize.width() - mPadding.Left - mPadding.Right ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + if ( mTextInput->getTextWidth() > mSize.width() - mPadding.Left - mPadding.Right ) { + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); } else { - mHScrollBar->Visible( false ); - mHScrollBar->Enabled( false ); + mHScrollBar->visible( false ); + mHScrollBar->enabled( false ); } break; } @@ -181,219 +181,219 @@ void UITextEdit::ScrollbarsSet() { switch ( mVScrollBarMode ) { case UI_SCROLLBAR_ALWAYS_OFF: { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); break; } case UI_SCROLLBAR_ALWAYS_ON: { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); break; } case UI_SCROLLBAR_AUTO: { int extraH = 0; - if ( mHScrollBar->Visible() ) - extraH = mHScrollBar->Size().height(); + if ( mHScrollBar->visible() ) + extraH = mHScrollBar->size().height(); - if ( mTextInput->GetTextHeight() > mSize.height() - mPadding.Top - mPadding.Bottom - extraH ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + if ( mTextInput->getTextHeight() > mSize.height() - mPadding.Top - mPadding.Bottom - extraH ) { + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } else { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } break; } } - if ( !mVScrollBar->Visible() && mHScrollBar->Visible() ) { - mHScrollBar->Size( mSize.width(), mHScrollBar->Size().height() ); + if ( !mVScrollBar->visible() && mHScrollBar->visible() ) { + mHScrollBar->size( mSize.width(), mHScrollBar->size().height() ); } else { - mHScrollBar->Size( mSize.width() - mVScrollBar->Size().width(), mHScrollBar->Size().height() ); + mHScrollBar->size( mSize.width() - mVScrollBar->size().width(), mHScrollBar->size().height() ); } - if ( UI_SCROLLBAR_AUTO == mHScrollBarMode && mVScrollBar->Visible() && !mHScrollBar->Visible() ) { - if ( mTextInput->GetTextWidth() > mSize.width() - mPadding.Left - mPadding.Right - mVScrollBar->Size().width() ) { - mHScrollBar->Visible( true ); - mHScrollBar->Enabled( true ); + if ( UI_SCROLLBAR_AUTO == mHScrollBarMode && mVScrollBar->visible() && !mHScrollBar->visible() ) { + if ( mTextInput->getTextWidth() > mSize.width() - mPadding.Left - mPadding.Right - mVScrollBar->size().width() ) { + mHScrollBar->visible( true ); + mHScrollBar->enabled( true ); } } if ( mFlags & UI_AUTO_SHRINK_TEXT ) { - mVScrollBar->Visible( true ); - mVScrollBar->Enabled( true ); + mVScrollBar->visible( true ); + mVScrollBar->enabled( true ); } } -void UITextEdit::AutoPadding() { +void UITextEdit::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPadding = MakePadding(); + mPadding = makePadding(); } } -void UITextEdit::OnVScrollValueChange( const UIEvent * Event ) { +void UITextEdit::onVScrollValueChange( const UIEvent * Event ) { if ( !mSkipValueChange ) - FixScroll(); + fixScroll(); } -void UITextEdit::OnHScrollValueChange( const UIEvent * Event ) { +void UITextEdit::onHScrollValueChange( const UIEvent * Event ) { if ( !mSkipValueChange ) - FixScroll(); + fixScroll(); } -UITextInput * UITextEdit::TextInput() const { +UITextInput * UITextEdit::getTextInput() const { return mTextInput; } -UIScrollBar * UITextEdit::HScrollBar() const { +UIScrollBar * UITextEdit::getHScrollBar() const { return mHScrollBar; } -UIScrollBar * UITextEdit::VScrollBar() const { +UIScrollBar * UITextEdit::getVScrollBar() const { return mVScrollBar; } -const String& UITextEdit::Text() const { - return mTextInput->Text(); +const String& UITextEdit::text() const { + return mTextInput->text(); } -void UITextEdit::Text( const String& Txt ) { - mTextInput->Text( Txt ); +void UITextEdit::text( const String& Txt ) { + mTextInput->text( Txt ); - OnInputSizeChange(); + onInputSizeChange(); - OnSizeChange(); + onSizeChange(); } -void UITextEdit::OnInputSizeChange( const UIEvent * Event ) { +void UITextEdit::onInputSizeChange( const UIEvent * Event ) { int Width = mSize.width() - mPadding.Left - mPadding.Right; int Height = mSize.height() - mPadding.Top - mPadding.Bottom; if ( NULL != Event ) { - if ( Event->EventType() == UIEvent::EventOnPressEnter ) { - mHScrollBar->Value( 0 ); + if ( Event->getEventType() == UIEvent::EventOnPressEnter ) { + mHScrollBar->value( 0 ); } } - ScrollbarsSet(); + scrollbarsSet(); - if ( mHScrollBar->Visible() ) - Height -= mHScrollBar->Size().height(); + if ( mHScrollBar->visible() ) + Height -= mHScrollBar->size().height(); - if ( mVScrollBar->Visible() ) - Width -= mVScrollBar->Size().width(); + if ( mVScrollBar->visible() ) + Width -= mVScrollBar->size().width(); - ShrinkText( Width ); + shrinkText( Width ); - if ( ( mFlags & UI_AUTO_SHRINK_TEXT ) && mTextInput->GetTextHeight() < Height ) { - mVScrollBar->Visible( false ); - mVScrollBar->Enabled( false ); + if ( ( mFlags & UI_AUTO_SHRINK_TEXT ) && mTextInput->getTextHeight() < Height ) { + mVScrollBar->visible( false ); + mVScrollBar->enabled( false ); } - if ( mTextInput->Size().width() < Width || mTextInput->Size().height() < Height ) { - if ( mTextInput->Size().width() < Width && mTextInput->Size().height() < Height ) { - mTextInput->Size( Width, Height ); + if ( mTextInput->size().width() < Width || mTextInput->size().height() < Height ) { + if ( mTextInput->size().width() < Width && mTextInput->size().height() < Height ) { + mTextInput->size( Width, Height ); } else { - if ( mTextInput->Size().width() < Width ) { - mTextInput->Size( Width, mTextInput->Size().height() ); + if ( mTextInput->size().width() < Width ) { + mTextInput->size( Width, mTextInput->size().height() ); } else { - mTextInput->Size( mTextInput->Size().width(), Height ); + mTextInput->size( mTextInput->size().width(), Height ); } } } - if ( mTextInput->GetTextWidth() > Width || mTextInput->GetTextHeight() > Height ) { - if ( mTextInput->GetTextWidth() > Width && mTextInput->GetTextHeight() > Height ) { - mTextInput->Size( mTextInput->GetTextWidth(), mTextInput->GetTextHeight() ); + if ( mTextInput->getTextWidth() > Width || mTextInput->getTextHeight() > Height ) { + if ( mTextInput->getTextWidth() > Width && mTextInput->getTextHeight() > Height ) { + mTextInput->size( mTextInput->getTextWidth(), mTextInput->getTextHeight() ); } else { - if ( mTextInput->GetTextWidth() > Width ) { - mTextInput->Size( mTextInput->GetTextWidth(), Height ); + if ( mTextInput->getTextWidth() > Width ) { + mTextInput->size( mTextInput->getTextWidth(), Height ); } else { - mTextInput->Size( Width, mTextInput->GetTextHeight() ); + mTextInput->size( Width, mTextInput->getTextHeight() ); } } } else { - mTextInput->Size( Width, Height ); + mTextInput->size( Width, Height ); } - FixScroll(); - FixScrollToCursor(); + fixScroll(); + fixScrollToCursor(); } -void UITextEdit::OnCursorPosChange( const UIEvent * Event ) { - FixScrollToCursor(); +void UITextEdit::onCursorPosChange( const UIEvent * Event ) { + fixScrollToCursor(); } -void UITextEdit::FixScrollToCursor() { +void UITextEdit::fixScrollToCursor() { int Width = mSize.width() - mPadding.Left - mPadding.Right; int Height = mSize.height() - mPadding.Top - mPadding.Bottom; - if ( mVScrollBar->Visible() ) - Width -= mVScrollBar->Size().width(); + if ( mVScrollBar->visible() ) + Width -= mVScrollBar->size().width(); - if ( mHScrollBar->Visible() ) - Height -= mHScrollBar->Size().height(); + if ( mHScrollBar->visible() ) + Height -= mHScrollBar->size().height(); - if ( FontHAlignGet( mTextInput->Flags() ) == UI_HALIGN_LEFT ) { + if ( FontHAlignGet( mTextInput->flags() ) == UI_HALIGN_LEFT ) { Uint32 NLPos = 0; - Uint32 LineNum = mTextInput->GetInputTextBuffer()->getCurPosLinePos( NLPos ); + Uint32 LineNum = mTextInput->getInputTextBuffer()->getCurPosLinePos( NLPos ); - mTextInput->GetTextCache()->font()->setText( - mTextInput->GetInputTextBuffer()->buffer().substr( - NLPos, mTextInput->GetInputTextBuffer()->curPos() - NLPos + mTextInput->getTextCache()->font()->setText( + mTextInput->getInputTextBuffer()->buffer().substr( + NLPos, mTextInput->getInputTextBuffer()->curPos() - NLPos ) ); mSkipValueChange = true; - Float tW = mTextInput->GetTextCache()->font()->getTextWidth(); - Float tH = (Float)(LineNum + 1) * (Float)mTextInput->GetTextCache()->font()->getFontHeight(); + Float tW = mTextInput->getTextCache()->font()->getTextWidth(); + Float tH = (Float)(LineNum + 1) * (Float)mTextInput->getTextCache()->font()->getFontHeight(); if ( tW > Width ) { - mTextInput->Pos( mPadding.Left + Width - tW, mTextInput->Pos().y ); + mTextInput->position( mPadding.Left + Width - tW, mTextInput->position().y ); } else { - mTextInput->Pos( mPadding.Left, mTextInput->Pos().y ); + mTextInput->position( mPadding.Left, mTextInput->position().y ); } if ( tH > Height ) { - mTextInput->Pos( mTextInput->Pos().x, mPadding.Top + Height - tH ); + mTextInput->position( mTextInput->position().x, mPadding.Top + Height - tH ); } else { - mTextInput->Pos( mTextInput->Pos().x, mPadding.Top ); + mTextInput->position( mTextInput->position().x, mPadding.Top ); } - mHScrollBar->Value( tW / mTextInput->Size().width() ); - mVScrollBar->Value( tH / mTextInput->Size().height() ); + mHScrollBar->value( tW / mTextInput->size().width() ); + mVScrollBar->value( tH / mTextInput->size().height() ); mSkipValueChange = false; } } -void UITextEdit::ShrinkText( const Uint32& Width ) { - if ( Flags() & UI_AUTO_SHRINK_TEXT ) { - mTextInput->ShrinkText( Width ); +void UITextEdit::shrinkText( const Uint32& Width ) { + if ( flags() & UI_AUTO_SHRINK_TEXT ) { + mTextInput->shrinkText( Width ); } } -void UITextEdit::Update() { - UIControlAnim::Update(); +void UITextEdit::update() { + UIControlAnim::update(); - if ( mTextInput->Enabled() && mTextInput->Visible() && mTextInput->IsMouseOver() && mVScrollBar->Visible() ) { - Uint32 Flags = UIManager::instance()->GetInput()->clickTrigger(); + if ( mTextInput->enabled() && mTextInput->visible() && mTextInput->isMouseOver() && mVScrollBar->visible() ) { + Uint32 Flags = UIManager::instance()->getInput()->clickTrigger(); if ( Flags & EE_BUTTONS_WUWD ) - mVScrollBar->Slider()->ManageClick( Flags ); + mVScrollBar->getSlider()->manageClick( Flags ); } } -void UITextEdit::AllowEditing( const bool& allow ) { - mTextInput->AllowEditing( allow ); +void UITextEdit::allowEditing( const bool& allow ) { + mTextInput->allowEditing( allow ); } -const bool& UITextEdit::AllowEditing() const { - return mTextInput->AllowEditing(); +const bool& UITextEdit::allowEditing() const { + return mTextInput->allowEditing(); } }} diff --git a/src/eepp/ui/uitextinput.cpp b/src/eepp/ui/uitextinput.cpp index 65f55efea..bffbe4291 100644 --- a/src/eepp/ui/uitextinput.cpp +++ b/src/eepp/ui/uitextinput.cpp @@ -17,43 +17,43 @@ UITextInput::UITextInput( const UITextInput::CreateParams& Params ) : mTextBuffer.start(); mTextBuffer.active( false ); mTextBuffer.supportFreeEditing( Params.SupportFreeEditing ); - mTextBuffer.textSelectionEnabled( IsTextSelectionEnabled() ); + mTextBuffer.textSelectionEnabled( isTextSelectionEnabled() ); mTextBuffer.maxLength( Params.MaxLength ); - mTextBuffer.setReturnCallback( cb::Make0( this, &UITextInput::PrivOnPressEnter ) ); + mTextBuffer.setReturnCallback( cb::Make0( this, &UITextInput::privOnPressEnter ) ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UITextInput::~UITextInput() { } -Uint32 UITextInput::Type() const { +Uint32 UITextInput::getType() const { return UI_TYPE_TEXTINPUT; } -bool UITextInput::IsType( const Uint32& type ) const { - return UITextInput::Type() == type ? true : UITextBox::IsType( type ); +bool UITextInput::isType( const Uint32& type ) const { + return UITextInput::getType() == type ? true : UITextBox::isType( type ); } -void UITextInput::Update() { - if ( IsMouseOverMeOrChilds() ) { - UIManager::instance()->SetCursor( EE_CURSOR_IBEAM ); +void UITextInput::update() { + if ( isMouseOverMeOrChilds() ) { + UIManager::instance()->setCursor( EE_CURSOR_IBEAM ); } - UITextBox::Update(); + UITextBox::update(); if ( mTextBuffer.changedSinceLastUpdate() ) { Vector2f offSet = mAlignOffset; - UITextBox::Text( mTextBuffer.buffer() ); + UITextBox::text( mTextBuffer.buffer() ); - UpdateText(); + updateText(); mAlignOffset = offSet; - ResetWaitCursor(); + resetWaitCursor(); - AlignFix(); + alignFix(); mCursorPos = mTextBuffer.curPos(); @@ -63,19 +63,19 @@ void UITextInput::Update() { } if ( mCursorPos != mTextBuffer.curPos() ) { - AlignFix(); + alignFix(); mCursorPos = mTextBuffer.curPos(); - OnCursorPosChange(); + onCursorPosChange(); } } -void UITextInput::OnCursorPosChange() { - SendCommonEvent( UIEvent::EventOnCursorPosChange ); +void UITextInput::onCursorPosChange() { + sendCommonEvent( UIEvent::EventOnCursorPosChange ); } -void UITextInput::DrawWaitingCursor() { +void UITextInput::drawWaitingCursor() { if ( mVisible && mTextBuffer.active() && mTextBuffer.supportFreeEditing() ) { - mWaitCursorTime += UIManager::instance()->Elapsed().asMilliseconds(); + mWaitCursorTime += UIManager::instance()->elapsed().asMilliseconds(); if ( mShowingWait ) { bool disableSmooth = mShowingWait && GLi->isLineSmooth(); @@ -105,49 +105,49 @@ void UITextInput::DrawWaitingCursor() { } } -void UITextInput::Draw() { - UITextBox::Draw(); +void UITextInput::draw() { + UITextBox::draw(); - DrawWaitingCursor(); + drawWaitingCursor(); } -Uint32 UITextInput::OnFocus() { - UIControlAnim::OnFocus(); +Uint32 UITextInput::onFocus() { + UIControlAnim::onFocus(); if ( mAllowEditing ) { mTextBuffer.active( true ); - ResetWaitCursor(); + resetWaitCursor(); } return 1; } -Uint32 UITextInput::OnFocusLoss() { +Uint32 UITextInput::onFocusLoss() { mTextBuffer.active( false ); - return UITextBox::OnFocusLoss(); + return UITextBox::onFocusLoss(); } -Uint32 UITextInput::OnPressEnter() { - SendCommonEvent( UIEvent::EventOnPressEnter ); +Uint32 UITextInput::onPressEnter() { + sendCommonEvent( UIEvent::EventOnPressEnter ); return 0; } -void UITextInput::PrivOnPressEnter() { - OnPressEnter(); +void UITextInput::privOnPressEnter() { + onPressEnter(); } -void UITextInput::PushIgnoredChar( const Uint32& ch ) { +void UITextInput::pushIgnoredChar( const Uint32& ch ) { mTextBuffer.pushIgnoredChar( ch ); } -void UITextInput::ResetWaitCursor() { +void UITextInput::resetWaitCursor() { mShowingWait = true; mWaitCursorTime = 0.f; } -void UITextInput::AlignFix() { - if ( FontHAlignGet( Flags() ) == UI_HALIGN_LEFT ) { +void UITextInput::alignFix() { + if ( FontHAlignGet( flags() ) == UI_HALIGN_LEFT ) { Uint32 NLPos = 0; Uint32 LineNum = mTextBuffer.getCurPosLinePos( NLPos ); @@ -168,105 +168,105 @@ void UITextInput::AlignFix() { } } -void UITextInput::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "textinput" ); +void UITextInput::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "textinput" ); - AutoPadding(); - AutoSize(); + autoPadding(); + autoSize(); } -void UITextInput::AutoSize() { +void UITextInput::autoSize() { if ( mFlags & UI_AUTO_SIZE ) { - Size( mSize.x, GetSkinSize().height() ); + size( mSize.x, getSkinSize().height() ); } } -void UITextInput::AutoPadding() { +void UITextInput::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPadding = MakePadding( true, true, false, false ); + mPadding = makePadding( true, true, false, false ); } } -InputTextBuffer * UITextInput::GetInputTextBuffer() { +InputTextBuffer * UITextInput::getInputTextBuffer() { return &mTextBuffer; } -void UITextInput::AllowEditing( const bool& allow ) { +void UITextInput::allowEditing( const bool& allow ) { mAllowEditing = allow; if ( !mAllowEditing && mTextBuffer.active() ) mTextBuffer.active( false ); } -const bool& UITextInput::AllowEditing() const { +const bool& UITextInput::allowEditing() const { return mAllowEditing; } -void UITextInput::Text( const String& text ) { - UITextBox::Text( text ); +void UITextInput::text( const String& text ) { + UITextBox::text( text ); mTextBuffer.buffer( text ); mTextBuffer.cursorToEnd(); } -const String& UITextInput::Text() { - return UITextBox::Text(); +const String& UITextInput::text() { + return UITextBox::text(); } -void UITextInput::ShrinkText( const Uint32& MaxWidth ) { +void UITextInput::shrinkText( const Uint32& MaxWidth ) { mTextCache->text( mTextBuffer.buffer() ); - UITextBox::ShrinkText( MaxWidth ); + UITextBox::shrinkText( MaxWidth ); mTextBuffer.buffer( mTextCache->text() ); - AlignFix(); + alignFix(); } -void UITextInput::UpdateText() { +void UITextInput::updateText() { } -Uint32 UITextInput::OnMouseClick( const Vector2i& Pos, const Uint32 Flags ) { +Uint32 UITextInput::onMouseClick( const Vector2i& Pos, const Uint32 Flags ) { if ( Flags & EE_BUTTON_LMASK ) { Vector2i controlPos( Pos ); - WorldToControl( controlPos ); + worldToControl( controlPos ); Int32 curPos = mTextCache->font()->findClosestCursorPosFromPoint( mTextCache->text(), controlPos ); if ( -1 != curPos ) { mTextBuffer.curPos( curPos ); - ResetWaitCursor(); + resetWaitCursor(); } } - return UITextBox::OnMouseClick( Pos, Flags ); + return UITextBox::onMouseClick( Pos, Flags ); } -Uint32 UITextInput::OnMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { - UITextBox::OnMouseDoubleClick( Pos, Flags ); +Uint32 UITextInput::onMouseDoubleClick( const Vector2i& Pos, const Uint32 Flags ) { + UITextBox::onMouseDoubleClick( Pos, Flags ); - if ( IsTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) && SelCurEnd() != -1 ) { - mTextBuffer.curPos( SelCurEnd() ); - ResetWaitCursor(); + if ( isTextSelectionEnabled() && ( Flags & EE_BUTTON_LMASK ) && selCurEnd() != -1 ) { + mTextBuffer.curPos( selCurEnd() ); + resetWaitCursor(); } return 1; } -Uint32 UITextInput::OnMouseExit( const Vector2i& Pos, const Uint32 Flags ) { - UIControl::OnMouseExit( Pos, Flags ); +Uint32 UITextInput::onMouseExit( const Vector2i& Pos, const Uint32 Flags ) { + UIControl::onMouseExit( Pos, Flags ); - UIManager::instance()->SetCursor( EE_CURSOR_ARROW ); + UIManager::instance()->setCursor( EE_CURSOR_ARROW ); return 1; } -void UITextInput::SelCurInit( const Int32& init ) { +void UITextInput::selCurInit( const Int32& init ) { mTextBuffer.selCurInit( init ); } -void UITextInput::SelCurEnd( const Int32& end ) { +void UITextInput::selCurEnd( const Int32& end ) { mTextBuffer.selCurEnd( end ); if ( mTextBuffer.selCurEnd() != mTextBuffer.selCurInit() ) { @@ -274,11 +274,11 @@ void UITextInput::SelCurEnd( const Int32& end ) { } } -Int32 UITextInput::SelCurInit() { +Int32 UITextInput::selCurInit() { return mTextBuffer.selCurInit(); } -Int32 UITextInput::SelCurEnd() { +Int32 UITextInput::selCurEnd() { return mTextBuffer.selCurEnd(); } diff --git a/src/eepp/ui/uitextinputpassword.cpp b/src/eepp/ui/uitextinputpassword.cpp index bf605a823..9de76f714 100644 --- a/src/eepp/ui/uitextinputpassword.cpp +++ b/src/eepp/ui/uitextinputpassword.cpp @@ -15,22 +15,22 @@ UITextInputPassword::UITextInputPassword( const UITextInput::CreateParams& Param mPassCache->shadowColor( mFontShadowColor ); if ( NULL == Params.Font ) { - if ( NULL != UIThemeManager::instance()->DefaultFont() ) - mPassCache->font( UIThemeManager::instance()->DefaultFont() ); + if ( NULL != UIThemeManager::instance()->defaultFont() ) + mPassCache->font( UIThemeManager::instance()->defaultFont() ); else eePRINTL( "UITextInputPassword::UITextInputPassword : Created a UI TextInputPassword without a defined font." ); } - AutoAlign(); + autoAlign(); } -void UITextInputPassword::Draw() { +void UITextInputPassword::draw() { if ( mVisible && 0.f != mAlpha ) { - UIControlAnim::Draw(); + UIControlAnim::draw(); if ( mPassCache->getTextWidth() ) { if ( mFlags & UI_CLIP_ENABLE ) { - UIManager::instance()->ClipEnable( + UIManager::instance()->clipEnable( mScreenPos.x + mPadding.Left, mScreenPos.y + mPadding.Top, mSize.width() - mPadding.Left - mPadding.Right, @@ -38,20 +38,20 @@ void UITextInputPassword::Draw() { ); } - mPassCache->flags( Flags() ); - mPassCache->draw( (Float)mScreenPos.x + mAlignOffset.x + (Float)mPadding.Left, (Float)mScreenPos.y + mAlignOffset.y + (Float)mPadding.Top, Vector2f::One, 0.f, Blend() ); + mPassCache->flags( flags() ); + mPassCache->draw( (Float)mScreenPos.x + mAlignOffset.x + (Float)mPadding.Left, (Float)mScreenPos.y + mAlignOffset.y + (Float)mPadding.Top, Vector2f::One, 0.f, blend() ); if ( mFlags & UI_CLIP_ENABLE ) { - UIManager::instance()->ClipDisable(); + UIManager::instance()->clipDisable(); } } } - DrawWaitingCursor(); + drawWaitingCursor(); } -void UITextInputPassword::AlignFix() { - if ( FontHAlignGet( Flags() ) == UI_HALIGN_LEFT ) { +void UITextInputPassword::alignFix() { + if ( FontHAlignGet( flags() ) == UI_HALIGN_LEFT ) { Uint32 NLPos = 0; Uint32 LineNum = mTextBuffer.getCurPosLinePos( NLPos ); @@ -78,8 +78,8 @@ void UITextInputPassword::AlignFix() { } } -void UITextInputPassword::AutoAlign() { - switch ( FontHAlignGet( Flags() ) ) { +void UITextInputPassword::autoAlign() { + switch ( FontHAlignGet( flags() ) ) { case UI_HALIGN_CENTER: mAlignOffset.x = (Float)( (Int32)( mSize.x - mPassCache->getTextWidth() ) / 2 ); break; @@ -91,7 +91,7 @@ void UITextInputPassword::AutoAlign() { break; } - switch ( FontVAlignGet( Flags() ) ) { + switch ( FontVAlignGet( flags() ) ) { case UI_VALIGN_CENTER: mAlignOffset.y = (Float)( ( (Int32)( mSize.y - mPassCache->getTextHeight() ) ) / 2 ) - 1; break; @@ -104,11 +104,11 @@ void UITextInputPassword::AutoAlign() { } } -void UITextInputPassword::UpdateText() { - UpdatePass( mTextCache->text() ); +void UITextInputPassword::updateText() { + updatePass( mTextCache->text() ); } -void UITextInputPassword::UpdatePass( const String& pass ) { +void UITextInputPassword::updatePass( const String& pass ) { mPassCache->text().clear(); String newTxt; @@ -120,18 +120,18 @@ void UITextInputPassword::UpdatePass( const String& pass ) { mPassCache->text( newTxt ); } -void UITextInputPassword::Text( const String& text ) { - UITextInput::Text( text ); +void UITextInputPassword::text( const String& text ) { + UITextInput::text( text ); - UpdatePass( text ); + updatePass( text ); } -TextCache *UITextInputPassword::GetPassCache() const { +TextCache *UITextInputPassword::getPassCache() const { return mPassCache; } -const String& UITextInputPassword::Text() { - return UITextBox::Text(); +const String& UITextInputPassword::text() { + return UITextBox::text(); } diff --git a/src/eepp/ui/uitheme.cpp b/src/eepp/ui/uitheme.cpp index 058c88703..df99e1786 100644 --- a/src/eepp/ui/uitheme.cpp +++ b/src/eepp/ui/uitheme.cpp @@ -114,15 +114,15 @@ static void LoadThemeElements( std::list& UI_THEME_ELEMENTS, std::l UI_THEME_ICONS.push_back( "document-save-as" ); } -void UITheme::AddThemeElement( const std::string& Element ) { +void UITheme::addThemeElement( const std::string& Element ) { mUIElements.push_back( Element ); } -void UITheme::AddThemeIcon( const std::string& Icon ) { +void UITheme::addThemeIcon( const std::string& Icon ) { mUIIcons.push_back( Icon ); } -UITheme * UITheme::LoadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtlas * TextureAtlas ) { +UITheme * UITheme::loadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtlas * TextureAtlas ) { eeASSERT( NULL != tTheme && NULL != TextureAtlas ); /** Themes use nearest filter by default, force the filter to the textures. */ @@ -140,14 +140,14 @@ UITheme * UITheme::LoadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtla std::vector ElemFound; std::vector ElemType; - tTheme->TextureAtlas( TextureAtlas ); + tTheme->getTextureAtlas( TextureAtlas ); for ( std::list::iterator it = tTheme->mUIElements.begin() ; it != tTheme->mUIElements.end(); it++ ) { Uint32 IsComplex = 0; - Element = std::string( tTheme->Abbr() + "_" + *it ); + Element = std::string( tTheme->abbr() + "_" + *it ); - Found = SearchFilesInAtlas( TextureAtlas, Element, IsComplex ); + Found = searchFilesInAtlas( TextureAtlas, Element, IsComplex ); if ( Found ) { ElemFound.push_back( Element ); @@ -167,7 +167,7 @@ UITheme * UITheme::LoadFromTextureAtlas( UITheme * tTheme, Graphics::TextureAtla return tTheme; } -UITheme * UITheme::LoadFromPath( UITheme * tTheme, const std::string& Path, const std::string ImgExt ) { +UITheme * UITheme::loadFromPath( UITheme * tTheme, const std::string& Path, const std::string ImgExt ) { Clock TE; LoadThemeElements( tTheme->mUIElements, tTheme->mUIIcons ); @@ -186,16 +186,16 @@ UITheme * UITheme::LoadFromPath( UITheme * tTheme, const std::string& Path, cons std::vector ElemFound; std::vector ElemType; - Graphics::TextureAtlas * tSG = eeNew( Graphics::TextureAtlas, ( tTheme->Abbr() ) ); + Graphics::TextureAtlas * tSG = eeNew( Graphics::TextureAtlas, ( tTheme->abbr() ) ); - tTheme->TextureAtlas( tSG ); + tTheme->getTextureAtlas( tSG ); for ( std::list::iterator it = tTheme->mUIElements.begin() ; it != tTheme->mUIElements.end(); it++ ) { Uint32 IsComplex = 0; - Element = tTheme->Abbr() + "_" + *it; + Element = tTheme->abbr() + "_" + *it; - Found = SearchFilesOfElement( tSG, RPath, Element, IsComplex, ImgExt ); + Found = searchFilesOfElement( tSG, RPath, Element, IsComplex, ImgExt ); if ( Found ) { ElemFound.push_back( Element ); @@ -205,7 +205,7 @@ UITheme * UITheme::LoadFromPath( UITheme * tTheme, const std::string& Path, cons // Load the icons from path. for ( std::list::iterator it = tTheme->mUIIcons.begin() ; it != tTheme->mUIIcons.end(); it++ ) { - ElemName = tTheme->Abbr() + "_icon_" + *it; + ElemName = tTheme->abbr() + "_icon_" + *it; Element = RPath + ElemName + "." + ImgExt; if ( FileSystem::fileExists( Element ) ) { @@ -230,15 +230,15 @@ UITheme * UITheme::LoadFromPath( UITheme * tTheme, const std::string& Path, cons return tTheme; } -UITheme * UITheme::LoadFromPath( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const std::string ImgExt ) { - return LoadFromPath( eeNew( UITheme, ( Name, NameAbbr ) ), Path, ImgExt ); +UITheme * UITheme::loadFromPath( const std::string& Path, const std::string& Name, const std::string& NameAbbr, const std::string ImgExt ) { + return loadFromPath( eeNew( UITheme, ( Name, NameAbbr ) ), Path, ImgExt ); } -UITheme * UITheme::LoadFromTextureAtlas( Graphics::TextureAtlas * TextureAtlas, const std::string& Name, const std::string NameAbbr ) { - return LoadFromTextureAtlas( eeNew( UITheme, ( Name, NameAbbr ) ), TextureAtlas ); +UITheme * UITheme::loadFromTextureAtlas( Graphics::TextureAtlas * TextureAtlas, const std::string& Name, const std::string NameAbbr ) { + return loadFromTextureAtlas( eeNew( UITheme, ( Name, NameAbbr ) ), TextureAtlas ); } -bool UITheme::SearchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Element, Uint32& IsComplex ) { +bool UITheme::searchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Element, Uint32& IsComplex ) { bool Found = false; Uint32 i = 0, s = 0; std::string ElemName; @@ -247,7 +247,7 @@ bool UITheme::SearchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Eleme // Search Complex Skin for ( i = 0; i < UISkinState::StateCount; i++ ) { for ( s = 0; s < UISkinComplex::SideCount; s++ ) { - ElemName = Element + "_" + UISkin::GetSkinStateName( i ) + "_" + UISkinComplex::GetSideSuffix( s ); + ElemName = Element + "_" + UISkin::getSkinStateName( i ) + "_" + UISkinComplex::GetSideSuffix( s ); if ( SG->getByName( ElemName ) ) { IsComplex = 1; @@ -264,7 +264,7 @@ bool UITheme::SearchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Eleme // Search Simple Skin if ( !IsComplex ) { for ( i = 0; i < UISkinState::StateCount; i++ ) { - ElemName = Element + "_" + UISkin::GetSkinStateName( i ); + ElemName = Element + "_" + UISkin::getSkinStateName( i ); if ( SG->getByName( ElemName ) ) { Found = true; @@ -276,7 +276,7 @@ bool UITheme::SearchFilesInAtlas( Graphics::TextureAtlas * SG, std::string Eleme return Found; } -bool UITheme::SearchFilesOfElement( Graphics::TextureAtlas * SG, const std::string& Path, std::string Element, Uint32& IsComplex, const std::string ImgExt ) { +bool UITheme::searchFilesOfElement( Graphics::TextureAtlas * SG, const std::string& Path, std::string Element, Uint32& IsComplex, const std::string ImgExt ) { bool Found = false; Uint32 i = 0, s = 0; std::string ElemPath; @@ -287,7 +287,7 @@ bool UITheme::SearchFilesOfElement( Graphics::TextureAtlas * SG, const std::stri // Search Complex Skin for ( i = 0; i < UISkinState::StateCount; i++ ) { for ( s = 0; s < UISkinComplex::SideCount; s++ ) { - ElemName = Element + "_" + UISkin::GetSkinStateName( i ) + "_" + UISkinComplex::GetSideSuffix( s ); + ElemName = Element + "_" + UISkin::getSkinStateName( i ) + "_" + UISkinComplex::GetSideSuffix( s ); ElemPath = Path + ElemName; ElemFullPath = ElemPath + "." + ImgExt; @@ -304,7 +304,7 @@ bool UITheme::SearchFilesOfElement( Graphics::TextureAtlas * SG, const std::stri // Seach Simple Skin if ( !IsComplex ) { for ( i = 0; i < UISkinState::StateCount; i++ ) { - ElemName = Element + "_" + UISkin::GetSkinStateName( i ); + ElemName = Element + "_" + UISkin::getSkinStateName( i ); ElemPath = Path + ElemName; ElemFullPath = ElemPath + "." + ImgExt; @@ -319,18 +319,18 @@ bool UITheme::SearchFilesOfElement( Graphics::TextureAtlas * SG, const std::stri return Found; } -UITheme::UITheme( const std::string& Name, const std::string& Abbr, Graphics::Font * DefaultFont ) : +UITheme::UITheme( const std::string& Name, const std::string& Abbr, Graphics::Font * defaultFont ) : ResourceManager ( false ), mName( Name ), mNameHash( String::hash( mName ) ), mAbbr( Abbr ), mTextureAtlas( NULL ), - mFont( DefaultFont ), + mFont( defaultFont ), mFontColor( 0, 0, 0, 255 ), mFontShadowColor( 255, 255, 255, 200 ), mFontOverColor( 0, 0, 0, 255 ), mFontSelectedColor( 0, 0, 0, 255 ), - mUseDefaultThemeValues( true ) + mUsedefaultThemeValues( true ) { } @@ -351,80 +351,80 @@ const Uint32& UITheme::getId() const { return mNameHash; } -const std::string& UITheme::Abbr() const { +const std::string& UITheme::abbr() const { return mAbbr; } UISkin * UITheme::add( UISkin * Resource ) { - Resource->Theme( this ); + Resource->theme( this ); return ResourceManager::add( Resource ); } -void UITheme::Font( Graphics::Font * Font ) { +void UITheme::font( Graphics::Font * Font ) { mFont = Font; } -Graphics::Font * UITheme::Font() const { +Graphics::Font * UITheme::font() const { return mFont; } -const ColorA& UITheme::FontColor() const { +const ColorA& UITheme::fontColor() const { return mFontColor; } -const ColorA& UITheme::FontShadowColor() const { +const ColorA& UITheme::fontShadowColor() const { return mFontShadowColor; } -const ColorA& UITheme::FontOverColor() const { +const ColorA& UITheme::fontOverColor() const { return mFontOverColor; } -const ColorA& UITheme::FontSelectedColor() const { +const ColorA& UITheme::fontSelectedColor() const { return mFontSelectedColor; } -void UITheme::FontColor( const ColorA& Color ) { +void UITheme::fontColor( const ColorA& Color ) { mFontColor = Color; } -void UITheme::FontShadowColor( const ColorA& Color ) { +void UITheme::fontShadowColor( const ColorA& Color ) { mFontShadowColor = Color; } -void UITheme::FontOverColor( const ColorA& Color ) { +void UITheme::fontOverColor( const ColorA& Color ) { mFontOverColor = Color; } -void UITheme::FontSelectedColor( const ColorA& Color ) { +void UITheme::fontSelectedColor( const ColorA& Color ) { mFontSelectedColor = Color; } -void UITheme::UseDefaultThemeValues( const bool& Use ) { - mUseDefaultThemeValues = Use; +void UITheme::useDefaultThemeValues( const bool& Use ) { + mUsedefaultThemeValues = Use; } -const bool& UITheme::UseDefaultThemeValues() const { - return mUseDefaultThemeValues; +const bool& UITheme::useDefaultThemeValues() const { + return mUsedefaultThemeValues; } -Graphics::TextureAtlas * UITheme::TextureAtlas() const { +Graphics::TextureAtlas * UITheme::getTextureAtlas() const { return mTextureAtlas; } -void UITheme::TextureAtlas( Graphics::TextureAtlas * SG ) { +void UITheme::getTextureAtlas( Graphics::TextureAtlas * SG ) { mTextureAtlas = SG; } -SubTexture * UITheme::GetIconByName( const std::string& name ) { +SubTexture * UITheme::getIconByName( const std::string& name ) { if ( NULL != mTextureAtlas ) return mTextureAtlas->getByName( mAbbr + "_icon_" + name ); return NULL; } -UIGfx * UITheme::CreateGfx( SubTexture * SubTexture, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, ColorA SubTextureColor, EE_RENDER_MODE SubTextureRender ) { +UIGfx * UITheme::createGfx( SubTexture * SubTexture, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, ColorA SubTextureColor, EE_RENDER_MODE SubTextureRender ) { UIGfx::CreateParams GfxParams; GfxParams.Parent( Parent ); GfxParams.PosSet( Pos ); @@ -434,12 +434,12 @@ UIGfx * UITheme::CreateGfx( SubTexture * SubTexture, UIControl * Parent, const S GfxParams.SubTextureColor = SubTextureColor; GfxParams.SubTextureRender = SubTextureRender; UIGfx * Gfx = eeNew( UIGfx, ( GfxParams ) ); - Gfx->Visible( true ); - Gfx->Enabled( true ); + Gfx->visible( true ); + Gfx->enabled( true ); return Gfx; } -UISprite * UITheme::CreateSprite( Sprite * Sprite, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DealloSprite, EE_RENDER_MODE SpriteRender ) { +UISprite * UITheme::createSprite( Sprite * Sprite, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DealloSprite, EE_RENDER_MODE SpriteRender ) { UISprite::CreateParams SpriteParams; SpriteParams.Parent( Parent ); SpriteParams.PosSet( Pos ); @@ -449,61 +449,61 @@ UISprite * UITheme::CreateSprite( Sprite * Sprite, UIControl * Parent, const Siz SpriteParams.SpriteRender = SpriteRender; SpriteParams.DealloSprite = DealloSprite; UISprite * Spr = eeNew( UISprite, ( SpriteParams ) ); - Spr->Visible( true ); - Spr->Enabled( true ); + Spr->visible( true ); + Spr->enabled( true ); return Spr; } -UICheckBox * UITheme::CreateCheckBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { +UICheckBox * UITheme::createCheckBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UICheckBox::CreateParams CheckBoxParams; CheckBoxParams.Parent( Parent ); CheckBoxParams.PosSet( Pos ); CheckBoxParams.SizeSet( Size ); CheckBoxParams.Flags = Flags; UICheckBox * Ctrl = eeNew( UICheckBox, ( CheckBoxParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIRadioButton * UITheme::CreateRadioButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { +UIRadioButton * UITheme::createRadioButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UIRadioButton::CreateParams RadioButtonParams; RadioButtonParams.Parent( Parent ); RadioButtonParams.PosSet( Pos ); RadioButtonParams.SizeSet( Size ); RadioButtonParams.Flags = Flags; UIRadioButton * Ctrl = eeNew( UIRadioButton, ( RadioButtonParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITextBox * UITheme::CreateTextBox( const String& Text, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { +UITextBox * UITheme::createTextBox( const String& Text, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITextBox::CreateParams TextBoxParams; TextBoxParams.Parent( Parent ); TextBoxParams.PosSet( Pos ); TextBoxParams.SizeSet( Size ); TextBoxParams.Flags = Flags; UITextBox * Ctrl = eeNew( UITextBox, ( TextBoxParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( false ); - Ctrl->Text( Text ); + Ctrl->visible( true ); + Ctrl->enabled( false ); + Ctrl->text( Text ); return Ctrl; } -UITooltip * UITheme::CreateTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { +UITooltip * UITheme::createTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITooltip::CreateParams TooltipParams; TooltipParams.Parent( Parent ); TooltipParams.PosSet( Pos ); TooltipParams.SizeSet( Size ); TooltipParams.Flags = Flags; UITooltip * Ctrl = eeNew( UITooltip, ( TooltipParams, TooltipOf ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITextEdit * UITheme::CreateTextEdit( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, UI_SCROLLBAR_MODE HScrollBar, UI_SCROLLBAR_MODE VScrollBar, bool WordWrap ) { +UITextEdit * UITheme::createTextEdit( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, UI_SCROLLBAR_MODE HScrollBar, UI_SCROLLBAR_MODE VScrollBar, bool WordWrap ) { UITextEdit::CreateParams TextEditParams; TextEditParams.Parent( Parent ); TextEditParams.PosSet( Pos ); @@ -513,12 +513,12 @@ UITextEdit * UITheme::CreateTextEdit( UIControl * Parent, const Sizei& Size, con TextEditParams.VScrollBar = VScrollBar; TextEditParams.WordWrap = WordWrap; UITextEdit * Ctrl = eeNew( UITextEdit, ( TextEditParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITextInput * UITheme::CreateTextInput( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { +UITextInput * UITheme::createTextInput( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { UITextInput::CreateParams TextInputParams; TextInputParams.Parent( Parent ); TextInputParams.PosSet( Pos ); @@ -527,12 +527,12 @@ UITextInput * UITheme::CreateTextInput( UIControl * Parent, const Sizei& Size, c TextInputParams.SupportFreeEditing = SupportFreeEditing; TextInputParams.MaxLength = MaxLength; UITextInput * Ctrl = eeNew( UITextInput, ( TextInputParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UITextInputPassword * UITheme::CreateTextInputPassword( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { +UITextInputPassword * UITheme::createTextInputPassword( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { UITextInput::CreateParams TextInputParams; TextInputParams.Parent( Parent ); TextInputParams.PosSet( Pos ); @@ -541,12 +541,12 @@ UITextInputPassword * UITheme::CreateTextInputPassword( UIControl * Parent, cons TextInputParams.SupportFreeEditing = SupportFreeEditing; TextInputParams.MaxLength = MaxLength; UITextInputPassword * Ctrl = eeNew( UITextInputPassword, ( TextInputParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UISpinBox * UITheme::CreateSpinBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Float DefaultValue, bool AllowDotsInNumbers ) { +UISpinBox * UITheme::createSpinBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Float DefaultValue, bool AllowDotsInNumbers ) { UISpinBox::CreateParams SpinBoxParams; SpinBoxParams.Parent( Parent ); SpinBoxParams.PosSet( Pos ); @@ -555,12 +555,12 @@ UISpinBox * UITheme::CreateSpinBox( UIControl * Parent, const Sizei& Size, const SpinBoxParams.DefaultValue = DefaultValue; SpinBoxParams.AllowDotsInNumbers = AllowDotsInNumbers; UISpinBox * Ctrl = eeNew( UISpinBox, ( SpinBoxParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIScrollBar * UITheme::CreateScrollBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalScrollBar ) { +UIScrollBar * UITheme::createScrollBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalScrollBar ) { UIScrollBar::CreateParams ScrollBarParams; ScrollBarParams.Parent( Parent ); ScrollBarParams.PosSet( Pos ); @@ -568,12 +568,12 @@ UIScrollBar * UITheme::CreateScrollBar( UIControl * Parent, const Sizei& Size, c ScrollBarParams.Flags = Flags; ScrollBarParams.VerticalScrollBar = VerticalScrollBar; UIScrollBar * Ctrl = eeNew( UIScrollBar, ( ScrollBarParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UISlider * UITheme::CreateSlider( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalSlider, bool AllowHalfSliderOut, bool ExpandBackground ) { +UISlider * UITheme::createSlider( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalSlider, bool AllowHalfSliderOut, bool ExpandBackground ) { UISlider::CreateParams SliderParams; SliderParams.Parent( Parent ); SliderParams.PosSet( Pos ); @@ -583,12 +583,12 @@ UISlider * UITheme::CreateSlider( UIControl * Parent, const Sizei& Size, const V SliderParams.AllowHalfSliderOut = AllowHalfSliderOut; SliderParams.ExpandBackground = ExpandBackground; UISlider * Ctrl = eeNew( UISlider, ( SliderParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIComboBox * UITheme::CreateComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { +UIComboBox * UITheme::createComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIComboBox::CreateParams ComboParams; ComboParams.Parent( Parent ); ComboParams.PosSet( Pos ); @@ -598,12 +598,12 @@ UIComboBox * UITheme::CreateComboBox( UIControl * Parent, const Sizei& Size, con ComboParams.PopUpToMainControl = PopUpToMainControl; ComboParams.ListBox = ListBox; UIComboBox * Ctrl = eeNew( UIComboBox, ( ComboParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIDropDownList * UITheme::CreateDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { +UIDropDownList * UITheme::createDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIDropDownList::CreateParams DDLParams; DDLParams.Parent( Parent ); DDLParams.PosSet( Pos ); @@ -613,12 +613,12 @@ UIDropDownList * UITheme::CreateDropDownList( UIControl * Parent, const Sizei& S DDLParams.PopUpToMainControl = PopUpToMainControl; DDLParams.ListBox = ListBox; UIDropDownList * Ctrl = eeNew( UIDropDownList, ( DDLParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIListBox * UITheme::CreateListBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SmoothScroll, Uint32 RowHeight, UI_SCROLLBAR_MODE VScrollMode, UI_SCROLLBAR_MODE HScrollMode, Recti PaddingContainer ) { +UIListBox * UITheme::createListBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SmoothScroll, Uint32 RowHeight, UI_SCROLLBAR_MODE VScrollMode, UI_SCROLLBAR_MODE HScrollMode, Recti PaddingContainer ) { UIListBox::CreateParams LBParams; LBParams.Parent( Parent ); LBParams.PosSet( Pos ); @@ -630,12 +630,12 @@ UIListBox * UITheme::CreateListBox( UIControl * Parent, const Sizei& Size, const LBParams.HScrollMode = HScrollMode; LBParams.PaddingContainer = PaddingContainer; UIListBox * Ctrl = eeNew( UIListBox, ( LBParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIMenu * UITheme::CreateMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { +UIMenu * UITheme::createMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIMenu::CreateParams MenuParams; MenuParams.Parent( Parent ); MenuParams.PosSet( Pos ); @@ -648,12 +648,12 @@ UIMenu * UITheme::CreateMenu( UIControl * Parent, const Sizei& Size, const Vecto MenuParams.MinRightMargin = MinRightMargin; UIMenu * Ctrl = eeNew( UIMenu, ( MenuParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIPopUpMenu * UITheme::CreatePopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { +UIPopUpMenu * UITheme::createPopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIPopUpMenu::CreateParams MenuParams; MenuParams.Parent( Parent ); MenuParams.PosSet( Pos ); @@ -667,7 +667,7 @@ UIPopUpMenu * UITheme::CreatePopUpMenu( UIControl * Parent, const Sizei& Size, c return eeNew( UIPopUpMenu, ( MenuParams ) ); } -UIProgressBar * UITheme::CreateProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { +UIProgressBar * UITheme::createProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { UIProgressBar::CreateParams PBParams; PBParams.Parent( Parent ); PBParams.PosSet( Pos ); @@ -679,12 +679,12 @@ UIProgressBar * UITheme::CreateProgressBar( UIControl * Parent, const Sizei& Siz PBParams.FillerMargin = FillerMargin; UIProgressBar * Ctrl = eeNew( UIProgressBar, ( PBParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIPushButton * UITheme::CreatePushButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { +UIPushButton * UITheme::createPushButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { UIPushButton::CreateParams ButtonParams; ButtonParams.Parent( Parent ); ButtonParams.PosSet( Pos ); @@ -698,12 +698,12 @@ UIPushButton * UITheme::CreatePushButton( UIControl * Parent, const Sizei& Size, ButtonParams.SetIcon( Icon ); UIPushButton * Ctrl = eeNew( UIPushButton, ( ButtonParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UISelectButton * UITheme::CreateSelectButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { +UISelectButton * UITheme::createSelectButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { UIPushButton::CreateParams ButtonParams; ButtonParams.Parent( Parent ); ButtonParams.PosSet( Pos ); @@ -717,12 +717,12 @@ UISelectButton * UITheme::CreateSelectButton( UIControl * Parent, const Sizei& S ButtonParams.SetIcon( Icon ); UISelectButton * Ctrl = eeNew( UISelectButton, ( ButtonParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIWinMenu * UITheme::CreateWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { +UIWinMenu * UITheme::createWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { UIWinMenu::CreateParams WinMenuParams; WinMenuParams.Parent( Parent ); WinMenuParams.PosSet( Pos ); @@ -734,12 +734,12 @@ UIWinMenu * UITheme::CreateWinMenu( UIControl * Parent, const Sizei& Size, const WinMenuParams.FirstButtonMargin = FirstButtonMargin; UIWinMenu * Ctrl = eeNew( UIWinMenu, ( WinMenuParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } -UIWindow * UITheme::CreateWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { +UIWindow * UITheme::createWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIWindow::CreateParams WinParams; WinParams.Parent( Parent ); WinParams.PosSet( Pos ); @@ -751,7 +751,7 @@ UIWindow * UITheme::CreateWindow( UIControl * Parent, const Sizei& Size, const V return eeNew( UIWindow, ( WinParams ) ); } -UICommonDialog * UITheme::CreateCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { +UICommonDialog * UITheme::createCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { UICommonDialog::CreateParams DLGParams; DLGParams.Parent( Parent ); DLGParams.PosSet( Pos ); @@ -766,7 +766,7 @@ UICommonDialog * UITheme::CreateCommonDialog( UIControl * Parent, const Sizei& S return eeNew( UICommonDialog, ( DLGParams ) ); } -UIMessageBox * UITheme::CreateMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { +UIMessageBox * UITheme::createMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIMessageBox::CreateParams MsgBoxParams; MsgBoxParams.Parent( Parent ); MsgBoxParams.PosSet( Pos ); @@ -780,7 +780,7 @@ UIMessageBox * UITheme::CreateMessageBox( UI_MSGBOX_TYPE Type, const String& Mes return eeNew( UIMessageBox, ( MsgBoxParams ) ); } -UITabWidget * UITheme::CreateTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { +UITabWidget * UITheme::createTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { UITabWidget::CreateParams TabWidgetParams; TabWidgetParams.Parent( Parent ); TabWidgetParams.PosSet( Pos ); @@ -796,8 +796,8 @@ UITabWidget * UITheme::CreateTabWidget( UIControl *Parent, const Sizei &Size, co TabWidgetParams.MaxTabWidth = MaxTabWidth; UITabWidget * Ctrl = eeNew( UITabWidget, ( TabWidgetParams ) ); - Ctrl->Visible( true ); - Ctrl->Enabled( true ); + Ctrl->visible( true ); + Ctrl->enabled( true ); return Ctrl; } diff --git a/src/eepp/ui/uithememanager.cpp b/src/eepp/ui/uithememanager.cpp index 88b569ebc..6d4d9b0d1 100644 --- a/src/eepp/ui/uithememanager.cpp +++ b/src/eepp/ui/uithememanager.cpp @@ -10,111 +10,111 @@ UIThemeManager::UIThemeManager() : ResourceManager( true ), mFont( NULL ), mThemeDefault( NULL ), - mAutoApplyDefaultTheme( true ), + mautoApplyDefaultTheme( true ), mEnableDefaultEffects( false ), mFadeInTime( Milliseconds( 100.f ) ), mFadeOutTime( Milliseconds ( 100.f ) ), - mTooltipTimeToShow( Milliseconds( 200 ) ), - mTooltipFollowMouse( true ), - mCursorSize( 16, 16 ) + mtooltipTimeToShow( Milliseconds( 200 ) ), + mtooltipFollowMouse( true ), + mcursorSize( 16, 16 ) { } UIThemeManager::~UIThemeManager() { } -void UIThemeManager::DefaultFont( Font * Font ) { +void UIThemeManager::defaultFont( Font * Font ) { mFont = Font; } -Font * UIThemeManager::DefaultFont() const { +Font * UIThemeManager::defaultFont() const { return mFont; } -void UIThemeManager::SetTheme( const std::string& Theme ) { - SetTheme( getByName( Theme ) ); +void UIThemeManager::setTheme( const std::string& Theme ) { + setTheme( getByName( Theme ) ); } -void UIThemeManager::SetTheme( UITheme * Theme ) { - UIControl * MainCtrl = UIManager::instance()->MainControl(); +void UIThemeManager::setTheme( UITheme * Theme ) { + UIControl * MainCtrl = UIManager::instance()->mainControl(); if ( NULL != MainCtrl ) { - MainCtrl->SetThemeToChilds( Theme ); - MainCtrl->SetTheme( Theme ); + MainCtrl->setThemeToChilds( Theme ); + MainCtrl->setTheme( Theme ); } } -void UIThemeManager::DefaultTheme( UITheme * Theme ) { +void UIThemeManager::defaultTheme( UITheme * Theme ) { mThemeDefault = Theme; } -void UIThemeManager::DefaultTheme( const std::string& Theme ) { - DefaultTheme( UIThemeManager::instance()->getByName( Theme ) ); +void UIThemeManager::defaultTheme( const std::string& Theme ) { + defaultTheme( UIThemeManager::instance()->getByName( Theme ) ); } -UITheme * UIThemeManager::DefaultTheme() const { +UITheme * UIThemeManager::defaultTheme() const { return mThemeDefault; } -void UIThemeManager::ApplyDefaultTheme( UIControl * Control ) { - if ( mAutoApplyDefaultTheme && NULL != mThemeDefault && NULL != Control ) - Control->SetTheme( mThemeDefault ); +void UIThemeManager::applyDefaultTheme( UIControl * Control ) { + if ( mautoApplyDefaultTheme && NULL != mThemeDefault && NULL != Control ) + Control->setTheme( mThemeDefault ); } -void UIThemeManager::AutoApplyDefaultTheme( const bool& apply ) { - mAutoApplyDefaultTheme = apply; +void UIThemeManager::autoApplyDefaultTheme( const bool& apply ) { + mautoApplyDefaultTheme = apply; } -const bool& UIThemeManager::AutoApplyDefaultTheme() const { - return mAutoApplyDefaultTheme; +const bool& UIThemeManager::autoApplyDefaultTheme() const { + return mautoApplyDefaultTheme; } -void UIThemeManager::DefaultEffectsEnabled( const bool& Enabled ) { +void UIThemeManager::defaultEffectsEnabled( const bool& Enabled ) { mEnableDefaultEffects = Enabled; } -const bool& UIThemeManager::DefaultEffectsEnabled() const { +const bool& UIThemeManager::defaultEffectsEnabled() const { return mEnableDefaultEffects; } -const Time& UIThemeManager::ControlsFadeInTime() const { +const Time& UIThemeManager::controlsFadeInTime() const { return mFadeInTime; } -void UIThemeManager::ControlsFadeInTime( const Time& Time ) { +void UIThemeManager::controlsFadeInTime( const Time& Time ) { mFadeInTime = Time; } -const Time& UIThemeManager::ControlsFadeOutTime() const { +const Time& UIThemeManager::controlsFadeOutTime() const { return mFadeOutTime; } -void UIThemeManager::ControlsFadeOutTime( const Time& Time ) { +void UIThemeManager::controlsFadeOutTime( const Time& Time ) { mFadeOutTime = Time; } -void UIThemeManager::TooltipTimeToShow( const Time& Time ) { - mTooltipTimeToShow = Time; +void UIThemeManager::tooltipTimeToShow( const Time& Time ) { + mtooltipTimeToShow = Time; } -const Time& UIThemeManager::TooltipTimeToShow() const { - return mTooltipTimeToShow; +const Time& UIThemeManager::tooltipTimeToShow() const { + return mtooltipTimeToShow; } -void UIThemeManager::TooltipFollowMouse( const bool& Follow ) { - mTooltipFollowMouse = Follow; +void UIThemeManager::tooltipFollowMouse( const bool& Follow ) { + mtooltipFollowMouse = Follow; } -const bool& UIThemeManager::TooltipFollowMouse() const { - return mTooltipFollowMouse; +const bool& UIThemeManager::tooltipFollowMouse() const { + return mtooltipFollowMouse; } -void UIThemeManager::CursorSize( const Sizei& Size ) { - mCursorSize = Size; +void UIThemeManager::cursorSize( const Sizei& Size ) { + mcursorSize = Size; } -const Sizei& UIThemeManager::CursorSize() const { - return mCursorSize; +const Sizei& UIThemeManager::cursorSize() const { + return mcursorSize; } }} diff --git a/src/eepp/ui/uitooltip.cpp b/src/eepp/ui/uitooltip.cpp index c879aa933..a0791b71a 100644 --- a/src/eepp/ui/uitooltip.cpp +++ b/src/eepp/ui/uitooltip.cpp @@ -20,150 +20,150 @@ UITooltip::UITooltip( UITooltip::CreateParams& Params, UIControl * TooltipOf ) : mTextCache->shadowColor( mFontShadowColor ); if ( NULL == Params.Font ) { - if ( NULL != UIThemeManager::instance()->DefaultFont() ) - mTextCache->font( UIThemeManager::instance()->DefaultFont() ); + if ( NULL != UIThemeManager::instance()->defaultFont() ) + mTextCache->font( UIThemeManager::instance()->defaultFont() ); else eePRINTL( "UITooltip::UITextBox : Created a UI TextBox without a defined font." ); } - AutoPadding(); + autoPadding(); - if ( Params.ParentCtrl != UIManager::instance()->MainControl() ) - Parent( UIManager::instance()->MainControl() ); + if ( Params.ParentCtrl != UIManager::instance()->mainControl() ) + parent( UIManager::instance()->mainControl() ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UITooltip::~UITooltip() { eeSAFE_DELETE( mTextCache ); - if ( NULL != mTooltipOf && mTooltipOf->IsComplex() ) { - reinterpret_cast( mTooltipOf )->TooltipRemove(); + if ( NULL != mTooltipOf && mTooltipOf->isComplex() ) { + reinterpret_cast( mTooltipOf )->tooltipRemove(); } } -Uint32 UITooltip::Type() const { +Uint32 UITooltip::getType() const { return UI_TYPE_TOOLTIP; } -bool UITooltip::IsType( const Uint32& type ) const { - return UITooltip::Type() == type ? true : UIControlAnim::IsType( type ); +bool UITooltip::isType( const Uint32& type ) const { + return UITooltip::getType() == type ? true : UIControlAnim::isType( type ); } -void UITooltip::SetTheme( UITheme * Theme ) { - UIControl::SetThemeControl( Theme, "tooltip" ); +void UITooltip::setTheme( UITheme * Theme ) { + UIControl::setThemeControl( Theme, "tooltip" ); - AutoPadding(); + autoPadding(); - if ( NULL == mTextCache->font() && NULL != Theme->Font() ) { - mTextCache->font( Theme->Font() ); + if ( NULL == mTextCache->font() && NULL != Theme->font() ) { + mTextCache->font( Theme->font() ); } } -void UITooltip::AutoPadding() { +void UITooltip::autoPadding() { if ( mFlags & UI_AUTO_PADDING ) { - mPadding = MakePadding( true, true, true, true ); + mPadding = makePadding( true, true, true, true ); } } -void UITooltip::Show() { - if ( !Visible() || 0 == mAlpha ) { - ToFront(); +void UITooltip::show() { + if ( !visible() || 0 == mAlpha ) { + toFront(); - Visible( true ); + visible( true ); - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - StartAlphaAnim( 255.f == mAlpha ? 0.f : mAlpha, 255.f, UIThemeManager::instance()->ControlsFadeInTime() ); + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + startAlphaAnim( 255.f == mAlpha ? 0.f : mAlpha, 255.f, UIThemeManager::instance()->controlsFadeInTime() ); } } } -void UITooltip::Hide() { - if ( Visible() ) { - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - DisableFadeOut( UIThemeManager::instance()->ControlsFadeOutTime() ); +void UITooltip::hide() { + if ( visible() ) { + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + disableFadeOut( UIThemeManager::instance()->controlsFadeOutTime() ); } else { - Visible( false ); + visible( false ); } } } -void UITooltip::Draw() { +void UITooltip::draw() { if ( mVisible && 0.f != mAlpha ) { - UIControlAnim::Draw(); + UIControlAnim::draw(); if ( mTextCache->getTextWidth() ) { - mTextCache->flags( Flags() ); - mTextCache->draw( (Float)mScreenPos.x + mAlignOffset.x, (Float)mScreenPos.y + mAlignOffset.y, Vector2f::One, 0.f, Blend() ); + mTextCache->flags( flags() ); + mTextCache->draw( (Float)mScreenPos.x + mAlignOffset.x, (Float)mScreenPos.y + mAlignOffset.y, Vector2f::One, 0.f, blend() ); } } } -Graphics::Font * UITooltip::Font() const { +Graphics::Font * UITooltip::font() const { return mTextCache->font(); } -void UITooltip::Font( Graphics::Font * font ) { +void UITooltip::font( Graphics::Font * font ) { if ( mTextCache->font() != font ) { mTextCache->font( font ); - AutoPadding(); - AutoSize(); - AutoAlign(); - OnFontChanged(); + autoPadding(); + autoSize(); + autoAlign(); + onFontChanged(); } } -const String& UITooltip::Text() { +const String& UITooltip::text() { return mTextCache->text(); } -void UITooltip::Text( const String& text ) { +void UITooltip::text( const String& text ) { mTextCache->text( text ); - AutoPadding(); - AutoSize(); - AutoAlign(); - OnTextChanged(); + autoPadding(); + autoSize(); + autoAlign(); + onTextChanged(); } -const ColorA& UITooltip::Color() const { +const ColorA& UITooltip::color() const { return mFontColor; } -void UITooltip::Color( const ColorA& color ) { +void UITooltip::color( const ColorA& color ) { mFontColor = color; - Alpha( color.a() ); + alpha( color.a() ); } -const ColorA& UITooltip::ShadowColor() const { +const ColorA& UITooltip::shadowColor() const { return mFontShadowColor; } -void UITooltip::ShadowColor( const ColorA& color ) { +void UITooltip::shadowColor( const ColorA& color ) { mFontShadowColor = color; - Alpha( color.a() ); + alpha( color.a() ); mTextCache->shadowColor( mFontColor ); } -void UITooltip::Alpha( const Float& alpha ) { - UIControlAnim::Alpha( alpha ); +void UITooltip::alpha( const Float& alpha ) { + UIControlAnim::alpha( alpha ); mFontColor.Alpha = (Uint8)alpha; mFontShadowColor.Alpha = (Uint8)alpha; mTextCache->color( mFontColor ); } -void UITooltip::AutoSize() { +void UITooltip::autoSize() { if ( mFlags & UI_AUTO_SIZE ) { mSize.width( (int)mTextCache->getTextWidth() + mPadding.Left + mPadding.Right ); mSize.height( (int)mTextCache->getTextHeight() + mPadding.Top + mPadding.Bottom ); } } -void UITooltip::AutoAlign() { +void UITooltip::autoAlign() { Uint32 Width = mSize.width() - mPadding.Left - mPadding.Right; Uint32 Height = mSize.height() - mPadding.Top - mPadding.Bottom; - switch ( FontHAlignGet( Flags() ) ) { + switch ( FontHAlignGet( flags() ) ) { case UI_HALIGN_CENTER: mAlignOffset.x = mPadding.Left + (Float)( (Int32)( Width - mTextCache->getTextWidth() ) / 2 ); break; @@ -175,7 +175,7 @@ void UITooltip::AutoAlign() { break; } - switch ( FontVAlignGet( Flags() ) ) { + switch ( FontVAlignGet( flags() ) ) { case UI_VALIGN_CENTER: mAlignOffset.y = mPadding.Top + (Float)( ( (Int32)( Height - mTextCache->getTextHeight() ) ) / 2 ); break; @@ -188,61 +188,61 @@ void UITooltip::AutoAlign() { } } -void UITooltip::OnSizeChange() { - AutoPadding(); - AutoSize(); - AutoAlign(); +void UITooltip::onSizeChange() { + autoPadding(); + autoSize(); + autoAlign(); - UIControlAnim::OnSizeChange(); + UIControlAnim::onSizeChange(); mTextCache->cache(); } -void UITooltip::OnTextChanged() { - SendCommonEvent( UIEvent::EventOnTextChanged ); +void UITooltip::onTextChanged() { + sendCommonEvent( UIEvent::EventOnTextChanged ); } -void UITooltip::OnFontChanged() { - SendCommonEvent( UIEvent::EventOnFontChanged ); +void UITooltip::onFontChanged() { + sendCommonEvent( UIEvent::EventOnFontChanged ); } -void UITooltip::Padding( const Recti& padding ) { +void UITooltip::padding( const Recti& padding ) { mPadding = padding; } -const Recti& UITooltip::Padding() const { +const Recti& UITooltip::padding() const { return mPadding; } -TextCache * UITooltip::GetTextCache() { +TextCache * UITooltip::getTextCache() { return mTextCache; } -Float UITooltip::GetTextWidth() { +Float UITooltip::getTextWidth() { return mTextCache->getTextWidth(); } -Float UITooltip::GetTextHeight() { +Float UITooltip::getTextHeight() { return mTextCache->getTextHeight(); } -const int& UITooltip::GetNumLines() const { +const int& UITooltip::getNumLines() const { return mTextCache->getNumLines(); } -const Vector2f& UITooltip::AlignOffset() const { +const Vector2f& UITooltip::alignOffset() const { return mAlignOffset; } -void UITooltip::TooltipTime( const Time& Time ) { +void UITooltip::tooltipTime( const Time& Time ) { mTooltipTime = Time; } -void UITooltip::TooltipTimeAdd( const Time& Time ) { +void UITooltip::tooltipTimeAdd( const Time& Time ) { mTooltipTime += Time; } -const Time& UITooltip::TooltipTime() const { +const Time& UITooltip::tooltipTime() const { return mTooltipTime; } diff --git a/src/eepp/ui/uiwindow.cpp b/src/eepp/ui/uiwindow.cpp index b7165228e..d2b1bfbc9 100644 --- a/src/eepp/ui/uiwindow.cpp +++ b/src/eepp/ui/uiwindow.cpp @@ -25,256 +25,256 @@ UIWindow::UIWindow( const UIWindow::CreateParams& Params ) : mDecoAutoSize( Params.DecorationAutoSize ), mBorderAutoSize( Params.BorderAutoSize ) { - UIManager::instance()->WindowAdd( this ); + UIManager::instance()->windowAdd( this ); UIComplexControl::CreateParams tcParams; tcParams.Parent( this ); tcParams.Flags |= UI_REPORT_SIZE_CHANGE_TO_CHILDS; mContainer = eeNew( UIComplexControl, ( tcParams ) ); - mContainer->Enabled( true ); - mContainer->Visible( true ); - mContainer->Size( mSize ); - mContainer->AddEventListener( UIEvent::EventOnPosChange, cb::Make1( this, &UIWindow::ContainerPosChange ) ); + mContainer->enabled( true ); + mContainer->visible( true ); + mContainer->size( mSize ); + mContainer->addEventListener( UIEvent::EventOnPosChange, cb::Make1( this, &UIWindow::containerPosChange ) ); if ( !( mWinFlags & UI_WIN_NO_BORDER ) ) { UIControlAnim::CreateParams tParams; tParams.Parent( this ); mWindowDecoration = eeNew( UIControlAnim, ( tParams ) ); - mWindowDecoration->Visible( true ); - mWindowDecoration->Enabled( false ); + mWindowDecoration->visible( true ); + mWindowDecoration->enabled( false ); mBorderLeft = eeNew( UIControlAnim, ( tParams ) ); - mBorderLeft->Enabled( true ); - mBorderLeft->Visible( true ); + mBorderLeft->enabled( true ); + mBorderLeft->visible( true ); mBorderRight = eeNew( UIControlAnim, ( tParams ) ); - mBorderRight->Enabled( true ); - mBorderRight->Visible( true ); + mBorderRight->enabled( true ); + mBorderRight->visible( true ); mBorderBottom = eeNew( UIControlAnim, ( tParams ) ); - mBorderBottom->Enabled( true ); - mBorderBottom->Visible( true ); + mBorderBottom->enabled( true ); + mBorderBottom->visible( true ); if ( mWinFlags & UI_WIN_DRAGABLE_CONTAINER ) - mContainer->DragEnable( true ); + mContainer->dragEnable( true ); UIComplexControl::CreateParams ButtonParams; ButtonParams.Parent( this ); if ( mWinFlags & UI_WIN_CLOSE_BUTTON ) { mButtonClose = eeNew( UIComplexControl, ( ButtonParams ) ); - mButtonClose->Visible( true ); - mButtonClose->Enabled( true ); + mButtonClose->visible( true ); + mButtonClose->enabled( true ); if ( mWinFlags & UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS ) { - mButtonClose->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::ButtonCloseClick ) ); + mButtonClose->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::buttonCloseClick ) ); } } if ( ( mWinFlags & UI_WIN_RESIZEABLE ) && ( mWinFlags & UI_WIN_MAXIMIZE_BUTTON ) ) { mButtonMaximize = eeNew( UIComplexControl, ( ButtonParams ) ); - mButtonMaximize->Visible( true ); - mButtonMaximize->Enabled( true ); + mButtonMaximize->visible( true ); + mButtonMaximize->enabled( true ); if ( mWinFlags & UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS ) { - mButtonMaximize->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::ButtonMaximizeClick ) ); + mButtonMaximize->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::buttonMaximizeClick ) ); } } if ( mWinFlags & UI_WIN_MINIMIZE_BUTTON ) { mButtonMinimize = eeNew( UIComplexControl, ( ButtonParams ) ); - mButtonMinimize->Visible( true ); - mButtonMinimize->Enabled( true ); + mButtonMinimize->visible( true ); + mButtonMinimize->enabled( true ); if ( mWinFlags & UI_WIN_USE_DEFAULT_BUTTONS_ACTIONS ) { - mButtonMinimize->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::ButtonMinimizeClick ) ); + mButtonMinimize->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &UIWindow::buttonMinimizeClick ) ); } } - DragEnable( true ); + dragEnable( true ); } - if ( IsModal() ) { - CreateModalControl(); + if ( isModal() ) { + createModalControl(); } - Alpha( mBaseAlpha ); + alpha( mBaseAlpha ); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIWindow::~UIWindow() { - UIManager::instance()->WindowRemove( this ); + UIManager::instance()->windowRemove( this ); - UIManager::instance()->SetFocusLastWindow( this ); + UIManager::instance()->setFocusLastWindow( this ); - SendCommonEvent( UIEvent::EventOnWindowClose ); + sendCommonEvent( UIEvent::EventOnWindowClose ); } -void UIWindow::CreateModalControl() { - UIControl * Ctrl = UIManager::instance()->MainControl(); +void UIWindow::createModalControl() { + UIControl * Ctrl = UIManager::instance()->mainControl(); if ( NULL == mModalCtrl ) { - mModalCtrl = eeNew( UIControlAnim, ( UIControlAnim::CreateParams( Ctrl , Vector2i(0,0), Ctrl->Size(), UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM ) ) ); + mModalCtrl = eeNew( UIControlAnim, ( UIControlAnim::CreateParams( Ctrl , Vector2i(0,0), Ctrl->size(), UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM ) ) ); } else { - mModalCtrl->Pos( 0, 0 ); - mModalCtrl->Size( Ctrl->Size() ); + mModalCtrl->position( 0, 0 ); + mModalCtrl->size( Ctrl->size() ); } - DisableByModal(); + disableByModal(); } -void UIWindow::EnableByModal() { - if ( IsModal() ) { - UIControl * CtrlChild = UIManager::instance()->MainControl()->ChildGetFirst(); +void UIWindow::enableByModal() { + if ( isModal() ) { + UIControl * CtrlChild = UIManager::instance()->mainControl()->childGetFirst(); while ( NULL != CtrlChild ) { if ( CtrlChild != mModalCtrl && CtrlChild != this && - CtrlChild->ControlFlags() & UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW ) + CtrlChild->controlFlags() & UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW ) { - CtrlChild->Enabled( true ); - CtrlChild->WriteCtrlFlag( UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW, 0 ); + CtrlChild->enabled( true ); + CtrlChild->writeCtrlFlag( UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW, 0 ); } - CtrlChild = CtrlChild->NextGet(); + CtrlChild = CtrlChild->nextGet(); } } } -void UIWindow::DisableByModal() { - if ( IsModal() ) { - UIControl * CtrlChild = UIManager::instance()->MainControl()->ChildGetFirst(); +void UIWindow::disableByModal() { + if ( isModal() ) { + UIControl * CtrlChild = UIManager::instance()->mainControl()->childGetFirst(); while ( NULL != CtrlChild ) { if ( CtrlChild != mModalCtrl && CtrlChild != this && - CtrlChild->Enabled() ) + CtrlChild->enabled() ) { - CtrlChild->Enabled( false ); - CtrlChild->WriteCtrlFlag( UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW, 1 ); + CtrlChild->enabled( false ); + CtrlChild->writeCtrlFlag( UI_CTRL_FLAG_DISABLED_BY_MODAL_WINDOW, 1 ); } - CtrlChild = CtrlChild->NextGet(); + CtrlChild = CtrlChild->nextGet(); } } } -Uint32 UIWindow::Type() const { +Uint32 UIWindow::getType() const { return UI_TYPE_WINDOW; } -bool UIWindow::IsType( const Uint32& type ) const { - return UIWindow::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIWindow::isType( const Uint32& type ) const { + return UIWindow::getType() == type ? true : UIComplexControl::isType( type ); } -void UIWindow::ContainerPosChange( const UIEvent * Event ) { - Vector2i PosDiff = mContainer->Pos() - Vector2i( mBorderLeft->Size().width(), mWindowDecoration->Size().height() ); +void UIWindow::containerPosChange( const UIEvent * Event ) { + Vector2i PosDiff = mContainer->position() - Vector2i( mBorderLeft->size().width(), mWindowDecoration->size().height() ); if ( PosDiff.x != 0 || PosDiff.y != 0 ) { - mContainer->Pos( mBorderLeft->Size().width(), mWindowDecoration->Size().height() ); + mContainer->position( mBorderLeft->size().width(), mWindowDecoration->size().height() ); - Pos( mPos + PosDiff ); + position( mPos + PosDiff ); } } -void UIWindow::ButtonCloseClick( const UIEvent * Event ) { +void UIWindow::buttonCloseClick( const UIEvent * Event ) { CloseWindow(); - SendCommonEvent( UIEvent::EventOnWindowCloseClick ); + sendCommonEvent( UIEvent::EventOnWindowCloseClick ); } void UIWindow::CloseWindow() { if ( NULL != mButtonClose ) - mButtonClose->Enabled( false ); + mButtonClose->enabled( false ); if ( NULL != mButtonMaximize ) - mButtonMaximize->Enabled( false ); + mButtonMaximize->enabled( false ); if ( NULL != mButtonMinimize ) - mButtonMinimize->Enabled( false ); + mButtonMinimize->enabled( false ); if ( NULL != mModalCtrl ) { - mModalCtrl->Close(); + mModalCtrl->close(); mModalCtrl = NULL; } - if ( Time::Zero != UIThemeManager::instance()->ControlsFadeOutTime() ) - CloseFadeOut( UIThemeManager::instance()->ControlsFadeOutTime() ); + if ( Time::Zero != UIThemeManager::instance()->controlsFadeOutTime() ) + closeFadeOut( UIThemeManager::instance()->controlsFadeOutTime() ); else - Close(); + close(); } -void UIWindow::Close() { - UIComplexControl::Close(); +void UIWindow::close() { + UIComplexControl::close(); - EnableByModal(); + enableByModal(); } -void UIWindow::ButtonMaximizeClick( const UIEvent * Event ) { - Maximize(); +void UIWindow::buttonMaximizeClick( const UIEvent * Event ) { + maximize(); - SendCommonEvent( UIEvent::EventOnWindowMaximizeClick ); + sendCommonEvent( UIEvent::EventOnWindowMaximizeClick ); } -void UIWindow::ButtonMinimizeClick( const UIEvent * Event ) { +void UIWindow::buttonMinimizeClick( const UIEvent * Event ) { Hide(); - SendCommonEvent( UIEvent::EventOnWindowMinimizeClick ); + sendCommonEvent( UIEvent::EventOnWindowMinimizeClick ); } -void UIWindow::SetTheme( UITheme *Theme ) { - UIComplexControl::SetTheme( Theme ); +void UIWindow::setTheme( UITheme *Theme ) { + UIComplexControl::setTheme( Theme ); - mContainer->SetThemeControl ( Theme, "winback" ); + mContainer->setThemeControl ( Theme, "winback" ); if ( !( mWinFlags & UI_WIN_NO_BORDER ) ) { - mWindowDecoration->SetThemeControl ( Theme, "windeco" ); - mBorderLeft->SetThemeControl ( Theme, "winborderleft" ); - mBorderRight->SetThemeControl ( Theme, "winborderright" ); - mBorderBottom->SetThemeControl ( Theme, "winborderbottom" ); + mWindowDecoration->setThemeControl ( Theme, "windeco" ); + mBorderLeft->setThemeControl ( Theme, "winborderleft" ); + mBorderRight->setThemeControl ( Theme, "winborderright" ); + mBorderBottom->setThemeControl ( Theme, "winborderbottom" ); if ( NULL != mButtonClose ) { - mButtonClose->SetThemeControl( Theme, "winclose" ); - mButtonClose->Size( mButtonClose->GetSkinSize() ); + mButtonClose->setThemeControl( Theme, "winclose" ); + mButtonClose->size( mButtonClose->getSkinSize() ); } if ( NULL != mButtonMaximize ) { - mButtonMaximize->SetThemeControl( Theme, "winmax" ); - mButtonMaximize->Size( mButtonMaximize->GetSkinSize() ); + mButtonMaximize->setThemeControl( Theme, "winmax" ); + mButtonMaximize->size( mButtonMaximize->getSkinSize() ); } if ( NULL != mButtonMinimize ) { - mButtonMinimize->SetThemeControl( Theme, "winmin" ); - mButtonMinimize->Size( mButtonMinimize->GetSkinSize() ); + mButtonMinimize->setThemeControl( Theme, "winmin" ); + mButtonMinimize->size( mButtonMinimize->getSkinSize() ); } - FixChildsSize(); - GetMinWinSize(); + fixChildsSize(); + getMinWinSize(); } } -void UIWindow::GetMinWinSize() { +void UIWindow::getMinWinSize() { if ( NULL == mWindowDecoration || ( mMinWindowSize.x != 0 && mMinWindowSize.y != 0 ) ) return; Sizei tSize; - tSize.x = mBorderLeft->Size().width() + mBorderRight->Size().width() - mButtonsPositionFixer.x; - tSize.y = mWindowDecoration->Size().height() + mBorderBottom->Size().height(); + tSize.x = mBorderLeft->size().width() + mBorderRight->size().width() - mButtonsPositionFixer.x; + tSize.y = mWindowDecoration->size().height() + mBorderBottom->size().height(); if ( NULL != mButtonClose ) - tSize.x += mButtonClose->Size().width(); + tSize.x += mButtonClose->size().width(); if ( NULL != mButtonMaximize ) - tSize.x += mButtonMaximize->Size().width(); + tSize.x += mButtonMaximize->size().width(); if ( NULL != mButtonMinimize ) - tSize.x += mButtonMinimize->Size().width(); + tSize.x += mButtonMinimize->size().width(); if ( mMinWindowSize.x < tSize.x ) mMinWindowSize.x = tSize.x; @@ -283,218 +283,218 @@ void UIWindow::GetMinWinSize() { mMinWindowSize.y = tSize.y; } -void UIWindow::OnSizeChange() { +void UIWindow::onSizeChange() { if ( mSize.x < mMinWindowSize.x || mSize.y < mMinWindowSize.y ) { if ( mSize.x < mMinWindowSize.x && mSize.y < mMinWindowSize.y ) { - Size( mMinWindowSize ); + size( mMinWindowSize ); } else if ( mSize.x < mMinWindowSize.x ) { - Size( Sizei( mMinWindowSize.x, mSize.y ) ); + size( Sizei( mMinWindowSize.x, mSize.y ) ); } else { - Size( Sizei( mSize.x, mMinWindowSize.y ) ); + size( Sizei( mSize.x, mMinWindowSize.y ) ); } } else { - FixChildsSize(); + fixChildsSize(); - UIComplexControl::OnSizeChange(); + UIComplexControl::onSizeChange(); } } -void UIWindow::Size( const Sizei& Size ) { +void UIWindow::size( const Sizei& Size ) { if ( NULL != mWindowDecoration ) { Sizei size = Size; - size.x += mBorderLeft->Size().width() + mBorderRight->Size().width(); - size.y += mWindowDecoration->Size().height() + mBorderBottom->Size().height(); + size.x += mBorderLeft->size().width() + mBorderRight->size().width(); + size.y += mWindowDecoration->size().height() + mBorderBottom->size().height(); - UIComplexControl::Size( size ); + UIComplexControl::size( size ); } else { - UIComplexControl::Size( Size ); + UIComplexControl::size( Size ); } } -void UIWindow::Size( const Int32& Width, const Int32& Height ) { - Size( Sizei( Width, Height ) ); +void UIWindow::size( const Int32& Width, const Int32& Height ) { + size( Sizei( Width, Height ) ); } -const Sizei& UIWindow::Size() { - return UIComplexControl::Size(); +const Sizei& UIWindow::size() { + return UIComplexControl::size(); } -void UIWindow::FixChildsSize() { +void UIWindow::fixChildsSize() { if ( NULL == mWindowDecoration ) { - mContainer->Size( mSize.width(), mSize.height() ); + mContainer->size( mSize.width(), mSize.height() ); return; } if ( mDecoAutoSize ) { - mDecoSize = Sizei( mSize.width(), mWindowDecoration->GetSkinSize().height() ); + mDecoSize = Sizei( mSize.width(), mWindowDecoration->getSkinSize().height() ); } - mWindowDecoration->Size( mDecoSize ); + mWindowDecoration->size( mDecoSize ); if ( mBorderAutoSize ) { - mBorderBottom->Size( mSize.width(), mBorderBottom->GetSkinSize().height() ); + mBorderBottom->size( mSize.width(), mBorderBottom->getSkinSize().height() ); } else { - mBorderBottom->Size( mSize.width(), mBorderSize.height() ); + mBorderBottom->size( mSize.width(), mBorderSize.height() ); } - Uint32 BorderHeight = mSize.height() - mDecoSize.height() - mBorderBottom->Size().height(); + Uint32 BorderHeight = mSize.height() - mDecoSize.height() - mBorderBottom->size().height(); if ( mBorderAutoSize ) { - mBorderLeft->Size( mBorderLeft->GetSkinSize().width() , BorderHeight ); - mBorderRight->Size( mBorderRight->GetSkinSize().width(), BorderHeight ); + mBorderLeft->size( mBorderLeft->getSkinSize().width() , BorderHeight ); + mBorderRight->size( mBorderRight->getSkinSize().width(), BorderHeight ); } else { - mBorderLeft->Size( mBorderSize.width(), BorderHeight ); - mBorderRight->Size( mBorderSize.width(), BorderHeight ); + mBorderLeft->size( mBorderSize.width(), BorderHeight ); + mBorderRight->size( mBorderSize.width(), BorderHeight ); } - mBorderLeft->Pos( 0, mWindowDecoration->Size().height() ); - mBorderRight->Pos( mSize.width() - mBorderRight->Size().width(), mWindowDecoration->Size().height() ); - mBorderBottom->Pos( 0, mSize.height() - mBorderBottom->Size().height() ); + mBorderLeft->position( 0, mWindowDecoration->size().height() ); + mBorderRight->position( mSize.width() - mBorderRight->size().width(), mWindowDecoration->size().height() ); + mBorderBottom->position( 0, mSize.height() - mBorderBottom->size().height() ); - mContainer->Pos( mBorderLeft->Size().width(), mWindowDecoration->Size().height() ); - mContainer->Size( mSize.width() - mBorderLeft->Size().width() - mBorderRight->Size().width(), mSize.height() - mWindowDecoration->Size().height() - mBorderBottom->Size().height() ); + mContainer->position( mBorderLeft->size().width(), mWindowDecoration->size().height() ); + mContainer->size( mSize.width() - mBorderLeft->size().width() - mBorderRight->size().width(), mSize.height() - mWindowDecoration->size().height() - mBorderBottom->size().height() ); Uint32 yPos; if ( NULL != mButtonClose ) { - yPos = mWindowDecoration->Size().height() / 2 - mButtonClose->Size().height() / 2 + mButtonsPositionFixer.y; + yPos = mWindowDecoration->size().height() / 2 - mButtonClose->size().height() / 2 + mButtonsPositionFixer.y; - mButtonClose->Pos( mWindowDecoration->Size().width() - mBorderRight->Size().width() - mButtonClose->Size().width() + mButtonsPositionFixer.x, yPos ); + mButtonClose->position( mWindowDecoration->size().width() - mBorderRight->size().width() - mButtonClose->size().width() + mButtonsPositionFixer.x, yPos ); } if ( NULL != mButtonMaximize ) { - yPos = mWindowDecoration->Size().height() / 2 - mButtonMaximize->Size().height() / 2 + mButtonsPositionFixer.y; + yPos = mWindowDecoration->size().height() / 2 - mButtonMaximize->size().height() / 2 + mButtonsPositionFixer.y; if ( NULL != mButtonClose ) { - mButtonMaximize->Pos( mButtonClose->Pos().x - mButtonsSeparation - mButtonMaximize->Size().width(), yPos ); + mButtonMaximize->position( mButtonClose->position().x - mButtonsSeparation - mButtonMaximize->size().width(), yPos ); } else { - mButtonMaximize->Pos( mWindowDecoration->Size().width() - mBorderRight->Size().width() - mButtonMaximize->Size().width() + mButtonsPositionFixer.x, yPos ); + mButtonMaximize->position( mWindowDecoration->size().width() - mBorderRight->size().width() - mButtonMaximize->size().width() + mButtonsPositionFixer.x, yPos ); } } if ( NULL != mButtonMinimize ) { - yPos = mWindowDecoration->Size().height() / 2 - mButtonMinimize->Size().height() / 2 + mButtonsPositionFixer.y; + yPos = mWindowDecoration->size().height() / 2 - mButtonMinimize->size().height() / 2 + mButtonsPositionFixer.y; if ( NULL != mButtonMaximize ) { - mButtonMinimize->Pos( mButtonMaximize->Pos().x - mButtonsSeparation - mButtonMinimize->Size().width(), yPos ); + mButtonMinimize->position( mButtonMaximize->position().x - mButtonsSeparation - mButtonMinimize->size().width(), yPos ); } else { if ( NULL != mButtonClose ) { - mButtonMinimize->Pos( mButtonClose->Pos().x - mButtonsSeparation - mButtonMinimize->Size().width(), yPos ); + mButtonMinimize->position( mButtonClose->position().x - mButtonsSeparation - mButtonMinimize->size().width(), yPos ); } else { - mButtonMinimize->Pos( mWindowDecoration->Size().width() - mBorderRight->Size().width() - mButtonMinimize->Size().width() + mButtonsPositionFixer.x, yPos ); + mButtonMinimize->position( mWindowDecoration->size().width() - mBorderRight->size().width() - mButtonMinimize->size().width() + mButtonsPositionFixer.x, yPos ); } } } - FixTitleSize(); + fixTitleSize(); } -Uint32 UIWindow::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIWindow::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgFocus: { - ToFront(); + toFront(); break; } case UIMessage::MsgMouseDown: { - DoResize( Msg ); + doResize( Msg ); break; } case UIMessage::MsgWindowResize: { - if ( IsModal() && NULL != mModalCtrl ) { - mModalCtrl->Size( UIManager::instance()->MainControl()->Size() ); + if ( isModal() && NULL != mModalCtrl ) { + mModalCtrl->size( UIManager::instance()->mainControl()->size() ); } break; } case UIMessage::MsgMouseExit: { - UIManager::instance()->SetCursor( EE_CURSOR_ARROW ); + UIManager::instance()->setCursor( EE_CURSOR_ARROW ); break; } case UIMessage::MsgDragStart: { - UIManager::instance()->SetCursor( EE_CURSOR_HAND ); + UIManager::instance()->setCursor( EE_CURSOR_HAND ); break; } case UIMessage::MsgDragEnd: { - UIManager::instance()->SetCursor( EE_CURSOR_ARROW ); + UIManager::instance()->setCursor( EE_CURSOR_ARROW ); break; } } - return UIComplexControl::OnMessage( Msg ); + return UIComplexControl::onMessage( Msg ); } -void UIWindow::DoResize ( const UIMessage * Msg ) { +void UIWindow::doResize ( const UIMessage * Msg ) { if ( NULL == mWindowDecoration ) return; if ( !( mWinFlags & UI_WIN_RESIZEABLE ) || - !( Msg->Flags() & EE_BUTTON_LMASK ) || + !( Msg->getFlags() & EE_BUTTON_LMASK ) || RESIZE_NONE != mResizeType || - ( UIManager::instance()->LastPressTrigger() & EE_BUTTON_LMASK ) + ( UIManager::instance()->lastPressTrigger() & EE_BUTTON_LMASK ) ) return; - DecideResizeType( Msg->Sender() ); + decideResizeType( Msg->getSender() ); } -void UIWindow::DecideResizeType( UIControl * Control ) { - Vector2i Pos = UIManager::instance()->GetMousePos(); +void UIWindow::decideResizeType( UIControl * Control ) { + Vector2i Pos = UIManager::instance()->getMousePos(); - WorldToControl( Pos ); + worldToControl( Pos ); if ( Control == this ) { - if ( Pos.x <= mBorderLeft->Size().width() ) { - TryResize( RESIZE_TOPLEFT ); - } else if ( Pos.x >= ( mSize.width() - mBorderRight->Size().width() ) ) { - TryResize( RESIZE_TOPRIGHT ); - } else if ( Pos.y <= mBorderBottom->Size().height() ) { + if ( Pos.x <= mBorderLeft->size().width() ) { + tryResize( RESIZE_TOPLEFT ); + } else if ( Pos.x >= ( mSize.width() - mBorderRight->size().width() ) ) { + tryResize( RESIZE_TOPRIGHT ); + } else if ( Pos.y <= mBorderBottom->size().height() ) { if ( Pos.x < mMinCornerDistance ) { - TryResize( RESIZE_TOPLEFT ); + tryResize( RESIZE_TOPLEFT ); } else if ( Pos.x > mSize.width() - mMinCornerDistance ) { - TryResize( RESIZE_TOPRIGHT ); + tryResize( RESIZE_TOPRIGHT ); } else { - TryResize( RESIZE_TOP ); + tryResize( RESIZE_TOP ); } } } else if ( Control == mBorderBottom ) { if ( Pos.x < mMinCornerDistance ) { - TryResize( RESIZE_LEFTBOTTOM ); + tryResize( RESIZE_LEFTBOTTOM ); } else if ( Pos.x > mSize.width() - mMinCornerDistance ) { - TryResize( RESIZE_RIGHTBOTTOM ); + tryResize( RESIZE_RIGHTBOTTOM ); } else { - TryResize( RESIZE_BOTTOM ); + tryResize( RESIZE_BOTTOM ); } } else if ( Control == mBorderLeft ) { if ( Pos.y >= mSize.height() - mMinCornerDistance ) { - TryResize( RESIZE_LEFTBOTTOM ); + tryResize( RESIZE_LEFTBOTTOM ); } else { - TryResize( RESIZE_LEFT ); + tryResize( RESIZE_LEFT ); } } else if ( Control == mBorderRight ) { if ( Pos.y >= mSize.height() - mMinCornerDistance ) { - TryResize( RESIZE_RIGHTBOTTOM ); + tryResize( RESIZE_RIGHTBOTTOM ); } else { - TryResize( RESIZE_RIGHT ); + tryResize( RESIZE_RIGHT ); } } } -void UIWindow::TryResize( const UI_RESIZE_TYPE& Type ) { +void UIWindow::tryResize( const UI_RESIZE_TYPE& Type ) { if ( RESIZE_NONE != mResizeType ) return; - DragEnable( false ); + dragEnable( false ); - Vector2i Pos = UIManager::instance()->GetMousePos(); + Vector2i Pos = UIManager::instance()->getMousePos(); - WorldToControl( Pos ); + worldToControl( Pos ); mResizeType = Type; @@ -550,76 +550,76 @@ void UIWindow::TryResize( const UI_RESIZE_TYPE& Type ) { } } -void UIWindow::EndResize() { +void UIWindow::endResize() { mResizeType = RESIZE_NONE; } -void UIWindow::UpdateResize() { +void UIWindow::updateResize() { if ( RESIZE_NONE == mResizeType ) return; - if ( !( UIManager::instance()->PressTrigger() & EE_BUTTON_LMASK ) ) { - EndResize(); - DragEnable( true ); + if ( !( UIManager::instance()->pressTrigger() & EE_BUTTON_LMASK ) ) { + endResize(); + dragEnable( true ); return; } - Vector2i Pos = UIManager::instance()->GetMousePos(); + Vector2i Pos = UIManager::instance()->getMousePos(); - WorldToControl( Pos ); + worldToControl( Pos ); switch ( mResizeType ) { case RESIZE_RIGHT: { - InternalSize( Pos.x + mResizePos.x, mSize.height() ); + internalSize( Pos.x + mResizePos.x, mSize.height() ); break; } case RESIZE_BOTTOM: { - InternalSize( mSize.width(), Pos.y + mResizePos.y ); + internalSize( mSize.width(), Pos.y + mResizePos.y ); break; } case RESIZE_LEFT: { Pos.x -= mResizePos.x; - UIControl::Pos( mPos.x + Pos.x, mPos.y ); - InternalSize( mSize.width() - Pos.x, mSize.height() ); + UIControl::position( mPos.x + Pos.x, mPos.y ); + internalSize( mSize.width() - Pos.x, mSize.height() ); break; } case RESIZE_TOP: { Pos.y -= mResizePos.y; - UIControl::Pos( mPos.x, mPos.y + Pos.y ); - InternalSize( mSize.width(), mSize.height() - Pos.y ); + UIControl::position( mPos.x, mPos.y + Pos.y ); + internalSize( mSize.width(), mSize.height() - Pos.y ); break; } case RESIZE_RIGHTBOTTOM: { Pos += mResizePos; - InternalSize( Pos.x, Pos.y ); + internalSize( Pos.x, Pos.y ); break; } case RESIZE_TOPLEFT: { Pos -= mResizePos; - UIControl::Pos( mPos.x + Pos.x, mPos.y + Pos.y ); - InternalSize( mSize.width() - Pos.x, mSize.height() - Pos.y ); + UIControl::position( mPos.x + Pos.x, mPos.y + Pos.y ); + internalSize( mSize.width() - Pos.x, mSize.height() - Pos.y ); break; } case RESIZE_TOPRIGHT: { Pos.y -= mResizePos.y; Pos.x += mResizePos.x; - UIControl::Pos( mPos.x, mPos.y + Pos.y ); - InternalSize( Pos.x, mSize.height() - Pos.y ); + UIControl::position( mPos.x, mPos.y + Pos.y ); + internalSize( Pos.x, mSize.height() - Pos.y ); break; } case RESIZE_LEFTBOTTOM: { Pos.x -= mResizePos.x; Pos.y += mResizePos.y; - UIControl::Pos( mPos.x + Pos.x, mPos.y ); - InternalSize( mSize.width() - Pos.x, Pos.y ); + UIControl::position( mPos.x + Pos.x, mPos.y ); + internalSize( mSize.width() - Pos.x, Pos.y ); break; } case RESIZE_NONE: @@ -628,11 +628,11 @@ void UIWindow::UpdateResize() { } } -void UIWindow::InternalSize( const Int32& w, const Int32& h ) { - InternalSize( Sizei( w, h ) ); +void UIWindow::internalSize( const Int32& w, const Int32& h ) { + internalSize( Sizei( w, h ) ); } -void UIWindow::InternalSize( Sizei Size ) { +void UIWindow::internalSize( Sizei Size ) { if ( Size.x < mMinWindowSize.x || Size.y < mMinWindowSize.y ) { if ( Size.x < mMinWindowSize.x && Size.y < mMinWindowSize.y ) { Size = mMinWindowSize; @@ -645,18 +645,18 @@ void UIWindow::InternalSize( Sizei Size ) { if ( Size != mSize ) { mSize = Size; - OnSizeChange(); + onSizeChange(); } } -void UIWindow::Draw() { - UIComplexControl::Draw(); +void UIWindow::draw() { + UIComplexControl::draw(); if ( mWinFlags & UI_WIN_DRAW_SHADOW ) { Primitives P; P.forceDraw( false ); - ColorA BeginC( 0, 0, 0, 25 * ( Alpha() / (Float)255 ) ); + ColorA BeginC( 0, 0, 0, 25 * ( alpha() / (Float)255 ) ); ColorA EndC( 0, 0, 0, 0 ); Float SSize = 16.f; @@ -684,47 +684,47 @@ void UIWindow::Draw() { } } -void UIWindow::Update() { - ResizeCursor(); +void UIWindow::update() { + resizeCursor(); - UIComplexControl::Update(); + UIComplexControl::update(); - UpdateResize(); + updateResize(); } -UIControlAnim * UIWindow::Container() const { +UIControlAnim * UIWindow::getContainer() const { return mContainer; } -UIComplexControl * UIWindow::ButtonClose() const { +UIComplexControl * UIWindow::getButtonClose() const { return mButtonClose; } -UIComplexControl * UIWindow::ButtonMaximize() const { +UIComplexControl * UIWindow::getButtonMaximize() const { return mButtonMaximize; } -UIComplexControl * UIWindow::ButtonMinimize() const { +UIComplexControl * UIWindow::getButtonMinimize() const { return mButtonMinimize; } -bool UIWindow::Show() { - if ( !Visible() ) { - Enabled( true ); - Visible( true ); +bool UIWindow::show() { + if ( !visible() ) { + enabled( true ); + visible( true ); - SetFocus(); + setFocus(); - StartAlphaAnim( mBaseAlpha == Alpha() ? 0.f : mAlpha, mBaseAlpha, UIThemeManager::instance()->ControlsFadeInTime() ); + startAlphaAnim( mBaseAlpha == alpha() ? 0.f : mAlpha, mBaseAlpha, UIThemeManager::instance()->controlsFadeInTime() ); - if ( IsModal() ) { - CreateModalControl(); + if ( isModal() ) { + createModalControl(); - mModalCtrl->Enabled( true ); - mModalCtrl->Visible( true ); - mModalCtrl->ToFront(); + mModalCtrl->enabled( true ); + mModalCtrl->visible( true ); + mModalCtrl->toFront(); - ToFront(); + toFront(); } return true; @@ -734,19 +734,19 @@ bool UIWindow::Show() { } bool UIWindow::Hide() { - if ( Visible() ) { - if ( UIThemeManager::instance()->DefaultEffectsEnabled() ) { - DisableFadeOut( UIThemeManager::instance()->ControlsFadeOutTime() ); + if ( visible() ) { + if ( UIThemeManager::instance()->defaultEffectsEnabled() ) { + disableFadeOut( UIThemeManager::instance()->controlsFadeOutTime() ); } else { - Enabled( false ); - Visible( false ); + enabled( false ); + visible( false ); } - UIManager::instance()->MainControl()->SetFocus(); + UIManager::instance()->mainControl()->setFocus(); if ( NULL != mModalCtrl ) { - mModalCtrl->Enabled( false ); - mModalCtrl->Visible( false ); + mModalCtrl->enabled( false ); + mModalCtrl->visible( false ); } return true; @@ -755,37 +755,37 @@ bool UIWindow::Hide() { return false; } -void UIWindow::OnAlphaChange() { +void UIWindow::onAlphaChange() { if ( mWinFlags & UI_WIN_SHARE_ALPHA_WITH_CHILDS ) { UIControlAnim * AnimChild; UIControl * CurChild = mChild; while ( NULL != CurChild ) { - if ( CurChild->IsAnimated() ) { + if ( CurChild->isAnimated() ) { AnimChild = reinterpret_cast ( CurChild ); - AnimChild->Alpha( mAlpha ); + AnimChild->alpha( mAlpha ); } - CurChild = CurChild->NextGet(); + CurChild = CurChild->nextGet(); } } - UIComplexControl::OnAlphaChange(); + UIComplexControl::onAlphaChange(); } -void UIWindow::BaseAlpha( const Uint8& Alpha ) { +void UIWindow::baseAlpha( const Uint8& Alpha ) { if ( mAlpha == mBaseAlpha ) { - UIControlAnim::Alpha( Alpha ); + UIControlAnim::alpha( Alpha ); } mBaseAlpha = Alpha; } -const Uint8& UIWindow::BaseAlpha() const { +const Uint8& UIWindow::baseAlpha() const { return mBaseAlpha; } -void UIWindow::Title( const String& Text ) { +void UIWindow::title( const String& Text ) { if ( NULL == mTitle ) { UITextBox::CreateParams Params; Params.Parent( this ); @@ -799,74 +799,74 @@ void UIWindow::Title( const String& Text ) { Params.Flags |= UI_DRAW_SHADOW; mTitle = eeNew( UITextBox, ( Params ) ); - mTitle->Enabled( false ); - mTitle->Visible( true ); + mTitle->enabled( false ); + mTitle->visible( true ); } - mTitle->Text( Text ); + mTitle->text( Text ); - FixTitleSize(); + fixTitleSize(); } -void UIWindow::FixTitleSize() { +void UIWindow::fixTitleSize() { if ( NULL != mWindowDecoration && NULL != mTitle ) { - mTitle->Size( mWindowDecoration->Size().width() - mBorderLeft->Size().width() - mBorderRight->Size().width(), mWindowDecoration->Size().height() ); - mTitle->Pos( mBorderLeft->Size().width(), 0 ); + mTitle->size( mWindowDecoration->size().width() - mBorderLeft->size().width() - mBorderRight->size().width(), mWindowDecoration->size().height() ); + mTitle->position( mBorderLeft->size().width(), 0 ); } } -String UIWindow::Title() const { +String UIWindow::title() const { if ( NULL != mTitle ) - return mTitle->Text(); + return mTitle->text(); return String(); } -UITextBox * UIWindow::TitleTextBox() const { +UITextBox * UIWindow::titleTextBox() const { return mTitle; } -void UIWindow::Maximize() { - UIControl * Ctrl = UIManager::instance()->MainControl(); +void UIWindow::maximize() { + UIControl * Ctrl = UIManager::instance()->mainControl(); - if ( Ctrl->Size() == mSize ) { - Pos( mNonMaxPos ); - InternalSize( mNonMaxSize ); + if ( Ctrl->size() == mSize ) { + position( mNonMaxPos ); + internalSize( mNonMaxSize ); } else { mNonMaxPos = mPos; mNonMaxSize = mSize; - Pos( 0, 0 ); - InternalSize( UIManager::instance()->MainControl()->Size() ); + position( 0, 0 ); + internalSize( UIManager::instance()->mainControl()->size() ); } } -Uint32 UIWindow::OnMouseDoubleClick( const Vector2i &Pos, const Uint32 Flags ) { +Uint32 UIWindow::onMouseDoubleClick( const Vector2i &Pos, const Uint32 Flags ) { if ( ( mWinFlags & UI_WIN_RESIZEABLE ) && ( NULL != mButtonMaximize ) && ( Flags & EE_BUTTON_LMASK ) ) { - ButtonMaximizeClick( NULL ); + buttonMaximizeClick( NULL ); } return 1; } -Uint32 UIWindow::OnKeyDown( const UIEventKey &Event ) { - CheckShortcuts( Event.KeyCode(), Event.Mod() ); +Uint32 UIWindow::onKeyDown( const UIEventKey &Event ) { + checkShortcuts( Event.getKeyCode(), Event.getMod() ); - return UIComplexControl::OnKeyDown( Event ); + return UIComplexControl::onKeyDown( Event ); } -void UIWindow::CheckShortcuts( const Uint32& KeyCode, const Uint32& Mod ) { +void UIWindow::checkShortcuts( const Uint32& KeyCode, const Uint32& Mod ) { for ( KeyboardShortcuts::iterator it = mKbShortcuts.begin(); it != mKbShortcuts.end(); it++ ) { KeyboardShortcut kb = (*it); if ( KeyCode == kb.KeyCode && ( Mod & kb.Mod ) ) { - UIManager::instance()->SendMouseUp( kb.Button, Vector2i(0,0), EE_BUTTON_LMASK ); - UIManager::instance()->SendMouseClick( kb.Button, Vector2i(0,0), EE_BUTTON_LMASK ); + UIManager::instance()->sendMouseUp( kb.Button, Vector2i(0,0), EE_BUTTON_LMASK ); + UIManager::instance()->sendMouseClick( kb.Button, Vector2i(0,0), EE_BUTTON_LMASK ); } } } -UIWindow::KeyboardShortcuts::iterator UIWindow::ExistsShortcut( const Uint32& KeyCode, const Uint32& Mod ) { +UIWindow::KeyboardShortcuts::iterator UIWindow::existsShortcut( const Uint32& KeyCode, const Uint32& Mod ) { for ( KeyboardShortcuts::iterator it = mKbShortcuts.begin(); it != mKbShortcuts.end(); it++ ) { if ( (*it).KeyCode == KeyCode && (*it).Mod == Mod ) return it; @@ -875,8 +875,8 @@ UIWindow::KeyboardShortcuts::iterator UIWindow::ExistsShortcut( const Uint32& Ke return mKbShortcuts.end(); } -bool UIWindow::AddShortcut( const Uint32& KeyCode, const Uint32& Mod, UIPushButton * Button ) { - if ( InParentTreeOf( Button ) && mKbShortcuts.end() == ExistsShortcut( KeyCode, Mod ) ) { +bool UIWindow::addShortcut( const Uint32& KeyCode, const Uint32& Mod, UIPushButton * Button ) { + if ( inParentTreeOf( Button ) && mKbShortcuts.end() == existsShortcut( KeyCode, Mod ) ) { mKbShortcuts.push_back( KeyboardShortcut( KeyCode, Mod, Button ) ); return true; @@ -885,8 +885,8 @@ bool UIWindow::AddShortcut( const Uint32& KeyCode, const Uint32& Mod, UIPushButt return false; } -bool UIWindow::RemoveShortcut( const Uint32& KeyCode, const Uint32& Mod ) { - KeyboardShortcuts::iterator it = ExistsShortcut( KeyCode, Mod ); +bool UIWindow::removeShortcut( const Uint32& KeyCode, const Uint32& Mod ) { + KeyboardShortcuts::iterator it = existsShortcut( KeyCode, Mod ); if ( mKbShortcuts.end() != it ) { mKbShortcuts.erase( it ); @@ -897,65 +897,65 @@ bool UIWindow::RemoveShortcut( const Uint32& KeyCode, const Uint32& Mod ) { return false; } -bool UIWindow::IsMaximixable() { +bool UIWindow::isMaximixable() { return 0 != ( ( mWinFlags & UI_WIN_RESIZEABLE ) && ( mWinFlags & UI_WIN_MAXIMIZE_BUTTON ) ); } -bool UIWindow::IsModal() { +bool UIWindow::isModal() { return 0 != ( mWinFlags & UI_WIN_MODAL ); } -UIControlAnim * UIWindow::GetModalControl() const { +UIControlAnim * UIWindow::getModalControl() const { return mModalCtrl; } -void UIWindow::ResizeCursor() { +void UIWindow::resizeCursor() { UIManager * Man = UIManager::instance(); - if ( !IsMouseOverMeOrChilds() || !Man->UseGlobalCursors() || ( mWinFlags & UI_WIN_NO_BORDER ) || !( mWinFlags & UI_WIN_RESIZEABLE ) ) + if ( !isMouseOverMeOrChilds() || !Man->useGlobalCursors() || ( mWinFlags & UI_WIN_NO_BORDER ) || !( mWinFlags & UI_WIN_RESIZEABLE ) ) return; - Vector2i Pos = Man->GetMousePos(); + Vector2i Pos = Man->getMousePos(); - WorldToControl( Pos ); + worldToControl( Pos ); - const UIControl * Control = Man->OverControl(); + const UIControl * Control = Man->overControl(); if ( Control == this ) { - if ( Pos.x <= mBorderLeft->Size().width() ) { - Man->SetCursor( EE_CURSOR_SIZENWSE ); // RESIZE_TOPLEFT - } else if ( Pos.x >= ( mSize.width() - mBorderRight->Size().width() ) ) { - Man->SetCursor( EE_CURSOR_SIZENESW ); // RESIZE_TOPRIGHT - } else if ( Pos.y <= mBorderBottom->Size().height() ) { + if ( Pos.x <= mBorderLeft->size().width() ) { + Man->setCursor( EE_CURSOR_SIZENWSE ); // RESIZE_TOPLEFT + } else if ( Pos.x >= ( mSize.width() - mBorderRight->size().width() ) ) { + Man->setCursor( EE_CURSOR_SIZENESW ); // RESIZE_TOPRIGHT + } else if ( Pos.y <= mBorderBottom->size().height() ) { if ( Pos.x < mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENWSE ); // RESIZE_TOPLEFT + Man->setCursor( EE_CURSOR_SIZENWSE ); // RESIZE_TOPLEFT } else if ( Pos.x > mSize.width() - mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENESW ); // RESIZE_TOPRIGHT + Man->setCursor( EE_CURSOR_SIZENESW ); // RESIZE_TOPRIGHT } else { - Man->SetCursor( EE_CURSOR_SIZENS ); // RESIZE_TOP + Man->setCursor( EE_CURSOR_SIZENS ); // RESIZE_TOP } - } else if ( !( UIManager::instance()->PressTrigger() & EE_BUTTON_LMASK ) ) { - Man->SetCursor( EE_CURSOR_ARROW ); + } else if ( !( UIManager::instance()->pressTrigger() & EE_BUTTON_LMASK ) ) { + Man->setCursor( EE_CURSOR_ARROW ); } } else if ( Control == mBorderBottom ) { if ( Pos.x < mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENESW ); // RESIZE_LEFTBOTTOM + Man->setCursor( EE_CURSOR_SIZENESW ); // RESIZE_LEFTBOTTOM } else if ( Pos.x > mSize.width() - mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENWSE ); // RESIZE_RIGHTBOTTOM + Man->setCursor( EE_CURSOR_SIZENWSE ); // RESIZE_RIGHTBOTTOM } else { - Man->SetCursor( EE_CURSOR_SIZENS ); // RESIZE_BOTTOM + Man->setCursor( EE_CURSOR_SIZENS ); // RESIZE_BOTTOM } } else if ( Control == mBorderLeft ) { if ( Pos.y >= mSize.height() - mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENESW ); // RESIZE_LEFTBOTTOM + Man->setCursor( EE_CURSOR_SIZENESW ); // RESIZE_LEFTBOTTOM } else { - Man->SetCursor( EE_CURSOR_SIZEWE ); // RESIZE_LEFT + Man->setCursor( EE_CURSOR_SIZEWE ); // RESIZE_LEFT } } else if ( Control == mBorderRight ) { if ( Pos.y >= mSize.height() - mMinCornerDistance ) { - Man->SetCursor( EE_CURSOR_SIZENWSE ); // RESIZE_RIGHTBOTTOM + Man->setCursor( EE_CURSOR_SIZENWSE ); // RESIZE_RIGHTBOTTOM } else { - Man->SetCursor( EE_CURSOR_SIZEWE ); // RESIZE_RIGHT + Man->setCursor( EE_CURSOR_SIZEWE ); // RESIZE_RIGHT } } } diff --git a/src/eepp/ui/uiwinmenu.cpp b/src/eepp/ui/uiwinmenu.cpp index 84a760054..5fd05ddf7 100644 --- a/src/eepp/ui/uiwinmenu.cpp +++ b/src/eepp/ui/uiwinmenu.cpp @@ -20,26 +20,26 @@ UIWinMenu::UIWinMenu( const UIWinMenu::CreateParams& Params ) : if ( !(mFlags & UI_ANCHOR_RIGHT) ) mFlags |= UI_ANCHOR_RIGHT; - Size( Parent()->Size().width(), mMenuHeight ); + size( parent()->size().width(), mMenuHeight ); - UpdateAnchorsDistances(); + updateAnchorsDistances(); - ApplyDefaultTheme(); + applyDefaultTheme(); } UIWinMenu::~UIWinMenu() { - DestroyMenues(); + destroyMenues(); } -Uint32 UIWinMenu::Type() const { +Uint32 UIWinMenu::getType() const { return UI_TYPE_WINMENU; } -bool UIWinMenu::IsType( const Uint32& type ) const { - return UIWinMenu::Type() == type ? true : UIComplexControl::IsType( type ); +bool UIWinMenu::isType( const Uint32& type ) const { + return UIWinMenu::getType() == type ? true : UIComplexControl::isType( type ); } -void UIWinMenu::AddMenuButton( const String& ButtonText, UIPopUpMenu * Menu ) { +void UIWinMenu::addMenuButton( const String& ButtonText, UIPopUpMenu * Menu ) { eeASSERT( NULL != Menu ); UISelectButton::CreateParams ButtonParams; @@ -55,41 +55,41 @@ void UIWinMenu::AddMenuButton( const String& ButtonText, UIPopUpMenu * Menu ) { ButtonParams.FontOverColor = mFontOverColor; UISelectButton * Button = eeNew( UISelectButton, ( ButtonParams ) ); - Button->Text( ButtonText ); - Button->Visible( true ); - Button->Enabled( true ); - Button->SetThemeControl( mSkinState->GetSkin()->Theme(), "winmenubutton" ); + Button->text( ButtonText ); + Button->visible( true ); + Button->enabled( true ); + Button->setThemeControl( mSkinState->getSkin()->theme(), "winmenubutton" ); - Menu->Visible( false ); - Menu->Enabled( false ); - Menu->Parent( Parent() ); - Menu->AddEventListener( UIEvent::EventOnComplexControlFocusLoss, cb::Make1( this, &UIWinMenu::OnMenuFocusLoss ) ); + Menu->visible( false ); + Menu->enabled( false ); + Menu->parent( parent() ); + Menu->addEventListener( UIEvent::EventOnComplexControlFocusLoss, cb::Make1( this, &UIWinMenu::onMenuFocusLoss ) ); mButtons.push_back( std::make_pair( Button, Menu ) ); - RefreshButtons(); + refreshButtons(); } -void UIWinMenu::SetTheme( UITheme * Theme ) { - UIComplexControl::SetThemeControl( Theme, "winmenu" ); +void UIWinMenu::setTheme( UITheme * Theme ) { + UIComplexControl::setThemeControl( Theme, "winmenu" ); for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - it->first->SetThemeControl( Theme, "winmenubutton" ); + it->first->setThemeControl( Theme, "winmenubutton" ); } - if ( 0 == mMenuHeight && NULL != GetSkin() && NULL != GetSkin()->GetSubTexture( UISkinState::StateNormal ) ) { - mMenuHeight = GetSkin()->GetSubTexture( UISkinState::StateNormal )->size().height(); + if ( 0 == mMenuHeight && NULL != getSkin() && NULL != getSkin()->getSubTexture( UISkinState::StateNormal ) ) { + mMenuHeight = getSkin()->getSubTexture( UISkinState::StateNormal )->size().height(); - Size( Parent()->Size().width(), mMenuHeight ); + size( parent()->size().width(), mMenuHeight ); - UpdateAnchorsDistances(); + updateAnchorsDistances(); } } -void UIWinMenu::RemoveMenuButton( const String& ButtonText ) { +void UIWinMenu::removeMenuButton( const String& ButtonText ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - if ( it->first->Text() == ButtonText ) { - it->second->Close(); + if ( it->first->text() == ButtonText ) { + it->second->close(); mButtons.erase( it ); @@ -98,9 +98,9 @@ void UIWinMenu::RemoveMenuButton( const String& ButtonText ) { } } -UISelectButton * UIWinMenu::GetButton( const String& ButtonText ) { +UISelectButton * UIWinMenu::getButton( const String& ButtonText ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - if ( it->first->Text() == ButtonText ) { + if ( it->first->text() == ButtonText ) { return it->first; } } @@ -108,9 +108,9 @@ UISelectButton * UIWinMenu::GetButton( const String& ButtonText ) { return NULL; } -UIPopUpMenu * UIWinMenu::GetPopUpMenu( const String& ButtonText ) { +UIPopUpMenu * UIWinMenu::getPopUpMenu( const String& ButtonText ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - if ( it->first->Text() == ButtonText ) { + if ( it->first->text() == ButtonText ) { return it->second; } } @@ -118,12 +118,12 @@ UIPopUpMenu * UIWinMenu::GetPopUpMenu( const String& ButtonText ) { return NULL; } -void UIWinMenu::RefreshButtons() { +void UIWinMenu::refreshButtons() { Uint32 xpos = mFirstButtonMargin; Int32 h = 0, th = 0, ycenter = 0; - if ( NULL != GetSkin() ) { - SubTexture * subTexture = GetSkin()->GetSubTexture( UISkinState::StateNormal ); + if ( NULL != getSkin() ) { + SubTexture * subTexture = getSkin()->getSubTexture( UISkinState::StateNormal ); if ( NULL != subTexture ) { h = subTexture->size().height(); @@ -131,13 +131,13 @@ void UIWinMenu::RefreshButtons() { if ( mButtons.begin() != mButtons.end() ) { UISelectButton * tbut = mButtons.begin()->first; - if ( NULL != tbut->GetSkin() ) { - SubTexture * tSubTexture2 = tbut->GetSkin()->GetSubTexture( UISkinState::StateSelected ); + if ( NULL != tbut->getSkin() ) { + SubTexture * tSubTexture2 = tbut->getSkin()->getSubTexture( UISkinState::StateSelected ); if ( NULL != tSubTexture2 ) { th = tSubTexture2->size().height(); - switch ( VAlignGet( Flags() ) ) { + switch ( VAlignGet( flags() ) ) { case UI_VALIGN_CENTER: ycenter = ( h - th ) / 2; break; @@ -156,40 +156,40 @@ void UIWinMenu::RefreshButtons() { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { UISelectButton * pbut = it->first; - UITextBox * tbox = pbut->TextBox(); + UITextBox * tbox = pbut->getTextBox(); - pbut->Size( tbox->GetTextWidth() + mButtonMargin, Size().height() ); - pbut->Pos( xpos, ycenter ); + pbut->size( tbox->getTextWidth() + mButtonMargin, size().height() ); + pbut->position( xpos, ycenter ); - xpos += pbut->Size().width() + mMarginBetweenButtons; + xpos += pbut->size().width() + mMarginBetweenButtons; } } -Uint32 UIWinMenu::OnMessage( const UIMessage * Msg ) { - switch ( Msg->Msg() ) { +Uint32 UIWinMenu::onMessage( const UIMessage * Msg ) { + switch ( Msg->getMsg() ) { case UIMessage::MsgMouseUp: case UIMessage::MsgMouseEnter: { - if ( Msg->Sender()->IsType( UI_TYPE_SELECTBUTTON ) ) { - UISelectButton * tbut = reinterpret_cast ( Msg->Sender() ); - UIPopUpMenu * tpop = GetMenuFromButton( tbut ); + if ( Msg->getSender()->isType( UI_TYPE_SELECTBUTTON ) ) { + UISelectButton * tbut = reinterpret_cast ( Msg->getSender() ); + UIPopUpMenu * tpop = getMenuFromButton( tbut ); - Vector2i pos( tbut->Pos().x, tbut->Pos().y + tbut->Size().height() ); - tpop->Pos( pos ); + Vector2i pos( tbut->position().x, tbut->position().y + tbut->size().height() ); + tpop->position( pos ); - if ( Msg->Msg() == UIMessage::MsgMouseEnter ) { + if ( Msg->getMsg() == UIMessage::MsgMouseEnter ) { if ( NULL != mCurrentMenu ) { mCurrentMenu = tpop; - tbut->Select(); - tpop->Show(); + tbut->select(); + tpop->show(); } } else { - if ( Msg->Flags() & EE_BUTTON_LMASK ) { + if ( Msg->getFlags() & EE_BUTTON_LMASK ) { mCurrentMenu = tpop; - tbut->Select(); - tpop->Show(); + tbut->select(); + tpop->show(); } } @@ -201,8 +201,8 @@ Uint32 UIWinMenu::OnMessage( const UIMessage * Msg ) { case UIMessage::MsgSelected: { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - if ( it->first != Msg->Sender() ) { - it->first->Unselect(); + if ( it->first != Msg->getSender() ) { + it->first->unselect(); } } @@ -210,10 +210,10 @@ Uint32 UIWinMenu::OnMessage( const UIMessage * Msg ) { } case UIMessage::MsgFocusLoss: { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( !IsParentOf( FocusCtrl ) && !IsPopUpMenuChild( FocusCtrl ) ) { - OnComplexControlFocusLoss(); + if ( !isParentOf( FocusCtrl ) && !isPopUpMenuChild( FocusCtrl ) ) { + onComplexControlFocusLoss(); } return 1; @@ -223,13 +223,13 @@ Uint32 UIWinMenu::OnMessage( const UIMessage * Msg ) { return 0; } -void UIWinMenu::UnselectButtons() { +void UIWinMenu::unselectButtons() { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - it->first->Unselect(); + it->first->unselect(); } } -UIPopUpMenu * UIWinMenu::GetMenuFromButton( UISelectButton * Button ) { +UIPopUpMenu * UIWinMenu::getMenuFromButton( UISelectButton * Button ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { if ( it->first == Button ) { return it->second; @@ -239,9 +239,9 @@ UIPopUpMenu * UIWinMenu::GetMenuFromButton( UISelectButton * Button ) { return NULL; } -bool UIWinMenu::IsPopUpMenuChild( UIControl * Ctrl ) { +bool UIWinMenu::isPopUpMenuChild( UIControl * Ctrl ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - if ( it->second == Ctrl || it->second->IsParentOf( Ctrl ) ) { + if ( it->second == Ctrl || it->second->isParentOf( Ctrl ) ) { return true; } } @@ -249,59 +249,59 @@ bool UIWinMenu::IsPopUpMenuChild( UIControl * Ctrl ) { return false; } -void UIWinMenu::OnMenuFocusLoss( const UIEvent * Event ) { - UIControl * FocusCtrl = UIManager::instance()->FocusControl(); +void UIWinMenu::onMenuFocusLoss( const UIEvent * Event ) { + UIControl * FocusCtrl = UIManager::instance()->focusControl(); - if ( !IsParentOf( FocusCtrl ) && !IsPopUpMenuChild( FocusCtrl ) ) { - OnComplexControlFocusLoss(); + if ( !isParentOf( FocusCtrl ) && !isPopUpMenuChild( FocusCtrl ) ) { + onComplexControlFocusLoss(); } } -void UIWinMenu::OnComplexControlFocusLoss() { - UIComplexControl::OnComplexControlFocusLoss(); +void UIWinMenu::onComplexControlFocusLoss() { + UIComplexControl::onComplexControlFocusLoss(); if ( NULL != mCurrentMenu ) { - mCurrentMenu->Hide(); + mCurrentMenu->hide(); mCurrentMenu = NULL; } - UnselectButtons(); + unselectButtons(); } -void UIWinMenu::FontColor( const ColorA& Color ) { +void UIWinMenu::fontColor( const ColorA& Color ) { mFontColor = Color; } -const ColorA& UIWinMenu::FontColor() const { +const ColorA& UIWinMenu::fontColor() const { return mFontColor; } -void UIWinMenu::FontOverColor( const ColorA& Color ) { +void UIWinMenu::fontOverColor( const ColorA& Color ) { mFontOverColor = Color; } -const ColorA& UIWinMenu::FontOverColor() const { +const ColorA& UIWinMenu::fontOverColor() const { return mFontOverColor; } -void UIWinMenu::FontSelectedColor( const ColorA& Color ) { +void UIWinMenu::fontSelectedColor( const ColorA& Color ) { mFontSelectedColor = Color; } -const ColorA& UIWinMenu::FontSelectedColor() const { +const ColorA& UIWinMenu::fontSelectedColor() const { return mFontSelectedColor; } -Graphics::Font * UIWinMenu::Font() const { +Graphics::Font * UIWinMenu::font() const { return mFont; } -void UIWinMenu::DestroyMenues() { - if ( !UIManager::instance()->IsShootingDown() ) { +void UIWinMenu::destroyMenues() { + if ( !UIManager::instance()->isShootingDown() ) { for ( WinMenuList::iterator it = mButtons.begin(); it != mButtons.end(); it++ ) { - it->second->Close(); + it->second->close(); } } } diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index b26b521f3..7c754d64e 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -220,26 +220,26 @@ void EETest::OnWinMouseUp( const UIEvent * Event ) { UIControlAnim * CtrlAnim; - if ( Event->Ctrl()->IsType( UI_TYPE_WINDOW ) ) { - CtrlAnim = reinterpret_cast( Event->Ctrl() ); + if ( Event->getControl()->isType( UI_TYPE_WINDOW ) ) { + CtrlAnim = reinterpret_cast( Event->getControl() ); } else { - CtrlAnim = reinterpret_cast( Event->Ctrl()->Parent() ); + CtrlAnim = reinterpret_cast( Event->getControl()->parent() ); } - if ( MEvent->Flags() & EE_BUTTON_WUMASK ) { - CtrlAnim->Scale( CtrlAnim->Scale() + 0.1f ); - } else if ( MEvent->Flags() & EE_BUTTON_WDMASK ) { - CtrlAnim->Scale( CtrlAnim->Scale() - 0.1f ); + if ( MEvent->getFlags() & EE_BUTTON_WUMASK ) { + CtrlAnim->scale( CtrlAnim->scale() + 0.1f ); + } else if ( MEvent->getFlags() & EE_BUTTON_WDMASK ) { + CtrlAnim->scale( CtrlAnim->scale() - 0.1f ); } } void EETest::OnShowMenu( const UIEvent * Event ) { - UIPushButton * PB = static_cast( Event->Ctrl() ); + UIPushButton * PB = static_cast( Event->getControl() ); - if ( Menu->Show() ) { - Vector2i Pos = Vector2i( (Int32)PB->GetPolygon()[0].x, (Int32)PB->GetPolygon()[0].y - 2 ); + if ( Menu->show() ) { + Vector2i Pos = Vector2i( (Int32)PB->getPolygon()[0].x, (Int32)PB->getPolygon()[0].y - 2 ); UIMenu::FixMenuPos( Pos , Menu ); - Menu->Pos( Pos ); + Menu->position( Pos ); } } @@ -254,56 +254,56 @@ void EETest::CreateUI() { eePRINTL( "Texture Atlas Loading Time: %4.3f ms.", TE.elapsed().asMilliseconds() ); - UIManager::instance()->Init(); //UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER + UIManager::instance()->init(); //UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER - //mTheme = UITheme::LoadFromPath( eeNew( UIDefaultTheme, ( "uitheme", "uitheme" ) ), MyPath + "uitheme/" ); + //mTheme = UITheme::LoadFromPath( eeNew( UIdefaultTheme, ( "uitheme", "uitheme" ) ), MyPath + "uitheme/" ); TextureAtlasLoader tgl( MyPath + "ui/uitheme" + EE_TEXTURE_ATLAS_EXTENSION ); - mTheme = UITheme::LoadFromTextureAtlas( eeNew( UIDefaultTheme, ( "uitheme", "uitheme" ) ), TextureAtlasManager::instance()->getByName( "uitheme" ) ); + mTheme = UITheme::loadFromTextureAtlas( eeNew( UIdefaultTheme, ( "uitheme", "uitheme" ) ), TextureAtlasManager::instance()->getByName( "uitheme" ) ); UIThemeManager::instance()->add( mTheme ); - UIThemeManager::instance()->DefaultEffectsEnabled( true ); - UIThemeManager::instance()->DefaultFont( TTF ); - UIThemeManager::instance()->DefaultTheme( "uitheme" ); + UIThemeManager::instance()->defaultEffectsEnabled( true ); + UIThemeManager::instance()->defaultFont( TTF ); + UIThemeManager::instance()->defaultTheme( "uitheme" ); - UIControl::CreateParams Params( UIManager::instance()->MainControl(), Vector2i(0,0), Sizei( 530, 380 ), UI_FILL_BACKGROUND | UI_CLIP_ENABLE | UI_BORDER ); + UIControl::CreateParams Params( UIManager::instance()->mainControl(), Vector2i(0,0), Sizei( 530, 380 ), UI_FILL_BACKGROUND | UI_CLIP_ENABLE | UI_BORDER ); - Params.Border.Width( 2 ); - Params.Border.Color( 0x979797CC ); - Params.Background.Colors( ColorA( 0xEDEDED66 ), ColorA( 0xEDEDEDCC ), ColorA( 0xEDEDEDCC ), ColorA( 0xEDEDED66 ) ); + Params.Border.width( 2 ); + Params.Border.color( 0x979797CC ); + Params.Background.colors( ColorA( 0xEDEDED66 ), ColorA( 0xEDEDEDCC ), ColorA( 0xEDEDEDCC ), ColorA( 0xEDEDED66 ) ); - UIWindow * tWin = mTheme->CreateWindow( NULL, Sizei( 530, 405 ), Vector2i( 320, 240 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DRAGABLE_CONTAINER , Sizei( 530, 405 ), 200 ); - C = tWin->Container(); + UIWindow * tWin = mTheme->createWindow( NULL, Sizei( 530, 405 ), Vector2i( 320, 240 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DRAGABLE_CONTAINER , Sizei( 530, 405 ), 200 ); + C = tWin->getContainer(); - tWin->Title( "Controls Test" ); + tWin->title( "Controls Test" ); - tWin->AddEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::OnWinMouseUp ) ); - C->AddEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::OnWinMouseUp ) ); + tWin->addEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::OnWinMouseUp ) ); + C->addEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::OnWinMouseUp ) ); Params.Flags &= ~UI_CLIP_ENABLE; - Params.Background.Corners(0); - Params.Background.Colors( ColorA( 0x00FF0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00FF0077 ) ); + Params.Background.corners(0); + Params.Background.colors( ColorA( 0x00FF0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00FF0077 ) ); Params.Parent( C ); Params.Size = Sizei( 50, 50 ); UITest * Child = eeNew( UITest, ( Params ) ); - Child->Pos( 240, 130 ); - Child->Visible( true ); - Child->Enabled( true ); - Child->StartRotation( 0.f, 360.f, Milliseconds( 5000.f ) ); - Child->RotationInterpolation()->loop( true ); + Child->position( 240, 130 ); + Child->visible( true ); + Child->enabled( true ); + Child->startRotation( 0.f, 360.f, Milliseconds( 5000.f ) ); + Child->rotationInterpolation()->loop( true ); - Params.Background.Colors( ColorA( 0xFFFF0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xFFFF0077 ) ); + Params.Background.colors( ColorA( 0xFFFF0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xFFFF0077 ) ); Params.Parent( Child ); Params.Size = Sizei( 25, 25 ); UITest * Child2 = eeNew( UITest, ( Params ) ); - Child2->Pos( 15, 15 ); - Child2->Visible( true ); - Child2->Enabled( true ); - Child2->StartRotation( 0.f, 360.f, Milliseconds( 5000.f ) ); - Child2->RotationInterpolation()->loop( true ); + Child2->position( 15, 15 ); + Child2->visible( true ); + Child2->enabled( true ); + Child2->startRotation( 0.f, 360.f, Milliseconds( 5000.f ) ); + Child2->rotationInterpolation()->loop( true ); - mTheme->CreateSprite( eeNew( Sprite, ( "gn" ) ), C, Sizei(), Vector2i( 160, 100 ) ); + mTheme->createSprite( eeNew( Sprite, ( "gn" ) ), C, Sizei(), Vector2i( 160, 100 ) ); UITextBox::CreateParams TextParams; TextParams.Parent( C ); @@ -311,9 +311,9 @@ void EETest::CreateUI() { TextParams.Size = Sizei( 320, 240 ); TextParams.Flags = UI_VALIGN_TOP | UI_HALIGN_RIGHT; UITextBox * Text = eeNew( UITextBox, ( TextParams ) ); - Text->Visible( true ); - Text->Enabled( false ); - Text->Text( "Turn around\nJust Turn Around\nAround!" ); + Text->visible( true ); + Text->enabled( false ); + Text->text( "Turn around\nJust Turn Around\nAround!" ); UITextInput::CreateParams InputParams; InputParams.Parent( C ); @@ -321,62 +321,62 @@ void EETest::CreateUI() { InputParams.Size = Sizei( 200, 22 ); InputParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; UITextInput * Input = eeNew( UITextInput, ( InputParams ) ); - Input->Visible( true ); - Input->Enabled( true ); + Input->visible( true ); + Input->enabled( true ); UIPushButton::CreateParams ButtonParams; ButtonParams.Parent( C ); ButtonParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_AUTO_SIZE; ButtonParams.PosSet( 225, 216 ); ButtonParams.Size = Sizei( 90, 0 ); - ButtonParams.SetIcon( mTheme->GetIconByName( "ok" ) ); + ButtonParams.SetIcon( mTheme->getIconByName( "ok" ) ); UIPushButton * Button = eeNew( UIPushButton, ( ButtonParams ) ); - Button->Visible( true ); - Button->Enabled( true ); - Button->Text( "Click Me" ); - Button->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::ButtonClick ) ); - Button->TooltipText( "Click and see what happens..." ); + Button->visible( true ); + Button->enabled( true ); + Button->text( "Click Me" ); + Button->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::ButtonClick ) ); + Button->tooltipText( "Click and see what happens..." ); TextParams.PosSet( 130, 20 ); TextParams.Size = Sizei( 80, 22 ); TextParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT; UICheckBox * Checkbox = eeNew( UICheckBox, ( TextParams ) ); - Checkbox->Visible( true ); - Checkbox->Text( "Check Me" ); - Checkbox->Enabled( true ); + Checkbox->visible( true ); + Checkbox->text( "Check Me" ); + Checkbox->enabled( true ); TextParams.PosSet( 130, 40 ); UIRadioButton * RadioButton = eeNew( UIRadioButton, ( TextParams ) ); - RadioButton->Visible( true ); - RadioButton->Text( "Check Me" ); - RadioButton->Enabled( true ); + RadioButton->visible( true ); + RadioButton->text( "Check Me" ); + RadioButton->enabled( true ); TextParams.PosSet( 130, 60 ); RadioButton = eeNew( UIRadioButton, ( TextParams ) ); - RadioButton->Visible( true ); - RadioButton->Text( "Check Me 2" ); - RadioButton->Enabled( true ); + RadioButton->visible( true ); + RadioButton->text( "Check Me 2" ); + RadioButton->enabled( true ); UISlider::CreateParams SliderParams; SliderParams.Parent( C ); SliderParams.PosSet( 220, 80 ); SliderParams.Size = Sizei( 80, 24 ); mSlider = eeNew( UISlider, ( SliderParams ) ); - mSlider->Visible( true ); - mSlider->Enabled( true ); - mSlider->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &EETest::OnSliderValueChange ) ); + mSlider->visible( true ); + mSlider->enabled( true ); + mSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &EETest::OnSliderValueChange ) ); SliderParams.PosSet( 40, 110 ); SliderParams.Size = Sizei( 24, 80 ); SliderParams.VerticalSlider = true; mSlider = eeNew( UISlider, ( SliderParams ) ); - mSlider->Visible( true ); - mSlider->Enabled( true ); + mSlider->visible( true ); + mSlider->enabled( true ); SliderParams.PosSet( 60, 110 ); mSlider = eeNew( UISlider, ( SliderParams ) ); - mSlider->Visible( true ); - mSlider->Enabled( true ); + mSlider->visible( true ); + mSlider->enabled( true ); UISpinBox::CreateParams SpinBoxParams; SpinBoxParams.Parent( C ); @@ -385,8 +385,8 @@ void EETest::CreateUI() { SpinBoxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE; SpinBoxParams.AllowDotsInNumbers = true; UISpinBox * mSpinBox = eeNew( UISpinBox, ( SpinBoxParams ) ); - mSpinBox->Visible( true ); - mSpinBox->Enabled( true ); + mSpinBox->visible( true ); + mSpinBox->enabled( true ); UIScrollBar::CreateParams ScrollBarP; ScrollBarP.Parent( C ); @@ -395,15 +395,15 @@ void EETest::CreateUI() { ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; mScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); - mScrollBar->Visible( true ); - mScrollBar->Enabled( true ); - mScrollBar->AddEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &EETest::OnValueChange ) ); + mScrollBar->visible( true ); + mScrollBar->enabled( true ); + mScrollBar->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &EETest::OnValueChange ) ); - mProgressBar = mTheme->CreateProgressBar( C, Sizei( 200, 20 ), Vector2i( 20, 190 ) ); + mProgressBar = mTheme->createProgressBar( C, Sizei( 200, 20 ), Vector2i( 20, 190 ) ); TextParams.PosSet( 20, 5 ); mTextBoxValue = eeNew( UITextBox, ( TextParams ) ); - mTextBoxValue->Visible( true ); + mTextBoxValue->visible( true ); OnValueChange( NULL ); UIListBox::CreateParams LBParams; @@ -412,8 +412,8 @@ void EETest::CreateUI() { LBParams.Size = Sizei( 200, 240-16 ); LBParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TOUCH_DRAG_ENABLED; // | UI_MULTI_SELECT mListBox = eeNew( UIListBox, ( LBParams ) ); - mListBox->Visible( true ); - mListBox->Enabled( true ); + mListBox->visible( true ); + mListBox->enabled( true ); Int32 wsize = 100; @@ -423,7 +423,7 @@ void EETest::CreateUI() { for ( Int32 i = 1; i <= wsize; i++ ) str[i-1] = "Test ListBox " + String::toStr(i) + " testing it right now!"; - mListBox->AddListBoxItems( str ); + mListBox->addListBoxItems( str ); } UIDropDownList::CreateParams DDLParams; @@ -432,8 +432,8 @@ void EETest::CreateUI() { DDLParams.Size = Sizei( 100, 21 ); DDLParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_TOUCH_DRAG_ENABLED; UIDropDownList * mDropDownList = eeNew( UIDropDownList, ( DDLParams ) ); - mDropDownList->Visible( true ); - mDropDownList->Enabled( true ); + mDropDownList->visible( true ); + mDropDownList->enabled( true ); std::vector combostrs; combostrs.push_back( "Plane" ); @@ -445,8 +445,8 @@ void EETest::CreateUI() { combostrs.push_back( "Bike" ); combostrs.push_back( "Motorbike" ); - mDropDownList->ListBox()->AddListBoxItems( combostrs ); - mDropDownList->ListBox()->SetSelected( 0 ); + mDropDownList->getListBox()->addListBoxItems( combostrs ); + mDropDownList->getListBox()->setSelected( 0 ); UIComboBox::CreateParams ComboParams; ComboParams.Parent( C ); @@ -454,16 +454,16 @@ void EETest::CreateUI() { ComboParams.Size = Sizei( 100, 1 ); ComboParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_AUTO_SIZE | UI_TOUCH_DRAG_ENABLED | UI_TEXT_SELECTION_ENABLED; UIComboBox * mComboBox = eeNew( UIComboBox, ( ComboParams ) ); - mComboBox->Visible( true ); - mComboBox->Enabled( true ); + mComboBox->visible( true ); + mComboBox->enabled( true ); - mComboBox->ListBox()->AddListBoxItems( combostrs ); - mComboBox->ListBox()->SetSelected( 0 ); + mComboBox->getListBox()->addListBoxItems( combostrs ); + mComboBox->getListBox()->setSelected( 0 ); - Menu = mTheme->CreatePopUpMenu(); - Menu->Add( "New", mTheme->GetIconByName( "document-new" ) ); + Menu = mTheme->createPopUpMenu(); + Menu->Add( "New", mTheme->getIconByName( "document-new" ) ); - Menu->Add( "Open...", mTheme->GetIconByName( "document-open" ) ); + Menu->Add( "Open...", mTheme->getIconByName( "document-open" ) ); Menu->AddSeparator(); Menu->Add( "Map Editor" ); Menu->Add( "Texture Atlas Editor" ); @@ -481,13 +481,13 @@ void EETest::CreateUI() { Menu->Add( "Show Window 2" ); Menu->AddCheckBox( "Multi Viewport" ); - UIPopUpMenu * Menu3 = mTheme->CreatePopUpMenu(); + UIPopUpMenu * Menu3 = mTheme->createPopUpMenu(); Menu3->Add( "Hello World 1" ); Menu3->Add( "Hello World 2" ); Menu3->Add( "Hello World 3" ); Menu3->Add( "Hello World 4" ); - UIPopUpMenu * Menu2 = mTheme->CreatePopUpMenu(); + UIPopUpMenu * Menu2 = mTheme->createPopUpMenu(); Menu2->Add( "Test 1" ); Menu2->Add( "Test 2" ); Menu2->Add( "Test 3" ); @@ -500,9 +500,9 @@ void EETest::CreateUI() { Menu->AddSeparator(); Menu->Add( "Quit" ); - Menu->AddEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &EETest::ItemClick ) ); - Menu->GetItem( "Quit" )->AddEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::QuitClick ) ); - UIManager::instance()->MainControl()->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::MainClick ) ); + Menu->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &EETest::ItemClick ) ); + Menu->GetItem( "Quit" )->addEventListener( UIEvent::EventMouseUp, cb::Make1( this, &EETest::QuitClick ) ); + UIManager::instance()->mainControl()->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::MainClick ) ); UITextEdit::CreateParams TEParams; TEParams.Parent( C ); @@ -510,9 +510,9 @@ void EETest::CreateUI() { TEParams.Size = Sizei( 315, 130 ); TEParams.Flags = UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_TEXT_SELECTION_ENABLED; UITextEdit * TextEdit = eeNew( UITextEdit, ( TEParams ) ); - TextEdit->Visible( true ); - TextEdit->Enabled( true ); - TextEdit->Text( mBuda ); + TextEdit->visible( true ); + TextEdit->enabled( true ); + TextEdit->text( mBuda ); UIGenericGrid::CreateParams GridParams; GridParams.Parent( C ); @@ -522,11 +522,11 @@ void EETest::CreateUI() { GridParams.RowHeight = 24; GridParams.CollumnsCount = 3; UIGenericGrid * mGenGrid = eeNew( UIGenericGrid, ( GridParams ) ); - mGenGrid->Visible( true ); - mGenGrid->Enabled( true ); + mGenGrid->visible( true ); + mGenGrid->enabled( true ); UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->Container() ); + CellParams.Parent( mGenGrid->getContainer() ); UITextBox::CreateParams TxtBoxParams; UITextInput::CreateParams TxtInputParams; @@ -534,7 +534,7 @@ void EETest::CreateUI() { UIGfx::CreateParams TxtGfxParams; TxtGfxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER; - TxtGfxParams.SubTexture = mTheme->GetIconByName( "ok" ); + TxtGfxParams.SubTexture = mTheme->getIconByName( "ok" ); for ( Uint32 i = 0; i < 100; i++ ) { UIGridCell * Cell = eeNew( UIGridCell, ( CellParams ) ); @@ -542,18 +542,18 @@ void EETest::CreateUI() { UITextInput * TxtInput = eeNew( UITextInput, ( TxtInputParams ) ); UIGfx * TxtGfx = eeNew( UIGfx, ( TxtGfxParams ) ); - TxtBox->Text( "Test " + String::toStr( i+1 ) ); + TxtBox->text( "Test " + String::toStr( i+1 ) ); - Cell->Cell( 0, TxtBox ); - Cell->Cell( 1, TxtGfx ); - Cell->Cell( 2, TxtInput ); + Cell->cell( 0, TxtBox ); + Cell->cell( 1, TxtGfx ); + Cell->cell( 2, TxtInput ); - mGenGrid->Add( Cell ); + mGenGrid->add( Cell ); } - mGenGrid->CollumnWidth( 0, 50 ); - mGenGrid->CollumnWidth( 1, 24 ); - mGenGrid->CollumnWidth( 2, 100 ); + mGenGrid->collumnWidth( 0, 50 ); + mGenGrid->collumnWidth( 1, 24 ); + mGenGrid->collumnWidth( 2, 100 ); #ifdef EE_PLATFORM_TOUCH TextureAtlas * SG = GlobalTextureAtlas::instance(); @@ -565,13 +565,13 @@ void EETest::CreateUI() { UISkinSimple nSkin( "button-te" ); - mShowMenu = mTheme->CreatePushButton( NULL, butTex->Size(), Vector2i( mWindow->GetWidth() - butTex->Width() - 20, mWindow->GetHeight() - butTex->Height() - 10 ), UI_CONTROL_ALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM ); + mShowMenu = mTheme->CreatePushButton( NULL, butTex->size(), Vector2i( mWindow->GetWidth() - butTex->Width() - 20, mWindow->GetHeight() - butTex->Height() - 10 ), UI_CONTROL_ALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM ); mShowMenu->SetSkin( nSkin ); mShowMenu->Text( "Show Menu" ); mShowMenu->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::OnShowMenu ) ); #endif - C = reinterpret_cast ( C->Parent() ); + C = reinterpret_cast ( C->parent() ); eePRINTL( "CreateUI time: %4.3f ms.", TE.elapsed().asMilliseconds() ); } @@ -580,10 +580,10 @@ void EETest::CreateMapEditor() { if ( NULL != mMapEditor ) return; - UIWindow * tWin = mTheme->CreateWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); + UIWindow * tWin = mTheme->createWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); mMapEditor = eeNew( MapEditor, ( tWin, cb::Make0( this, &EETest::OnMapEditorClose ) ) ); - tWin->Center(); - tWin->Show(); + tWin->center(); + tWin->show(); } void EETest::OnMapEditorClose() { @@ -591,10 +591,10 @@ void EETest::OnMapEditorClose() { } void EETest::CreateETGEditor() { - UIWindow * tWin = mTheme->CreateWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); + UIWindow * tWin = mTheme->createWindow( NULL, Sizei( 1024, 768 ), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON | UI_WIN_DRAGABLE_CONTAINER, Sizei( 1024, 768 ) ); mETGEditor = eeNew ( Tools::TextureAtlasEditor, ( tWin, cb::Make0( this, &EETest::OnETGEditorClose ) ) ); - tWin->Center(); - tWin->Show(); + tWin->center(); + tWin->show(); } void EETest::OnETGEditorClose() { @@ -602,55 +602,55 @@ void EETest::OnETGEditorClose() { } void EETest::CreateCommonDialog() { - UICommonDialog * CDialog = mTheme->CreateCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON ); - CDialog->AddFilePattern( "*.hpp;*.cpp", true ); - CDialog->Center(); - CDialog->Show(); + UICommonDialog * CDialog = mTheme->createCommonDialog( NULL, Sizei(), Vector2i(), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON ); + CDialog->addFilePattern( "*.hpp;*.cpp", true ); + CDialog->center(); + CDialog->show(); } void EETest::CreateWinMenu() { - UIWinMenu * WinMenu = mTheme->CreateWinMenu( mUIWindow->Container() ); + UIWinMenu * WinMenu = mTheme->createWinMenu( mUIWindow->getContainer() ); - UIPopUpMenu * PopMenu = mTheme->CreatePopUpMenu(); + UIPopUpMenu * PopMenu = mTheme->createPopUpMenu(); PopMenu->Add( "File" ); PopMenu->Add( "Open" ); PopMenu->Add( "Close" ); PopMenu->Add( "Quit" ); - UIPopUpMenu * PopMenu2 = mTheme->CreatePopUpMenu(); + UIPopUpMenu * PopMenu2 = mTheme->createPopUpMenu(); PopMenu2->Add( "Bla" ); PopMenu2->Add( "Bla 2" ); PopMenu2->Add( "Bla 3" ); PopMenu2->Add( "Bla 4" ); - WinMenu->AddMenuButton( "File", PopMenu ); - WinMenu->AddMenuButton( "Edit", PopMenu2 ); + WinMenu->addMenuButton( "File", PopMenu ); + WinMenu->addMenuButton( "Edit", PopMenu2 ); } void EETest::CreateDecoratedWindow() { - mUIWindow = mTheme->CreateWindow( NULL, Sizei( 530, 350 ), Vector2i( 200, 50 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei( 100, 200 ) ); + mUIWindow = mTheme->createWindow( NULL, Sizei( 530, 350 ), Vector2i( 200, 50 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED, UI_WIN_DEFAULT_FLAGS | UI_WIN_MAXIMIZE_BUTTON, Sizei( 100, 200 ) ); - mUIWindow->AddEventListener( UIEvent::EventOnWindowCloseClick, cb::Make1( this, &EETest::CloseClick ) ); - mUIWindow->Title( "Test Window" ); - mUIWindow->ToBack(); + mUIWindow->addEventListener( UIEvent::EventOnWindowCloseClick, cb::Make1( this, &EETest::CloseClick ) ); + mUIWindow->title( "Test Window" ); + mUIWindow->toBack(); - UIPushButton * Button = mTheme->CreatePushButton( mUIWindow->Container(), Sizei( 510, 22 ), Vector2i( 10, 28 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_ANCHOR_RIGHT ); - Button->Text( "Click Me" ); - Button->AddEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::ButtonClick ) ); + UIPushButton * Button = mTheme->createPushButton( mUIWindow->getContainer(), Sizei( 510, 22 ), Vector2i( 10, 28 ), UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_ANCHOR_RIGHT ); + Button->text( "Click Me" ); + Button->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::ButtonClick ) ); - mUIWindow->AddShortcut( KEY_C, KEYMOD_ALT, Button ); + mUIWindow->addShortcut( KEY_C, KEYMOD_ALT, Button ); - UITabWidget * TabWidget = mTheme->CreateTabWidget( mUIWindow->Container(), Sizei( 510, 250 ), Vector2i( 10, 55 ), UI_HALIGN_CENTER | UI_VALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM | UI_ANCHOR_LEFT | UI_ANCHOR_TOP ); + UITabWidget * TabWidget = mTheme->createTabWidget( mUIWindow->getContainer(), Sizei( 510, 250 ), Vector2i( 10, 55 ), UI_HALIGN_CENTER | UI_VALIGN_CENTER | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM | UI_ANCHOR_LEFT | UI_ANCHOR_TOP ); - UITextEdit * TEdit = mTheme->CreateTextEdit( TabWidget, Sizei(), Vector2i() ); - TEdit->Text( mBuda ); - TabWidget->Add( "TextEdit", TEdit ); + UITextEdit * TEdit = mTheme->createTextEdit( TabWidget, Sizei(), Vector2i() ); + TEdit->text( mBuda ); + TabWidget->add( "TextEdit", TEdit ); - UITextInput * Txt = mTheme->CreateTextInput( TabWidget, Sizei(), Vector2i(), UI_AUTO_PADDING | UI_AUTO_SHRINK_TEXT | UI_TEXT_SELECTION_ENABLED ); - Txt->Text( mBuda ); - TabWidget->Add( "TextInput", Txt ); + UITextInput * Txt = mTheme->createTextInput( TabWidget, Sizei(), Vector2i(), UI_AUTO_PADDING | UI_AUTO_SHRINK_TEXT | UI_TEXT_SELECTION_ENABLED ); + Txt->text( mBuda ); + TabWidget->add( "TextInput", Txt ); - TabWidget->Add( "TextBox", mTheme->CreateTextBox( mBuda, TabWidget, Sizei(), Vector2i(), UI_AUTO_PADDING | UI_AUTO_SHRINK_TEXT | UI_TEXT_SELECTION_ENABLED ) ); + TabWidget->add( "TextBox", mTheme->createTextBox( mBuda, TabWidget, Sizei(), Vector2i(), UI_AUTO_PADDING | UI_AUTO_SHRINK_TEXT | UI_TEXT_SELECTION_ENABLED ) ); CreateWinMenu(); } @@ -660,10 +660,10 @@ void EETest::CloseClick( const UIEvent * Event ) { } void EETest::ItemClick( const UIEvent * Event ) { - if ( !Event->Ctrl()->IsType( UI_TYPE_MENUITEM ) ) + if ( !Event->getControl()->isType( UI_TYPE_MENUITEM ) ) return; - const String& txt = reinterpret_cast ( Event->Ctrl() )->Text(); + const String& txt = reinterpret_cast ( Event->getControl() )->text(); if ( "Show Screen 1" == txt ) { SetScreen( 0 ); @@ -687,27 +687,27 @@ void EETest::ItemClick( const UIEvent * Event ) { mWindow->stopTextInput(); } } else if ( "Show Window" == txt ) { - UIMenuCheckBox * Chk = reinterpret_cast ( Event->Ctrl() ); + UIMenuCheckBox * Chk = reinterpret_cast ( Event->getControl() ); - C->Visible( true ); - C->Enabled( true ); + C->visible( true ); + C->enabled( true ); - if ( Chk->Active() ) { - if ( C->Scale() == 1.f ) C->Scale( 0.f ); - C->StartScaleAnim( C->Scale(), Vector2f::One, Milliseconds( 500.f ), Ease::SineOut ); - C->StartAlphaAnim( C->Alpha(), 255.f, Milliseconds( 500.f ) ); - C->StartRotation( 0, 360, Milliseconds( 500.f ), Ease::SineOut ); + if ( Chk->active() ) { + if ( C->scale() == 1.f ) C->scale( 0.f ); + C->startScaleAnim( C->scale(), Vector2f::One, Milliseconds( 500.f ), Ease::SineOut ); + C->startAlphaAnim( C->alpha(), 255.f, Milliseconds( 500.f ) ); + C->startRotation( 0, 360, Milliseconds( 500.f ), Ease::SineOut ); } else { - C->StartScaleAnim( C->Scale(), Vector2f::Zero, Milliseconds( 500.f ), Ease::SineIn ); - C->StartAlphaAnim( C->Alpha(), 0.f, Milliseconds( 500.f ) ); - C->StartRotation( 0, 360, Milliseconds( 500.f ), Ease::SineIn ); + C->startScaleAnim( C->scale(), Vector2f::Zero, Milliseconds( 500.f ), Ease::SineIn ); + C->startAlphaAnim( C->alpha(), 0.f, Milliseconds( 500.f ) ); + C->startRotation( 0, 360, Milliseconds( 500.f ), Ease::SineIn ); } } else if ( "Show Window 2" == txt ) { if ( NULL == mUIWindow ) { CreateDecoratedWindow(); } - mUIWindow->Show(); + mUIWindow->show(); } else if ( "Map Editor" == txt ) { CreateMapEditor(); } else if ( "Texture Atlas Editor" == txt ) { @@ -724,37 +724,37 @@ void EETest::ItemClick( const UIEvent * Event ) { } void EETest::OnValueChange( const UIEvent * Event ) { - mTextBoxValue->Text( "Scroll Value:\n" + String::toStr( mScrollBar->Value() ) ); + mTextBoxValue->text( "Scroll Value:\n" + String::toStr( mScrollBar->value() ) ); - mProgressBar->Progress( mScrollBar->Value() * 100.f ); + mProgressBar->progress( mScrollBar->value() * 100.f ); } void EETest::OnSliderValueChange( const UIEvent * Event ) { - UISlider * slider = static_cast( Event->Ctrl() ); + UISlider * slider = static_cast( Event->getControl() ); - C->Angle( slider->Value() * 90.f ); + C->angle( slider->value() * 90.f ); } void EETest::QuitClick( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( MouseEvent->Flags() & EE_BUTTON_LMASK ) { + if ( MouseEvent->getFlags() & EE_BUTTON_LMASK ) { mWindow->close(); } } void EETest::ShowMenu() { - if ( Menu->Show() ) { + if ( Menu->show() ) { Vector2i Pos = mWindow->getInput()->getMousePos(); UIMenu::FixMenuPos( Pos , Menu ); - Menu->Pos( Pos ); + Menu->position( Pos ); } } void EETest::MainClick( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( MouseEvent->Flags() & EE_BUTTON_RMASK ) { + if ( MouseEvent->getFlags() & EE_BUTTON_RMASK ) { ShowMenu(); } } @@ -762,24 +762,24 @@ void EETest::MainClick( const UIEvent * Event ) { void EETest::ButtonClick( const UIEvent * Event ) { const UIEventMouse * MouseEvent = reinterpret_cast ( Event ); - if ( MouseEvent->Flags() & EE_BUTTONS_LRM ) { + if ( MouseEvent->getFlags() & EE_BUTTONS_LRM ) { UIGfx::CreateParams GfxParams; - GfxParams.Parent( UIManager::instance()->MainControl() ); - GfxParams.SubTexture = mTheme->GetIconByName( "ok" ); + GfxParams.Parent( UIManager::instance()->mainControl() ); + GfxParams.SubTexture = mTheme->getIconByName( "ok" ); UIGfx * Gfx = eeNew( UIGfx, ( GfxParams ) ); - Gfx->Visible( true ); - Gfx->Enabled( false ); + Gfx->visible( true ); + Gfx->enabled( false ); - Gfx->StartRotation( 0, 2500, Milliseconds( 2500 ) ); - Gfx->StartMovement( Vector2i( Math::randi( 0, mWindow->getWidth() ), -64 ), Vector2i( Math::randi( 0, mWindow->getWidth() ), mWindow->getHeight() + 64 ), Milliseconds( 2500 ) ); - Gfx->CloseFadeOut( Milliseconds( 3500 ) ); + Gfx->startRotation( 0, 2500, Milliseconds( 2500 ) ); + Gfx->startMovement( Vector2i( Math::randi( 0, mWindow->getWidth() ), -64 ), Vector2i( Math::randi( 0, mWindow->getWidth() ), mWindow->getHeight() + 64 ), Milliseconds( 2500 ) ); + Gfx->closeFadeOut( Milliseconds( 3500 ) ); - mListBox->AddListBoxItem( "Test ListBox " + String::toStr( mListBox->Count() + 1 ) + " testing it right now!" ); + mListBox->addListBoxItem( "Test ListBox " + String::toStr( mListBox->count() + 1 ) + " testing it right now!" ); } } void EETest::SetScreen( Uint32 num ) { - if ( NULL != mTerrainBut ) mTerrainBut->Visible( 1 == num ); + if ( NULL != mTerrainBut ) mTerrainBut->visible( 1 == num ); if ( 0 == num || 5 == num ) mWindow->backColor( RGB( 240, 240, 240 ) ); @@ -1278,8 +1278,8 @@ void EETest::Render() { FF2->draw( 6, 180, FONT_DRAW_SHADOW ); } - UIManager::instance()->Draw(); - UIManager::instance()->Update(); + UIManager::instance()->draw(); + UIManager::instance()->update(); Con.draw(); diff --git a/src/test/eetest.hpp b/src/test/eetest.hpp index e51b2297d..9c6c01cd0 100644 --- a/src/test/eetest.hpp +++ b/src/test/eetest.hpp @@ -7,45 +7,45 @@ namespace Demo_Test { class UITest : public UIControlAnim { public: - UITest( UIControlAnim::CreateParams& Params ) : UIControlAnim( Params ) { mOldColor = mBackground->Colors(); } + UITest( UIControlAnim::CreateParams& Params ) : UIControlAnim( Params ) { mOldColor = mBackground->colors(); } - virtual Uint32 OnMouseEnter( const Vector2i& Pos, const Uint32 Flags ) { + virtual Uint32 onMouseEnter( const Vector2i& Pos, const Uint32 Flags ) { if ( 4 == mOldColor.size() ) { - mBackground->Colors( ColorA( mOldColor[0].r(), mOldColor[0].g(), mOldColor[0].b(), 200 ), + mBackground->colors( ColorA( mOldColor[0].r(), mOldColor[0].g(), mOldColor[0].b(), 200 ), ColorA( mOldColor[1].r(), mOldColor[1].g(), mOldColor[1].b(), 200 ), ColorA( mOldColor[2].r(), mOldColor[2].g(), mOldColor[2].b(), 200 ), ColorA( mOldColor[3].r(), mOldColor[3].g(), mOldColor[3].b(), 200 ) ); } else { - mBackground->Color( ColorA( mOldColor[0].r(), mOldColor[0].g(), mOldColor[0].b(), 200 ) ); + mBackground->color( ColorA( mOldColor[0].r(), mOldColor[0].g(), mOldColor[0].b(), 200 ) ); } return 1; } - virtual Uint32 OnMouseExit( const Vector2i& Pos, const Uint32 Flags ) { + virtual Uint32 onMouseExit( const Vector2i& Pos, const Uint32 Flags ) { if ( 4 == mOldColor.size() ) { - mBackground->Colors( mOldColor[0], mOldColor[1], mOldColor[2], mOldColor[3] ); + mBackground->colors( mOldColor[0], mOldColor[1], mOldColor[2], mOldColor[3] ); } else { - mBackground->Color( mOldColor[0] ); + mBackground->color( mOldColor[0] ); } return 1; } - virtual Uint32 OnMouseUp( const Vector2i& Pos, const Uint32 Flags ) { - UIDragable::OnMouseUp( Pos, Flags ); + virtual Uint32 onMouseUp( const Vector2i& Pos, const Uint32 Flags ) { + UIDragable::onMouseUp( Pos, Flags ); if ( Engine::instance()->getCurrentWindow()->getInput()->mouseWheelUp() ) - Scale( Scale() + 0.1f ); + scale( scale() + 0.1f ); else if ( Engine::instance()->getCurrentWindow()->getInput()->mouseWheelDown() ) - Scale( Scale() - 0.1f ); + scale( scale() - 0.1f ); return 1; } - virtual Uint32 OnFocus() { - ToFront(); + virtual Uint32 onFocus() { + toFront(); return 1; }