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

PushButton clean up WIP.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martí­n Lucas Golini
2017-03-02 03:49:51 -03:00
parent e246503ee9
commit 9742ff2bea
26 changed files with 219 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/eepp/ui/uipushbutton.hpp
View File

@@ -15,28 +15,23 @@ class EE_API UIPushButton : public UIComplexControl {
public:
inline CreateParams() :
UITextBox::CreateParams(),
Icon( NULL ),
IconHorizontalMargin( 0 ),
IconAutoMargin( true ),
IconMinSize( 0, 0 )
Icon( NULL )
{
FontStyleConfig = UIThemeManager::instance()->getDefaultFontStyleConfig();
UITheme * theme = UIThemeManager::instance()->getDefaultTheme();
if ( NULL != theme ) {
StyleConfig = theme->getPushButtonStyleConfig();
}
}
inline ~CreateParams() {}
inline void setIcon( SubTexture * icon ) {
Icon = icon;
if ( !IconHorizontalMargin )
IconHorizontalMargin = 4;
}
UI::FontStyleConfig FontStyleConfig;
PushButtonStyleConfig StyleConfig;
SubTexture * Icon;
Int32 IconHorizontalMargin;
bool IconAutoMargin;
Sizei IconMinSize;
};
UIPushButton( const UIPushButton::CreateParams& Params );
@@ -51,7 +46,7 @@ class EE_API UIPushButton : public UIComplexControl {
virtual void setTheme( UITheme * Theme );
virtual void setIcon( SubTexture * icon );
virtual UIPushButton * setIcon( SubTexture * icon );
virtual UIGfx * getIcon() const;
@@ -85,14 +80,13 @@ class EE_API UIPushButton : public UIComplexControl {
void setFontShadowColor( const ColorA& color );
FontStyleConfig getFontStyleConfig() const;
FontStyleConfig getStyleConfig() const;
void setFontStyleConfig(const FontStyleConfig & fontStyleConfig);
void setStyleConfig(const PushButtonStyleConfig & styleConfig);
protected:
FontStyleConfig mFontStyleConfig;
PushButtonStyleConfig mStyleConfig;
UIGfx * mIcon;
UITextBox * mTextBox;
Int32 mIconSpace;
virtual void onSizeChange();

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

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

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

@@ -9,7 +9,7 @@ class UITabWidget;
class EE_API UITab : public UISelectButton {
public:
UITab( UISelectButton::CreateParams& Params, UIControl * controlOwned );
static UITab * New();
UITab();

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

@@ -95,10 +95,6 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
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 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 );
ColorA getTooltipFontColor() const;
void setTooltipFontColor(const ColorA & tooltipFontColor);
@@ -122,6 +118,8 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
virtual WindowStyleConfig getWindowStyleConfig();
virtual MenuStyleConfig getMenuStyleConfig();
virtual PushButtonStyleConfig getPushButtonStyleConfig();
protected:
std::string mName;
Uint32 mNameHash;

13
include/eepp/ui/uithemeconfig.hpp
View File

@@ -185,6 +185,19 @@ class MenuStyleConfig : public FontStyleConfig {
};
class PushButtonStyleConfig : public FontStyleConfig {
public:
PushButtonStyleConfig() {}
PushButtonStyleConfig( FontStyleConfig fontStyleConfig ) :
FontStyleConfig( fontStyleConfig )
{}
Int32 IconHorizontalMargin = 4;
bool IconAutoMargin = true;
Sizei IconMinSize;
};
}}
#endif