diff --git a/include/eepp/ui/uilistboxitem.hpp b/include/eepp/ui/uilistboxitem.hpp index 517a28c21..afa6a9c3c 100644 --- a/include/eepp/ui/uilistboxitem.hpp +++ b/include/eepp/ui/uilistboxitem.hpp @@ -10,7 +10,7 @@ class UIListBox; class EE_API UIListBoxItem : public UITextBox { public: - UIListBoxItem( const UITextBox::CreateParams& Params ); + static UIListBoxItem * New(); UIListBoxItem(); diff --git a/include/eepp/ui/uiseparator.hpp b/include/eepp/ui/uiseparator.hpp index 9378dd9da..7974a6b42 100644 --- a/include/eepp/ui/uiseparator.hpp +++ b/include/eepp/ui/uiseparator.hpp @@ -7,7 +7,7 @@ namespace EE { namespace UI { class EE_API UISeparator : public UIControlAnim { public: - UISeparator( UIControlAnim::CreateParams Params ); + static UISeparator * New(); UISeparator(); diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp index 6cdbd8577..35087ed42 100644 --- a/src/eepp/ui/uilistbox.cpp +++ b/src/eepp/ui/uilistbox.cpp @@ -154,11 +154,10 @@ Uint32 UIListBox::addListBoxItem( const String& Text ) { } UIListBoxItem * UIListBox::createListBoxItem( const String& Name ) { - UITextBox::CreateParams TextParams; - TextParams.setParent( mContainer ); - TextParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT; - TextParams.FontStyleConfig = mFontStyleConfig; - UIListBoxItem * tItem = eeNew( UIListBoxItem, ( TextParams ) ); + UIListBoxItem * tItem = UIListBoxItem::New(); + tItem->setParent( mContainer ); + tItem->setHorizontalAlign( UI_HALIGN_LEFT )->setVerticalAlign( UI_VALIGN_CENTER ); + tItem->setFontStyleConfig( mFontStyleConfig ); tItem->setText( Name ); return tItem; diff --git a/src/eepp/ui/uilistboxitem.cpp b/src/eepp/ui/uilistboxitem.cpp index 8f8132eb8..42a85b1e8 100644 --- a/src/eepp/ui/uilistboxitem.cpp +++ b/src/eepp/ui/uilistboxitem.cpp @@ -4,10 +4,8 @@ namespace EE { namespace UI { -UIListBoxItem::UIListBoxItem( const UITextBox::CreateParams& Params ) : - UITextBox( Params ) -{ - applyDefaultTheme(); +UIListBoxItem * UIListBoxItem::New() { + return eeNew( UIListBoxItem, () ); } UIListBoxItem::UIListBoxItem() : diff --git a/src/eepp/ui/uimenu.cpp b/src/eepp/ui/uimenu.cpp index a998f47dc..c86482218 100644 --- a/src/eepp/ui/uimenu.cpp +++ b/src/eepp/ui/uimenu.cpp @@ -177,15 +177,10 @@ void UIMenu::setControlSize( UIControl * Control, const Uint32& Pos ) { } Uint32 UIMenu::addSeparator() { - UISeparator::CreateParams Params; - Params.setParent( this ); - Params.setPosition( mStyleConfig.Padding.Left, mStyleConfig.Padding.Top + mNextPosY ); - Params.Size = Sizei( mSize.getWidth() - mStyleConfig.Padding.Left - mStyleConfig.Padding.Right, 3 ); - - UISeparator * Control = eeNew( UISeparator, ( Params ) ); - - Control->setVisible( true ); - Control->setEnabled( true ); + UISeparator * Control = UISeparator::New(); + Control->setParent( this ); + Control->setPosition( mStyleConfig.Padding.Left, mStyleConfig.Padding.Top + mNextPosY ); + Control->setSize( mSize.getWidth() - mStyleConfig.Padding.Left - mStyleConfig.Padding.Right, 3 ); mNextPosY += Control->getSize().getHeight(); diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp index 2195abcf9..ef7ef486f 100644 --- a/src/eepp/ui/uiscrollbar.cpp +++ b/src/eepp/ui/uiscrollbar.cpp @@ -13,8 +13,8 @@ UIScrollBar::UIScrollBar() : { mFlags |= UI_AUTO_SIZE; - mBtnDown = eeNew( UIControlAnim, () ); - mBtnUp = eeNew( UIControlAnim, () ); + mBtnDown = UIControlAnim::New(); + mBtnUp = UIControlAnim::New(); mBtnUp->setParent( this ); mBtnUp->setVisible( true ); mBtnUp->setEnabled( true ); @@ -24,7 +24,7 @@ UIScrollBar::UIScrollBar() : mBtnDown->setEnabled( true ); mBtnDown->setSize( 16, 16 ); - mSlider = eeNew( UISlider, () ); + mSlider = UISlider::New(); mSlider->setParent( this ); mSlider->setVisible( true ); mSlider->setEnabled( true ); diff --git a/src/eepp/ui/uiseparator.cpp b/src/eepp/ui/uiseparator.cpp index d85f1a37f..9c974e607 100644 --- a/src/eepp/ui/uiseparator.cpp +++ b/src/eepp/ui/uiseparator.cpp @@ -3,10 +3,8 @@ namespace EE { namespace UI { -UISeparator::UISeparator( UIControlAnim::CreateParams Params ) : - UIControlAnim( Params ) -{ - applyDefaultTheme(); +UISeparator * UISeparator::New() { + return eeNew( UISeparator, () ); } UISeparator::UISeparator() : diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index b53e4fa22..75918ded8 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -277,7 +277,9 @@ void EETest::createUI() { eePRINTL( "Texture Atlas Loading Time: %4.3f ms.", TE.getElapsed().asMilliseconds() ); - UIManager::instance()->init(UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER | UI_MANAGER_DRAW_DEBUG_DATA | UI_MANAGER_DRAW_BOXES); // UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER | UI_MANAGER_DRAW_DEBUG_DATA | UI_MANAGER_DRAW_BOXES + Uint32 UI_MAN_OPS = 0; + //UI_MAN_OPS = UI_MANAGER_HIGHLIGHT_FOCUS | UI_MANAGER_HIGHLIGHT_OVER | UI_MANAGER_DRAW_DEBUG_DATA | UI_MANAGER_DRAW_BOXES; + UIManager::instance()->init(UI_MAN_OPS); //mTheme = UITheme::loadFromPath( eeNew( UIdefaultTheme, ( mThemeName, mThemeName ) ), MyPath + mThemeName + "/" );