Added position rules for widgets in the relative layout.

--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2017-03-08 17:12:12 -03:00
parent ba638da1de
commit 69aa3c7419
8 changed files with 90 additions and 46 deletions

View File

@@ -90,10 +90,6 @@ class EE_API UIControl {
void centerVertical();
void centerVerticalUp();
void centerVerticalDown();
void center();
virtual void close();
@@ -227,7 +223,7 @@ class EE_API UIControl {
std::string getId() const;
void setId( const std::string & id );
UIControl * setId( const std::string & id );
Uint32 getIdHash() const;

View File

@@ -157,6 +157,14 @@ enum LayoutSizeRules {
WRAP_CONTENT
};
enum LayoutPositionRules {
NONE,
LEFT_OF,
RIGHT_OF,
TOP_OF,
BOTTOM_OF
};
static const Uint32 UI_CONTROL_DEFAULT_ALIGN = UI_HALIGN_LEFT | UI_VALIGN_CENTER;
static const Uint32 UI_CONTROL_ALIGN_CENTER = UI_HALIGN_CENTER | UI_VALIGN_CENTER;

View File

@@ -63,6 +63,12 @@ class EE_API UIWidget : public UIControlAnim {
UIWidget * setLayoutHeightRules(const LayoutSizeRules & layoutHeightRules);
UIWidget * setLayoutSizeRules( const LayoutSizeRules & layoutWidthRules, const LayoutSizeRules & layoutHeightRules );
UIWidget * setLayoutPositionRule( const LayoutPositionRules& layoutPositionRule, UIWidget * of );
UIWidget * getLayoutPositionRuleWidget() const;
LayoutPositionRules getLayoutPositionRule() const;
protected:
friend class UILinearLayout;
@@ -75,6 +81,8 @@ class EE_API UIWidget : public UIControlAnim {
Uint32 mLayoutGravity;
LayoutSizeRules mLayoutWidthRules;
LayoutSizeRules mLayoutHeightRules;
LayoutPositionRules mLayoutPositionRule;
UIWidget * mLayoutPositionRuleWidget;
void createTooltip();