Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify layout enum

This commit is contained in:
CaiWenzhi 2013-09-23 21:26:44 +08:00
parent be7c7a5f0b
commit f4471ae93c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/CocoStudio/GUI/Layouts/Layout.cpp
View File

@ -47,7 +47,7 @@ _gEndColor(Color3B::WHITE),
_alongVector(Point(0.0f, -1.0f)),
_cOpacity(255),
_backGroundImageTextureSize(Size::ZERO),
_layoutType(LAYOUT_DEFAULT)
_layoutType(LAYOUT_ABSOLUTE)
{
_widgetType = WidgetTypeContainer;
}
@ -420,7 +420,7 @@ void Layout::doLayout()
{
switch (_layoutType)
{
case LAYOUT_DEFAULT:
case LAYOUT_ABSOLUTE:
break;
case LAYOUT_LINEAR_VERTICAL:
{

6
extensions/CocoStudio/GUI/Layouts/Layout.h
View File

@ -38,7 +38,7 @@ typedef enum
typedef enum
{
LAYOUT_DEFAULT,
LAYOUT_ABSOLUTE,
LAYOUT_LINEAR_VERTICAL,
LAYOUT_LINEAR_HORIZONTAL,
LAYOUT_RELATIVE
@ -175,7 +175,7 @@ public:
*
* @param LayoutType
*/
void setLayoutType(LayoutType type);
virtual void setLayoutType(LayoutType type);
/**
* Gets LayoutType.
@ -184,7 +184,7 @@ public:
*
* @return LayoutType
*/
LayoutType getLayoutType() const;
virtual LayoutType getLayoutType() const;
virtual void doLayout();

4
extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIDragPanel.h
View File

@ -198,7 +198,7 @@ public:
*
* @param LayoutType
*/
void setLayoutType(LayoutType type);
virtual void setLayoutType(LayoutType type);
/**
* Gets LayoutType.
@ -207,7 +207,7 @@ public:
*
* @return LayoutType
*/
LayoutType getLayoutType() const;
virtual LayoutType getLayoutType() const;
virtual void doLayout();

4
extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h
View File

@ -172,7 +172,7 @@ public:
*
* @param LayoutType
*/
void setLayoutType(LayoutType type);
virtual void setLayoutType(LayoutType type);
/**
* Gets LayoutType.
@ -181,7 +181,7 @@ public:
*
* @return LayoutType
*/
LayoutType getLayoutType() const;
virtual LayoutType getLayoutType() const;
virtual void doLayout();