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 clean up and fixes.

Browse Source 
--HG--
branch : dev-css
This commit is contained in:
Martín Lucas Golini
2018-12-31 20:37:05 -03:00
parent e6f2cbe155
commit 4f988a3c3d
40 changed files with 222 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/eepp/ui/uiimage.hpp
View File

@@ -9,8 +9,12 @@ class EE_API UIImage : public UIWidget {
public:
static UIImage * New();
static UIImage * NewWithTag( const std::string& tag );
UIImage();
explicit UIImage( const std::string& tag );
virtual ~UIImage();
virtual Uint32 getType() const;

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

@@ -15,6 +15,10 @@ class EE_API UIListBox : public UITouchDragableWidget {
UIListBox();
static UIListBox * NewWithTag( const std::string& tag );
UIListBox( const std::string& tag );
virtual ~UIListBox();
virtual Uint32 getType() const;
@@ -107,8 +111,6 @@ class EE_API UIListBox : public UITouchDragableWidget {
UIFontStyleConfig getFontStyleConfig() const;
void setFontStyleConfig(const UIFontStyleConfig & fontStyleConfig);
void loadFromXmlNode(const pugi::xml_node & node);
void loadItemsFromXmlNode(const pugi::xml_node & node);

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

@@ -64,8 +64,6 @@ class EE_API UIMenu : public UIWidget {
UITooltipStyleConfig getFontStyleConfig() const;
void setFontStyleConfig(const UITooltipStyleConfig & fontStyleConfig);
virtual void loadFromXmlNode( const pugi::xml_node& node );
virtual bool setAttribute( const NodeAttribute& attribute, const Uint32& state = UIState::StateFlagNormal );
@@ -119,6 +117,8 @@ class EE_API UIMenu : public UIWidget {
void nextSel();
void trySelect( UINode * Ctrl, bool Up );
void setMinSpaceForIcons( const Uint32& minSpaceForIcons );
};
}}

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

@@ -67,7 +67,9 @@ class EE_API UIPushButton : public UIWidget {
UIPushButton * setOutlineColor( const Color& outlineColor );
UITooltipStyleConfig getStyleConfig() const;
UIFontStyleConfig getStyleConfig() const;
void setIconMinimumSize( const Sizei& minIconSize );
void setStyleConfig(const UIPushButtonStyleConfig & styleConfig);
@@ -96,6 +98,8 @@ class EE_API UIPushButton : public UIWidget {
virtual Uint32 onKeyDown( const KeyEvent& Event );
virtual Uint32 onKeyUp( const KeyEvent& Event );
void autoIconHorizontalMargin();
};
}}

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

@@ -22,6 +22,8 @@ class EE_API UISkinState : public UIState {
bool stateExists( const Uint32& State );
protected:
UISkin * mSkin;
void updateState();
};
}}

4
include/eepp/ui/uistate.hpp
View File

@@ -37,6 +37,8 @@ class EE_API UIState {
static int getStateNumber(const std::string & State);
static const Uint32& getStateFlag( const Uint32& stateIndex );
static bool isStateName( const std::string& State );
UIState();
@@ -58,7 +60,7 @@ class EE_API UIState {
Uint32 mState;
Uint32 mCurrentState;
void updateState();
virtual void updateState() = 0;
virtual void onStateChange();
};

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

@@ -32,6 +32,8 @@ class EE_API UIStyle : public UIState {
UIWidget * mWidget;
std::map<int, AttributesMap> mStates;
void updateState();
void addStyleSheetProperties( int state, const CSS::StyleSheetProperties& properties );
};

38
include/eepp/ui/uitabwidget.hpp
View File

@@ -53,42 +53,6 @@ class EE_API UITabWidget : public UIWidget {
virtual void draw();
Font * getFont() const;
void setFont(Font * font);
Color getFontColor() const;
void setFontColor(const Color & fontColor);
Color getFontShadowColor() const;
void setFontShadowColor(const Color & fontShadowColor);
Color getFontOverColor() const;
void setFontOverColor(const Color & fontOverColor);
Color getFontSelectedColor() const;
void setFontSelectedColor(const Color & fontSelectedColor);
Uint32 getCharacterSize();
void setCharacterSize(const Uint32 & characterSize);
const Uint32& getFontStyle() const;
UITabWidget * setFontStyle( const Uint32& fontStyle );
const Float & getOutlineThickness() const;
UITabWidget * setOutlineThickness( const Float& outlineThickness );
const Color& getOutlineColor() const;
UITabWidget * setOutlineColor( const Color& outlineColor );
Int32 getTabSeparation() const;
void setTabSeparation(const Int32 & tabSeparation);
@@ -129,8 +93,6 @@ class EE_API UITabWidget : public UIWidget {
UITooltipStyleConfig getFontStyleConfig() const;
void setFontStyleConfig(const UITooltipStyleConfig & fontStyleConfig);
UITabWidgetStyleConfig getStyleConfig() const;
void setStyleConfig(const UITabWidgetStyleConfig & styleConfig);

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

@@ -45,8 +45,6 @@ class EE_API UITextEdit : public UIWidget {
UIFontStyleConfig getFontStyleConfig() const;
void setFontStyleConfig(const UIFontStyleConfig & fontStyleConfig);
virtual bool setAttribute( const NodeAttribute& attribute, const Uint32& state = UIState::StateFlagNormal );
protected:
UITextInput * mTextInput;

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

@@ -77,8 +77,6 @@ class EE_API UITextView : public UIWidget {
bool isTextSelectionEnabled() const;
virtual void setFontStyleConfig( const UITooltipStyleConfig& fontStyleConfig );
UITooltipStyleConfig getFontStyleConfig() const;
virtual bool setAttribute( const NodeAttribute& attribute, const Uint32& state = UIState::StateFlagNormal );

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

@@ -60,10 +60,6 @@ class EE_API UITheme : protected ResourceManager<UISkin> {
void setFontStyleConfig(UIFontStyleConfig fontConfig);
virtual UIDropDownListStyleConfig getDropDownListStyleConfig();
virtual UIPushButtonStyleConfig getPushButtonStyleConfig();
const CSS::StyleSheet& getStyleSheet() const;
void setStyleSheet(const CSS::StyleSheet & styleSheet);

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

@@ -66,7 +66,7 @@ class UITabWidgetStyleConfig : public UIFontStyleConfig {
public:
UITabWidgetStyleConfig() {}
UITabWidgetStyleConfig( UIFontStyleConfig fontStyleConfig ) :
explicit UITabWidgetStyleConfig( UIFontStyleConfig fontStyleConfig ) :
UIFontStyleConfig( fontStyleConfig )
{}
@@ -115,7 +115,7 @@ class UIDropDownListStyleConfig : public UIFontStyleConfig {
public:
UIDropDownListStyleConfig() {}
UIDropDownListStyleConfig( UIFontStyleConfig fontStyleConfig ) :
explicit UIDropDownListStyleConfig( UIFontStyleConfig fontStyleConfig ) :
UIFontStyleConfig( fontStyleConfig )
{}

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

@@ -53,8 +53,6 @@ class EE_API UIThemeManager : public ResourceManager<UITheme> {
UIThemeManager * setCursorSize( const Sizei& Size );
const Sizei& getCursorSize() const;
UIFontStyleConfig getDefaultFontStyleConfig();
protected:
Font * mFont;
UITheme * mThemeDefault;

4
include/eepp/ui/uiwidget.hpp
View File

@@ -19,6 +19,8 @@ class EE_API UIWidget : public UINode, public CSS::StyleSheetElement {
public:
static UIWidget * New();
static UIWidget * NewWithTag( const std::string& tag );
UIWidget();
virtual ~UIWidget();
@@ -172,6 +174,8 @@ class EE_API UIWidget : public UINode, public CSS::StyleSheetElement {
void updateAnchors( const Vector2f & SizeChange );
void alignAgainstLayout();
void reportStyleStateChange();
};
}}