Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

More fixes.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martí­n Lucas Golini
2017-02-27 03:00:37 -03:00
parent c2a12027e0
commit 7638f09aeb
22 changed files with 292 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/eepp/ui/uimenu.hpp
View File

@@ -57,6 +57,8 @@ class EE_API UIMenu : public UIComplexControl {
UIMenu( UIMenu::CreateParams& Params );
UIMenu();
virtual ~UIMenu();
virtual Uint32 getType() const;
@@ -98,6 +100,31 @@ class EE_API UIMenu : public UIComplexControl {
virtual bool hide();
const Recti& getPadding() const;
Font * getFont() const;
void setFont(Font * font);
ColorA getFontColor() const;
void setFontColor(const ColorA & fontColor);
ColorA getFontShadowColor() const;
void setFontShadowColor(const ColorA & fontShadowColor);
ColorA getFontOverColor() const;
void setFontOverColor(const ColorA & fontOverColor);
ColorA getFontSelectedColor() const;
void setFontSelectedColor(const ColorA & fontSelectedColor);
Uint32 getMinRightMargin() const;
void setMinRightMargin(const Uint32 & minRightMargin);
protected:
friend class UIMenuItem;
friend class UIMenuCheckBox;

7
include/eepp/ui/uimenusubmenu.hpp
View File

@@ -26,6 +26,8 @@ class EE_API UIMenuSubMenu : public UIMenuItem {
UIMenuSubMenu( UIMenuSubMenu::CreateParams& Params );
UIMenuSubMenu();
virtual ~UIMenuSubMenu();
virtual Uint32 getType() const;
@@ -43,6 +45,11 @@ class EE_API UIMenuSubMenu : public UIMenuItem {
void showSubMenu();
virtual bool inheritsFrom( const Uint32 getType );
Float getMouseOverTimeShowMenu() const;
void setMouseOverTimeShowMenu(const Float & maxTime);
protected:
UIMenu * mSubMenu;
UISkin * mSkinArrow;

2
include/eepp/ui/uipopupmenu.hpp
View File

@@ -9,6 +9,8 @@ class EE_API UIPopUpMenu : public UIMenu {
public:
UIPopUpMenu( UIPopUpMenu::CreateParams Params );
UIPopUpMenu();
virtual ~UIPopUpMenu();
virtual Uint32 getType() const;

2
include/eepp/ui/uiselectbutton.hpp
View File

@@ -9,6 +9,8 @@ class EE_API UISelectButton : public UIPushButton {
public:
UISelectButton( const UIPushButton::CreateParams& Params );
UISelectButton();
virtual ~UISelectButton();
virtual Uint32 getType() const;

2
include/eepp/ui/uiseparator.hpp
View File

@@ -8,6 +8,8 @@ namespace EE { namespace UI {
class EE_API UISeparator : public UIControlAnim {
public:
UISeparator( UIControlAnim::CreateParams Params );
UISeparator();
virtual ~UISeparator();

10
include/eepp/ui/uisprite.hpp
View File

@@ -17,7 +17,7 @@ class EE_API UISprite : public UIComplexControl {
UIComplexControl::CreateParams(),
Sprite( NULL ),
SpriteRender( RN_NORMAL ),
DealloSprite( true )
DeallocSprite( true )
{
}
@@ -25,11 +25,13 @@ class EE_API UISprite : public UIComplexControl {
Graphics::Sprite * Sprite;
EE_RENDER_MODE SpriteRender;
bool DealloSprite;
bool DeallocSprite;
};
UISprite( const UISprite::CreateParams& Params );
UISprite();
virtual ~UISprite();
virtual Uint32 getType() const;
@@ -55,6 +57,10 @@ class EE_API UISprite : public UIComplexControl {
void setRenderMode( const EE_RENDER_MODE& render );
const Vector2i& getAlignOffset() const;
void setDeallocSprite( const bool& dealloc );
bool getDeallocSprite();
protected:
Graphics::Sprite * mSprite;
EE_RENDER_MODE mRender;

2
include/eepp/ui/uitextbox.hpp
View File

@@ -101,7 +101,7 @@ class EE_API UITextBox : public UIComplexControl {
Int32 mSelCurInit;
Int32 mSelCurEnd;
virtual void drawSelection();
virtual void drawSelection(TextCache * textCache);
virtual void onSizeChange();

2
include/eepp/ui/uitextinputpassword.hpp
View File

@@ -10,6 +10,8 @@ class UITextInputPassword : public UITextInput
public:
UITextInputPassword( const UITextInput::CreateParams& Params );
UITextInputPassword();
virtual void draw();
virtual const String& getText();

12
include/eepp/ui/uitheme.hpp
View File

@@ -155,6 +155,14 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
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 );
ColorA getMenuFontColor() const;
void setMenuFontColor(const ColorA & menuFontColor);
ColorA getMenuFontColorOver() const;
void setMenuFontColorOver(const ColorA & menuFontColorOver);
protected:
std::string mName;
Uint32 mNameHash;
@@ -166,7 +174,9 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
ColorA mFontOverColor;
ColorA mFontSelectedColor;
ColorA mFontSelectionBackColor;
bool mUsedefaultThemeValues;
ColorA mMenuFontColor;
ColorA mMenuFontColorOver;
bool mUseDefaultThemeValues;
std::list<std::string> mUIElements;
std::list<std::string> mUIIcons;