diff --git a/include/eepp/system/colors.hpp b/include/eepp/system/colors.hpp index 583f948dd..4722fe572 100755 --- a/include/eepp/system/colors.hpp +++ b/include/eepp/system/colors.hpp @@ -180,7 +180,7 @@ class tColorA { ); } - tColor ToColor() { + tColor toColor() { return tColor( Red, Green, Blue ); } }; diff --git a/include/eepp/ui/uicontrol.hpp b/include/eepp/ui/uicontrol.hpp index 19d58bf79..c6768430e 100644 --- a/include/eepp/ui/uicontrol.hpp +++ b/include/eepp/ui/uicontrol.hpp @@ -55,11 +55,11 @@ class EE_API UIControl { ~CreateParams() {} - void PosSet( const Vector2i& pos ) { Pos.x = pos.x; Pos.y = pos.y; } - void PosSet( const Int32& X, const Int32& Y ) { Pos.x = X; Pos.y = Y; } - void Parent( UIControl * Ctrl ) { ParentCtrl = Ctrl; } - void SizeSet( const Sizei& size ) { Size.x = size.x; Size.y = size.y; } - void SizeSet( const Int32& Width, const Int32& Height ) { Size.x = Width; Size.y = Height; } + void setPos( const Vector2i& pos ) { Pos.x = pos.x; Pos.y = pos.y; } + void setPos( const Int32& X, const Int32& Y ) { Pos.x = X; Pos.y = Y; } + void setParent( UIControl * Ctrl ) { ParentCtrl = Ctrl; } + void setSize( const Sizei& size ) { Size.x = size.x; Size.y = size.y; } + void setSize( const Int32& Width, const Int32& Height ) { Size.x = Width; Size.y = Height; } UIControl * ParentCtrl; Vector2i Pos; diff --git a/src/eepp/gaming/mapeditor/mapeditor.cpp b/src/eepp/gaming/mapeditor/mapeditor.cpp index b8de55ac6..f2e7deb98 100644 --- a/src/eepp/gaming/mapeditor/mapeditor.cpp +++ b/src/eepp/gaming/mapeditor/mapeditor.cpp @@ -160,9 +160,9 @@ void MapEditor::CreateWinMenu() { PU6->addEventListener( UIEvent::EventOnItemClicked, cb::Make1( this, &MapEditor::MapMenuClick ) ); UIComplexControl::CreateParams Params; - Params.Parent( mUIContainer ); - Params.PosSet( 0, WinMenu->size().height() ); - Params.SizeSet( mUIContainer->size().width(), mUIContainer->size().height() - WinMenu->size().height() ); + Params.setParent( mUIContainer ); + Params.setPos( 0, WinMenu->size().height() ); + Params.setSize( mUIContainer->size().width(), mUIContainer->size().height() - WinMenu->size().height() ); Params.Flags = UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_REPORT_SIZE_CHANGE_TO_CHILDS; mWinContainer = eeNew( UIComplexControl, ( Params ) ); mWinContainer->visible( true ); @@ -176,8 +176,8 @@ void MapEditor::CreateETGMenu() { Int32 DistFromTopMenu = 4; UIComplexControl::CreateParams CParams; - CParams.Parent( mWinContainer ); - CParams.SizeSet( Sizei( Width + DistToBorder, mWinContainer->size().height() ) ); + CParams.setParent( mWinContainer ); + CParams.setSize( Sizei( Width + DistToBorder, mWinContainer->size().height() ) ); CParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mSubTextureCont = eeNew( UIComplexControl, ( CParams ) ); mSubTextureCont->enabled( true ); @@ -298,9 +298,9 @@ void MapEditor::CreateSubTextureContainer( Int32 Width ) { mChkDI->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &MapEditor::ChkClickDI ) ); UIComplexControl::CreateParams SGParams; - SGParams.Parent( mSubTextureCont ); - SGParams.PosSet( Vector2i( TAB_CONT_X_DIST, mChkDI->position().y + mChkDI->size().height() + 8 ) ); - SGParams.SizeSet( Sizei( Width, 400 ) ); + SGParams.setParent( mSubTextureCont ); + SGParams.setPos( Vector2i( TAB_CONT_X_DIST, mChkDI->position().y + mChkDI->size().height() + 8 ) ); + SGParams.setSize( Sizei( Width, 400 ) ); SGParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mSGCont = eeNew( UIComplexControl, ( SGParams ) ); mSGCont->enabled( true ); @@ -320,9 +320,9 @@ void MapEditor::CreateSubTextureContainer( Int32 Width ) { mGfxPreview->border()->color( ColorA( 0, 0, 0, 200 ) ); UIComplexControl::CreateParams DIParams; - DIParams.Parent( mSubTextureCont ); - DIParams.PosSet( SGParams.Pos ); - DIParams.SizeSet( Sizei( Width, 400 ) ); + DIParams.setParent( mSubTextureCont ); + DIParams.setPos( SGParams.Pos ); + DIParams.setSize( Sizei( Width, 400 ) ); DIParams.Flags = UI_CONTROL_DEFAULT_ALIGN | UI_ANCHOR_RIGHT | UI_ANCHOR_TOP; mDICont = eeNew( UIComplexControl, ( DIParams ) ); mDICont->enabled( false ); @@ -343,9 +343,9 @@ void MapEditor::CreateLighContainer() { UITextBox * Txt = mTheme->createTextBox( "Light Color:", mLightCont, Sizei(), Vector2i( TAB_CONT_X_DIST, 32 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; - ComParams.Parent( mLightCont ); - ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); - ComParams.SizeSet( 58, 64 ); + ComParams.setParent( mLightCont ); + ComParams.setPos( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); + ComParams.setSize( 58, 64 ); ComParams.Background.color( ColorA(255,255,255,255) ); ComParams.Border.color( ColorA( 100, 100, 100, 200 ) ); ComParams.Flags |= UI_FILL_BACKGROUND | UI_BORDER; @@ -460,9 +460,9 @@ void MapEditor::CreateUIMap() { } UIComplexControl::CreateParams Params; - Params.Parent( mWinContainer ); - Params.PosSet( 0, 0 ); - Params.SizeSet( mWinContainer->size().width() - 225 - ScrollV, mWinContainer->size().height() - ScrollH ); + Params.setParent( mWinContainer ); + Params.setPos( 0, 0 ); + Params.setSize( mWinContainer->size().width() - 225 - ScrollV, mWinContainer->size().height() - ScrollH ); Params.Flags |= UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT; mUIMap = eeNew( UIMap, ( Params, mTheme ) ); @@ -545,7 +545,7 @@ void MapEditor::OnNewLight( const UIEvent * Event ) { if ( MEvent->getFlags() & EE_BUTTON_LMASK ) { Vector2i Pos = mUIMap->Map()->GetMouseMapPos(); - mUIMap->AddLight( eeNew( MapLight, ( mLightRadius->value(), Pos.x, Pos.y, mUIBaseColor->background()->color().ToColor(), mLightTypeChk->active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ) ) ); + mUIMap->AddLight( eeNew( MapLight, ( mLightRadius->value(), Pos.x, Pos.y, mUIBaseColor->background()->color().toColor(), mLightTypeChk->active() ? LIGHT_ISOMETRIC : LIGHT_NORMAL ) ) ); } } diff --git a/src/eepp/gaming/mapeditor/maplayerproperties.cpp b/src/eepp/gaming/mapeditor/maplayerproperties.cpp index f942d00fe..2c1cf1096 100644 --- a/src/eepp/gaming/mapeditor/maplayerproperties.cpp +++ b/src/eepp/gaming/mapeditor/maplayerproperties.cpp @@ -47,9 +47,9 @@ MapLayerProperties::MapLayerProperties( MapLayer * Map, RefreshLayerListCb Cb ) CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->getContainer() ); - GridParams.PosSet( 50, TxtBox->position().y + TxtBox->size().height() ); - GridParams.SizeSet( 400, 350 ); + GridParams.setParent( mUIWindow->getContainer() ); + GridParams.setPos( 50, TxtBox->position().y + TxtBox->size().height() ); + GridParams.setSize( 400, 350 ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; @@ -177,7 +177,7 @@ void MapLayerProperties::CreateGridElems() { UIGridCell * MapLayerProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->getContainer() ); + CellParams.setParent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; diff --git a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp b/src/eepp/gaming/mapeditor/mapobjectproperties.cpp index 191823ac6..071d05b0a 100644 --- a/src/eepp/gaming/mapeditor/mapobjectproperties.cpp +++ b/src/eepp/gaming/mapeditor/mapobjectproperties.cpp @@ -51,9 +51,9 @@ MapObjectProperties::MapObjectProperties( GameObjectObject * Obj ) : CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->getContainer() ); - GridParams.PosSet( 50, TxtBox->position().y + TxtBox->size().height() ); - GridParams.SizeSet( 400, 350 ); + GridParams.setParent( mUIWindow->getContainer() ); + GridParams.setPos( 50, TxtBox->position().y + TxtBox->size().height() ); + GridParams.setSize( 400, 350 ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; @@ -178,7 +178,7 @@ void MapObjectProperties::CreateGridElems() { UIGridCell * MapObjectProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->getContainer() ); + CellParams.setParent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; diff --git a/src/eepp/gaming/mapeditor/tilemapproperties.cpp b/src/eepp/gaming/mapeditor/tilemapproperties.cpp index b9f675228..02a11056e 100644 --- a/src/eepp/gaming/mapeditor/tilemapproperties.cpp +++ b/src/eepp/gaming/mapeditor/tilemapproperties.cpp @@ -31,9 +31,9 @@ TileMapProperties::TileMapProperties( TileMap * Map ) : UITextBox * Txt = mUITheme->createTextBox( "Map Base Color:", mUIWindow->getContainer(), Sizei(), Vector2i( 50, 16 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; - ComParams.Parent( mUIWindow->getContainer() ); - ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); - ComParams.SizeSet( 64, 64 ); + ComParams.setParent( mUIWindow->getContainer() ); + ComParams.setPos( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); + ComParams.setSize( 64, 64 ); ComParams.Background.color( mMap->BaseColor() ); ComParams.Border.color( ColorA( 100, 100, 100, 200 ) ); ComParams.Flags |= UI_FILL_BACKGROUND | UI_BORDER; @@ -81,9 +81,9 @@ TileMapProperties::TileMapProperties( TileMap * Map ) : CancelButton->text( "Cancel" ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( mUIWindow->getContainer() ); - GridParams.PosSet( 50, TxtBox->position().y + 20 ); - GridParams.SizeSet( 400, 400 - DiffIfLights ); + GridParams.setParent( mUIWindow->getContainer() ); + GridParams.setPos( 50, TxtBox->position().y + 20 ); + GridParams.setSize( 400, 400 - DiffIfLights ); GridParams.Flags = UI_AUTO_PADDING; GridParams.RowHeight = 24; GridParams.CollumnsCount = 5; @@ -239,7 +239,7 @@ void TileMapProperties::CreateGridElems() { UIGridCell * TileMapProperties::CreateCell() { UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->getContainer() ); + CellParams.setParent( mGenGrid->getContainer() ); UITextInput::CreateParams TxtInputParams; TxtInputParams.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; diff --git a/src/eepp/gaming/mapeditor/uimapnew.cpp b/src/eepp/gaming/mapeditor/uimapnew.cpp index 3d4b01de0..5fec4fac0 100644 --- a/src/eepp/gaming/mapeditor/uimapnew.cpp +++ b/src/eepp/gaming/mapeditor/uimapnew.cpp @@ -111,9 +111,9 @@ UIMapNew::UIMapNew( UIMap * Map, cb::Callback0 NewMapCb, bool ResizeMap ) Txt = mTheme->createTextBox( "Map Base Color:", mUIWindow->getContainer(), Sizei(), Vector2i( Txt->position().x, mUIClipArea->position().y + mUIClipArea->size().height() + 8 ), UI_CONTROL_DEFAULT_FLAGS | UI_DRAW_SHADOW | UI_AUTO_SIZE ); UIComplexControl::CreateParams ComParams; - ComParams.Parent( mUIWindow->getContainer() ); - ComParams.PosSet( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); - ComParams.SizeSet( 64, 64 ); + ComParams.setParent( mUIWindow->getContainer() ); + ComParams.setPos( Txt->position().x, Txt->position().y + Txt->size().height() + 4 ); + ComParams.setSize( 64, 64 ); ComParams.Background.color( ColorA( 255, 255, 255, 255 ) ); if ( ResizeMap ) { diff --git a/src/eepp/gaming/tilemap.cpp b/src/eepp/gaming/tilemap.cpp index a1aa61aae..79c4c239f 100644 --- a/src/eepp/gaming/tilemap.cpp +++ b/src/eepp/gaming/tilemap.cpp @@ -1010,7 +1010,7 @@ bool TileMap::LoadFromStream( IOStream& IOS ) { tLightHdr = &( tLighsHdr[ i ] ); ColorA color( tLightHdr->Color ); - RGB rgb( color.ToColor() ); + RGB rgb( color.toColor() ); mLightManager->AddLight( eeNew( MapLight, ( tLightHdr->Radius, tLightHdr->PosX, tLightHdr->PosY, rgb, (LIGHT_TYPE)tLightHdr->Type ) ) diff --git a/src/eepp/ui/tools/textureatlaseditor.cpp b/src/eepp/ui/tools/textureatlaseditor.cpp index e06ae87e4..f6e39732b 100644 --- a/src/eepp/ui/tools/textureatlaseditor.cpp +++ b/src/eepp/ui/tools/textureatlaseditor.cpp @@ -110,9 +110,9 @@ TextureAtlasEditor::TextureAtlasEditor( UIWindow * AttatchTo, const TGEditorClos createTGEditor(); UIComplexControl::CreateParams Params; - Params.Parent( mUIContainer ); - Params.PosSet( 0, mWinMenu->size().height() ); - Params.SizeSet( 800, 600 ); + Params.setParent( mUIContainer ); + Params.setPos( 0, mWinMenu->size().height() ); + Params.setSize( 800, 600 ); Params.Background.color( ColorA( 0, 0, 0, 50 ) ); Params.Flags |= UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT | UI_CLIP_ENABLE | UI_BORDER | UI_FILL_BACKGROUND; mSubTextureEditor = eeNew( TextureAtlasSubTextureEditor, ( Params, this ) ); diff --git a/src/eepp/ui/tools/textureatlassubtextureeditor.cpp b/src/eepp/ui/tools/textureatlassubtextureeditor.cpp index 45e012d07..7b7a8edfc 100644 --- a/src/eepp/ui/tools/textureatlassubtextureeditor.cpp +++ b/src/eepp/ui/tools/textureatlassubtextureeditor.cpp @@ -19,8 +19,8 @@ TextureAtlasSubTextureEditor::TextureAtlasSubTextureEditor( const UIComplexContr mGfx = mTheme->createGfx( NULL, this ); UIDragable::CreateParams DragParams; - DragParams.Parent( this ); - DragParams.SizeSet( 500000, 500000 ); + DragParams.setParent( this ); + DragParams.setSize( 500000, 500000 ); mDrag = eeNew( UIDragable, ( DragParams ) ); mDrag->enabled( true ); mDrag->visible( true ); diff --git a/src/eepp/ui/uicheckbox.cpp b/src/eepp/ui/uicheckbox.cpp index 960d36b82..3e92b3261 100644 --- a/src/eepp/ui/uicheckbox.cpp +++ b/src/eepp/ui/uicheckbox.cpp @@ -11,8 +11,8 @@ UICheckBox::UICheckBox( const UITextBox::CreateParams& Params ) : { UIControlAnim::CreateParams ButtonParams( Params ); - ButtonParams.Parent( this ); - ButtonParams.PosSet( Vector2i( 0, 0 ) ); + ButtonParams.setParent( this ); + ButtonParams.setPos( Vector2i( 0, 0 ) ); ButtonParams.Size = Sizei( 16, 16 ); mActiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); diff --git a/src/eepp/ui/uicombobox.cpp b/src/eepp/ui/uicombobox.cpp index 7328050d2..41c535a07 100644 --- a/src/eepp/ui/uicombobox.cpp +++ b/src/eepp/ui/uicombobox.cpp @@ -52,9 +52,9 @@ void UIComboBox::createButton() { } UIControl::CreateParams Params; - Params.Parent( this ), + Params.setParent( this ), Params.Size = Sizei( btnWidth, mSize.height() ); - Params.PosSet( mSize.width() - btnWidth, 0 ); + Params.setPos( mSize.width() - btnWidth, 0 ); mButton = eeNew( UIControl, ( Params ) ); mButton->visible( true ); mButton->enabled( true ); diff --git a/src/eepp/ui/uicommondialog.cpp b/src/eepp/ui/uicommondialog.cpp index 074f2fca9..825e3ba46 100644 --- a/src/eepp/ui/uicommondialog.cpp +++ b/src/eepp/ui/uicommondialog.cpp @@ -34,8 +34,8 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : } UITextBox::CreateParams TxtBoxParams; - TxtBoxParams.Parent( getContainer() ); - TxtBoxParams.PosSet( 6, 13 ); + TxtBoxParams.setParent( getContainer() ); + TxtBoxParams.setPos( 6, 13 ); TxtBoxParams.Flags |= UI_AUTO_SIZE; UITextBox * TBox = eeNew( UITextBox, ( TxtBoxParams ) ); TBox->visible( true ); @@ -44,9 +44,9 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : UIPushButton::CreateParams ButtonParams; ButtonParams.Flags = UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_VALIGN_CENTER | UI_AUTO_SIZE; - ButtonParams.Parent( getContainer() ); - ButtonParams.PosSet( getContainer()->size().width() - 86, getContainer()->size().height() - 24 ); - ButtonParams.SizeSet( 80, 22 ); + ButtonParams.setParent( getContainer() ); + ButtonParams.setPos( getContainer()->size().width() - 86, getContainer()->size().height() - 24 ); + ButtonParams.setSize( 80, 22 ); mButtonCancel = eeNew( UIPushButton, ( ButtonParams ) ); mButtonCancel->visible( true ); mButtonCancel->enabled( true ); @@ -54,7 +54,7 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : mButtonCancel->position( Vector2i( mButtonCancel->position().x, getContainer()->size().height() - mButtonCancel->size().height() - 2 ) ); mButtonCancel->updateAnchorsDistances(); - ButtonParams.PosSet( mButtonCancel->position().x, mButtonCancel->position().y - mButtonCancel->size().height() ); + ButtonParams.setPos( mButtonCancel->position().x, mButtonCancel->position().y - mButtonCancel->size().height() ); mButtonOpen = eeNew( UIPushButton, ( ButtonParams ) ); mButtonOpen->visible( true ); mButtonOpen->enabled( true ); @@ -65,18 +65,18 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : mButtonOpen->text( "Open" ); UITextInput::CreateParams TInputParams; - TInputParams.Parent( getContainer() ); + TInputParams.setParent( getContainer() ); TInputParams.Flags = UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_ANCHOR_RIGHT | UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_VALIGN_CENTER | UI_TEXT_SELECTION_ENABLED; - TInputParams.PosSet( 70, 6 ); - TInputParams.SizeSet( getContainer()->size().width() - TInputParams.Pos.x - 42, 22 ); + TInputParams.setPos( 70, 6 ); + TInputParams.setSize( getContainer()->size().width() - TInputParams.Pos.x - 42, 22 ); mPath = eeNew( UITextInput, ( TInputParams ) ); mPath->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::onPressEnter ) ); mPath->visible( true ); mPath->enabled( true ); mPath->text( mCurPath ); - ButtonParams.PosSet( TInputParams.Pos.x + TInputParams.Size.width() + 6, TInputParams.Pos.y ); - ButtonParams.SizeSet( 24, 22 ); + ButtonParams.setPos( TInputParams.Pos.x + TInputParams.Size.width() + 6, TInputParams.Pos.y ); + ButtonParams.setSize( 24, 22 ); ButtonParams.Flags |= UI_ANCHOR_TOP; mButtonUp = eeNew( UIPushButton, ( ButtonParams ) ); mButtonUp->visible( true ); @@ -84,8 +84,8 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : mButtonUp->text( "Up" ); UIListBox::CreateParams LBParams; - LBParams.Parent( getContainer() ); - LBParams.PosSet( 6, mButtonUp->position().y + mButtonUp->size().height() + 4 ); + LBParams.setParent( getContainer() ); + LBParams.setPos( 6, mButtonUp->position().y + mButtonUp->size().height() + 4 ); LBParams.Size = Sizei( getContainer()->size().width() - 12, getContainer()->size().height() - mButtonUp->size().height() - @@ -108,32 +108,32 @@ UICommonDialog::UICommonDialog( const UICommonDialog::CreateParams& Params ) : mList->visible( true ); mList->enabled( true ); - TxtBoxParams.PosSet( 6, getContainer()->size().height() - 54 ); - TxtBoxParams.SizeSet( 74, 19 ); + TxtBoxParams.setPos( 6, getContainer()->size().height() - 54 ); + TxtBoxParams.setSize( 74, 19 ); TxtBoxParams.Flags = UI_ANCHOR_LEFT | UI_VALIGN_CENTER; TBox = eeNew( UITextBox, ( TxtBoxParams ) ); TBox->visible( true ); TBox->enabled( false ); TBox->text( "File Name:" ); - TxtBoxParams.PosSet( TBox->position().x, TBox->position().y + TBox->size().height()+ 6 ); + TxtBoxParams.setPos( TBox->position().x, TBox->position().y + TBox->size().height()+ 6 ); UITextBox * TBox2 = eeNew( UITextBox, ( TxtBoxParams ) ); TBox2->visible( true ); TBox2->enabled( false ); TBox2->text( "Files of type:" ); TInputParams.Flags &= ~UI_ANCHOR_TOP; - TInputParams.PosSet( TBox->position().x + TBox->size().width(), TBox->position().y ); - TInputParams.SizeSet( getContainer()->size().width() - mButtonOpen->size().width() - TInputParams.Pos.x - 20, TInputParams.Size.height() ); + TInputParams.setPos( TBox->position().x + TBox->size().width(), TBox->position().y ); + TInputParams.setSize( getContainer()->size().width() - mButtonOpen->size().width() - TInputParams.Pos.x - 20, TInputParams.Size.height() ); mFile = eeNew( UITextInput, ( TInputParams ) ); mFile->visible( true ); mFile->enabled( true ); mFile->addEventListener( UIEvent::EventOnPressEnter, cb::Make1( this, &UICommonDialog::onPressFileEnter ) ); UIDropDownList::CreateParams DDLParams; - DDLParams.Parent( getContainer() ); - DDLParams.PosSet( TBox2->position().x + TBox2->size().width(), TBox2->position().y ); - DDLParams.SizeSet( getContainer()->size().width() - mButtonCancel->size().width() - DDLParams.Pos.x - 20, 22 ); + DDLParams.setParent( getContainer() ); + DDLParams.setPos( TBox2->position().x + TBox2->size().width(), TBox2->position().y ); + DDLParams.setSize( getContainer()->size().width() - mButtonCancel->size().width() - DDLParams.Pos.x - 20, 22 ); DDLParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_ANCHOR_LEFT | UI_ANCHOR_RIGHT | UI_AUTO_SIZE; DDLParams.PopUpToMainControl = true; mFiletype = eeNew( UIDropDownList, ( DDLParams ) ); diff --git a/src/eepp/ui/uicomplexcontrol.cpp b/src/eepp/ui/uicomplexcontrol.cpp index 6b024b2f8..36b871b83 100644 --- a/src/eepp/ui/uicomplexcontrol.cpp +++ b/src/eepp/ui/uicomplexcontrol.cpp @@ -95,7 +95,7 @@ void UIComplexControl::createTooltip() { mTooltip->enabled( false ); } else { UITooltip::CreateParams Params; - Params.Parent( UIManager::instance()->mainControl() ); + Params.setParent( UIManager::instance()->mainControl() ); Params.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_AUTO_PADDING | UI_AUTO_SIZE; mTooltip = eeNew( UITooltip, ( Params, this ) ); } diff --git a/src/eepp/ui/uidefaulttheme.cpp b/src/eepp/ui/uidefaulttheme.cpp index 683a81456..42eba358c 100644 --- a/src/eepp/ui/uidefaulttheme.cpp +++ b/src/eepp/ui/uidefaulttheme.cpp @@ -20,9 +20,9 @@ UIdefaultTheme::UIdefaultTheme( const std::string& Name, const std::string& Abbr UIPopUpMenu * UIdefaultTheme::createPopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIPopUpMenu::CreateParams MenuParams; - MenuParams.Parent( Parent ); - MenuParams.PosSet( Pos ); - MenuParams.SizeSet( Size ); + MenuParams.setParent( Parent ); + MenuParams.setPos( Pos ); + MenuParams.setSize( Size ); MenuParams.Flags = Flags; MenuParams.RowHeight = RowHeight; MenuParams.PaddingContainer = PaddingContainer; @@ -42,9 +42,9 @@ UIPopUpMenu * UIdefaultTheme::createPopUpMenu( UIControl * Parent, const Sizei& UIProgressBar * UIdefaultTheme::createProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { UIProgressBar::CreateParams PBParams; - PBParams.Parent( Parent ); - PBParams.PosSet( Pos ); - PBParams.SizeSet( Size ); + PBParams.setParent( Parent ); + PBParams.setPos( Pos ); + PBParams.setSize( Size ); PBParams.Flags = Flags; PBParams.DisplayPercent = DisplayPercent; PBParams.VerticalExpand = VerticalExpand; @@ -67,9 +67,9 @@ UIProgressBar * UIdefaultTheme::createProgressBar( UIControl * Parent, const Siz UIWinMenu * UIdefaultTheme::createWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { UIWinMenu::CreateParams WinMenuParams; - WinMenuParams.Parent( Parent ); - WinMenuParams.PosSet( Pos ); - WinMenuParams.SizeSet( Size ); + WinMenuParams.setParent( Parent ); + WinMenuParams.setPos( Pos ); + WinMenuParams.setSize( Size ); WinMenuParams.Flags = Flags; WinMenuParams.MarginBetweenButtons = MarginBetweenButtons; WinMenuParams.ButtonMargin = ButtonMargin; @@ -88,9 +88,9 @@ UIWinMenu * UIdefaultTheme::createWinMenu( UIControl * Parent, const Sizei& Size UIWindow * UIdefaultTheme::createWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIWindow::CreateParams WinParams; - WinParams.Parent( Parent ); - WinParams.PosSet( Pos ); - WinParams.SizeSet( Size ); + WinParams.setParent( Parent ); + WinParams.setPos( Pos ); + WinParams.setSize( Size ); WinParams.Flags = Flags; WinParams.WinFlags = WinFlags; WinParams.MinWindowSize = MinWindowSize; @@ -108,9 +108,9 @@ UIWindow * UIdefaultTheme::createWindow( UIControl * Parent, const Sizei& Size, UICommonDialog * UIdefaultTheme::createCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { UICommonDialog::CreateParams DLGParams; - DLGParams.Parent( Parent ); - DLGParams.PosSet( Pos ); - DLGParams.SizeSet( Size ); + DLGParams.setParent( Parent ); + DLGParams.setPos( Pos ); + DLGParams.setSize( Size ); DLGParams.Flags = Flags; DLGParams.WinFlags = WinFlags; DLGParams.MinWindowSize = MinWindowSize; @@ -131,9 +131,9 @@ UICommonDialog * UIdefaultTheme::createCommonDialog( UIControl * Parent, const S UIMessageBox * UIdefaultTheme::createMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIMessageBox::CreateParams MsgBoxParams; - MsgBoxParams.Parent( Parent ); - MsgBoxParams.PosSet( Pos ); - MsgBoxParams.SizeSet( Size ); + MsgBoxParams.setParent( Parent ); + MsgBoxParams.setPos( Pos ); + MsgBoxParams.setSize( Size ); MsgBoxParams.Flags = Flags; MsgBoxParams.WinFlags = WinFlags; MsgBoxParams.MinWindowSize = MinWindowSize; @@ -153,9 +153,9 @@ UIMessageBox * UIdefaultTheme::createMessageBox( UI_MSGBOX_TYPE Type, const Stri UIComboBox * UIdefaultTheme::createComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIComboBox::CreateParams ComboParams; - ComboParams.Parent( Parent ); - ComboParams.PosSet( Pos ); - ComboParams.SizeSet( Size ); + ComboParams.setParent( Parent ); + ComboParams.setPos( Pos ); + ComboParams.setSize( Size ); ComboParams.Flags = Flags; ComboParams.MinNumVisibleItems = MinNumVisibleItems; ComboParams.PopUpToMainControl = PopUpToMainControl; @@ -173,9 +173,9 @@ UIComboBox * UIdefaultTheme::createComboBox( UIControl * Parent, const Sizei& Si UIDropDownList * UIdefaultTheme::createDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIDropDownList::CreateParams DDLParams; - DDLParams.Parent( Parent ); - DDLParams.PosSet( Pos ); - DDLParams.SizeSet( Size ); + DDLParams.setParent( Parent ); + DDLParams.setPos( Pos ); + DDLParams.setSize( Size ); DDLParams.Flags = Flags; DDLParams.MinNumVisibleItems = MinNumVisibleItems; DDLParams.PopUpToMainControl = PopUpToMainControl; @@ -193,9 +193,9 @@ UIDropDownList * UIdefaultTheme::createDropDownList( UIControl * Parent, const S UITabWidget * UIdefaultTheme::createTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { UITabWidget::CreateParams TabWidgetParams; - TabWidgetParams.Parent( Parent ); - TabWidgetParams.PosSet( Pos ); - TabWidgetParams.SizeSet( Size ); + TabWidgetParams.setParent( Parent ); + TabWidgetParams.setPos( Pos ); + TabWidgetParams.setSize( Size ); TabWidgetParams.Flags = Flags; TabWidgetParams.TabsClosable = TabsClosable; TabWidgetParams.SpecialBorderTabs = SpecialBorderTabs; @@ -222,9 +222,9 @@ UITabWidget * UIdefaultTheme::createTabWidget( UIControl *Parent, const Sizei &S UITooltip * UIdefaultTheme::createTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITooltip::CreateParams TooltipParams; - TooltipParams.Parent( Parent ); - TooltipParams.PosSet( Pos ); - TooltipParams.SizeSet( Size ); + TooltipParams.setParent( Parent ); + TooltipParams.setPos( Pos ); + TooltipParams.setSize( Size ); TooltipParams.Flags = Flags; if ( useDefaultThemeValues() ) { diff --git a/src/eepp/ui/uigenericgrid.cpp b/src/eepp/ui/uigenericgrid.cpp index c1698633d..1b2ff6605 100644 --- a/src/eepp/ui/uigenericgrid.cpp +++ b/src/eepp/ui/uigenericgrid.cpp @@ -29,8 +29,8 @@ UIGenericGrid::UIGenericGrid( const UIGenericGrid::CreateParams& Params ) : mCollumnsPos.resize( mCollumnsCount, 0 ); UIComplexControl::CreateParams CParams; - CParams.Parent( this ); - CParams.PosSet( mPadding.Left, mPadding.Top ); + CParams.setParent( this ); + CParams.setPos( mPadding.Left, mPadding.Top ); CParams.Size = Sizei( mSize.width() - mPadding.Right - mPadding.Left, mSize.height() - mPadding.Top - mPadding.Bottom ); CParams.Flags = Params.Flags; mContainer = eeNew( UIItemContainer , ( CParams ) ); @@ -41,14 +41,14 @@ UIGenericGrid::UIGenericGrid( const UIGenericGrid::CreateParams& Params ) : mFlags &= ~UI_CLIP_ENABLE; UIScrollBar::CreateParams ScrollBarP; - ScrollBarP.Parent ( this ); - ScrollBarP.PosSet ( mSize.width() - 15, 0 ); + ScrollBarP.setParent ( this ); + ScrollBarP.setPos ( mSize.width() - 15, 0 ); ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; ScrollBarP.Size = Sizei( 15, mSize.height() ); mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); - ScrollBarP.PosSet ( 0, mSize.height() - 15 ); + ScrollBarP.setPos ( 0, mSize.height() - 15 ); ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); diff --git a/src/eepp/ui/uilistbox.cpp b/src/eepp/ui/uilistbox.cpp index 2f66f0ed0..e4c695df6 100644 --- a/src/eepp/ui/uilistbox.cpp +++ b/src/eepp/ui/uilistbox.cpp @@ -36,8 +36,8 @@ UIListBox::UIListBox( UIListBox::CreateParams& Params ) : mFont = UIThemeManager::instance()->defaultFont(); UIControl::CreateParams CParams; - CParams.Parent( this ); - CParams.PosSet( mPaddingContainer.Left, mPaddingContainer.Top ); + CParams.setParent( this ); + CParams.setPos( mPaddingContainer.Left, mPaddingContainer.Top ); CParams.Size = Sizei( mSize.width() - mPaddingContainer.Right - mPaddingContainer.Left, mSize.height() - mPaddingContainer.Top - mPaddingContainer.Bottom ); CParams.Flags = Params.Flags; mContainer = eeNew( UIItemContainer, ( CParams ) ); @@ -48,15 +48,15 @@ UIListBox::UIListBox( UIListBox::CreateParams& Params ) : mFlags &= ~UI_CLIP_ENABLE; UIScrollBar::CreateParams ScrollBarP; - ScrollBarP.Parent( this ); + ScrollBarP.setParent( this ); ScrollBarP.Size = Sizei( 15, mSize.height() ); - ScrollBarP.PosSet( mSize.width() - 15, 0 ); + ScrollBarP.setPos( mSize.width() - 15, 0 ); ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); - ScrollBarP.PosSet( 0, mSize.height() - 15 ); + ScrollBarP.setPos( 0, mSize.height() - 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); @@ -168,7 +168,7 @@ Uint32 UIListBox::addListBoxItem( const String& Text ) { UIListBoxItem * UIListBox::createListBoxItem( const String& Name ) { UITextBox::CreateParams TextParams; - TextParams.Parent( mContainer ); + TextParams.setParent( mContainer ); TextParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT; TextParams.Font = mFont; TextParams.FontColor = mFontColor; diff --git a/src/eepp/ui/uimanager.cpp b/src/eepp/ui/uimanager.cpp index 2ed4c2cf7..842a114f4 100644 --- a/src/eepp/ui/uimanager.cpp +++ b/src/eepp/ui/uimanager.cpp @@ -49,9 +49,9 @@ void UIManager::init( Uint32 Flags, EE::Window::Window * window ) { mInit = true; UIWindow::CreateParams Params; - Params.Parent( NULL ); - Params.PosSet( 0, 0 ); - Params.SizeSet( Engine::instance()->getWidth(), Engine::instance()->getHeight() ); + Params.setParent( NULL ); + Params.setPos( 0, 0 ); + Params.setSize( Engine::instance()->getWidth(), Engine::instance()->getHeight() ); Params.Flags = UI_CONTROL_DEFAULT_FLAGS | UI_REPORT_SIZE_CHANGE_TO_CHILDS; Params.WinFlags = UI_WIN_NO_BORDER | UI_WIN_RESIZEABLE; Params.MinWindowSize = Sizei( 0, 0 ); diff --git a/src/eepp/ui/uimenu.cpp b/src/eepp/ui/uimenu.cpp index 0ea4ac39a..94b3256d9 100644 --- a/src/eepp/ui/uimenu.cpp +++ b/src/eepp/ui/uimenu.cpp @@ -53,7 +53,7 @@ void UIMenu::doAftersetTheme() { UIMenuItem * UIMenu::CreateMenuItem( const String& Text, SubTexture * Icon ) { UIMenuItem::CreateParams Params; - Params.Parent( this ); + Params.setParent( this ); Params.Font = mFont; Params.FontColor = mFontColor; Params.FontShadowColor = mFontShadowColor; @@ -86,7 +86,7 @@ Uint32 UIMenu::Add( const String& Text, SubTexture * Icon ) { UIMenuCheckBox * UIMenu::CreateMenuCheckBox( const String& Text, const bool &Active ) { UIMenuCheckBox::CreateParams Params; - Params.Parent( this ); + Params.setParent( this ); Params.Font = mFont; Params.FontColor = mFontColor; Params.FontShadowColor = mFontShadowColor; @@ -122,7 +122,7 @@ Uint32 UIMenu::AddCheckBox( const String& Text, const bool& Active ) { UIMenuSubMenu * UIMenu::CreateSubMenu( const String& Text, SubTexture * Icon, UIMenu * SubMenu ) { UIMenuSubMenu::CreateParams Params; - Params.Parent( this ); + Params.setParent( this ); Params.Font = mFont; Params.FontColor = mFontColor; Params.FontShadowColor = mFontShadowColor; @@ -222,8 +222,8 @@ void UIMenu::SetControlSize( UIControl * Control, const Uint32& Pos ) { Uint32 UIMenu::AddSeparator() { UISeparator::CreateParams Params; - Params.Parent( this ); - Params.PosSet( mPadding.Left, mPadding.Top + mNextPosY ); + Params.setParent( this ); + Params.setPos( mPadding.Left, mPadding.Top + mNextPosY ); Params.Size = Sizei( mSize.width() - mPadding.Left - mPadding.Right, 3 ); UISeparator * Control = eeNew( UISeparator, ( Params ) ); diff --git a/src/eepp/ui/uimenusubmenu.cpp b/src/eepp/ui/uimenusubmenu.cpp index 3633ecd8d..beccf8bcd 100644 --- a/src/eepp/ui/uimenusubmenu.cpp +++ b/src/eepp/ui/uimenusubmenu.cpp @@ -15,7 +15,7 @@ UIMenuSubMenu::UIMenuSubMenu( UIMenuSubMenu::CreateParams& Params ) : mCbId2( 0 ) { UIGfx::CreateParams GfxParams; - GfxParams.Parent( this ); + GfxParams.setParent( this ); GfxParams.SubTexture = NULL; GfxParams.Flags = UI_AUTO_SIZE; mArrow = eeNew( UIGfx, ( GfxParams ) ); diff --git a/src/eepp/ui/uimessagebox.cpp b/src/eepp/ui/uimessagebox.cpp index 14fbb5186..7425aebbd 100644 --- a/src/eepp/ui/uimessagebox.cpp +++ b/src/eepp/ui/uimessagebox.cpp @@ -13,9 +13,9 @@ UIMessageBox::UIMessageBox( const UIMessageBox::CreateParams& Params ) : if ( NULL == Theme ) { UIPushButton::CreateParams ButtonParams; - ButtonParams.Parent( getContainer() ); - ButtonParams.SizeSet( 90, 22 ); - ButtonParams.PosSet( getContainer()->size().width() - 96, getContainer()->size().height() - ButtonParams.Size.height() - 8 ); + ButtonParams.setParent( getContainer() ); + ButtonParams.setSize( 90, 22 ); + ButtonParams.setPos( getContainer()->size().width() - 96, getContainer()->size().height() - ButtonParams.Size.height() - 8 ); ButtonParams.Flags = UI_HALIGN_CENTER | UI_ANCHOR_RIGHT | UI_VALIGN_CENTER | UI_AUTO_SIZE; mButtonOK = eeNew( UIPushButton, ( ButtonParams ) ); mButtonOK->visible( true ); @@ -40,9 +40,9 @@ UIMessageBox::UIMessageBox( const UIMessageBox::CreateParams& Params ) : } UITextBox::CreateParams TxtParams; - TxtParams.Parent( getContainer() ); + TxtParams.setParent( getContainer() ); TxtParams.Flags = UI_CONTROL_DEFAULT_FLAGS_CENTERED | UI_ANCHOR_RIGHT | UI_ANCHOR_BOTTOM; - TxtParams.SizeSet( getContainer()->size().width(), mButtonOK->position().y ); + TxtParams.setSize( getContainer()->size().width(), mButtonOK->position().y ); mTextBox = eeNew( UITextBox, ( TxtParams ) ); mTextBox->visible( true ); diff --git a/src/eepp/ui/uiprogressbar.cpp b/src/eepp/ui/uiprogressbar.cpp index d7c5e8c02..faad8913a 100644 --- a/src/eepp/ui/uiprogressbar.cpp +++ b/src/eepp/ui/uiprogressbar.cpp @@ -14,9 +14,9 @@ UIProgressBar::UIProgressBar( const UIProgressBar::CreateParams& Params ) : { UITextBox::CreateParams TxtBoxParams = Params; - TxtBoxParams.Parent( this ); + TxtBoxParams.setParent( this ); TxtBoxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER; - TxtBoxParams.PosSet( 0, 0 ); + TxtBoxParams.setPos( 0, 0 ); mTextBox = eeNew( UITextBox, ( TxtBoxParams ) ); mTextBox->enabled( false ); diff --git a/src/eepp/ui/uipushbutton.cpp b/src/eepp/ui/uipushbutton.cpp index 43c61bfc6..c7f53ab5d 100644 --- a/src/eepp/ui/uipushbutton.cpp +++ b/src/eepp/ui/uipushbutton.cpp @@ -11,7 +11,7 @@ UIPushButton::UIPushButton( const UIPushButton::CreateParams& Params ) : mIconSpace( Params.IconHorizontalMargin ) { UIGfx::CreateParams GfxParams; - GfxParams.Parent( this ); + GfxParams.setParent( this ); GfxParams.SubTexture = Params.Icon; if ( Params.IconMinSize.x != 0 && Params.IconMinSize.y != 0 ) { @@ -32,7 +32,7 @@ UIPushButton::UIPushButton( const UIPushButton::CreateParams& Params ) : icon( Params.Icon ); UITextBox::CreateParams TxtParams = Params; - TxtParams.Parent( this ); + TxtParams.setParent( this ); TxtParams.Flags = HAlignGet( Params.Flags ) | VAlignGet( Params.Flags ); TxtParams.Font = Params.Font; TxtParams.FontColor = Params.FontColor; diff --git a/src/eepp/ui/uiradiobutton.cpp b/src/eepp/ui/uiradiobutton.cpp index 0bafc5c08..87d33c088 100644 --- a/src/eepp/ui/uiradiobutton.cpp +++ b/src/eepp/ui/uiradiobutton.cpp @@ -13,8 +13,8 @@ UIRadioButton::UIRadioButton( const UITextBox::CreateParams& Params ) : { UIControlAnim::CreateParams ButtonParams( Params ); - ButtonParams.Parent( this ); - ButtonParams.PosSet( Vector2i( 0, 0 ) ); + ButtonParams.setParent( this ); + ButtonParams.setPos( Vector2i( 0, 0 ) ); ButtonParams.Size = Sizei( 16, 16 ); mActiveButton = eeNew( UIControlAnim, ( ButtonParams ) ); diff --git a/src/eepp/ui/uiscrollbar.cpp b/src/eepp/ui/uiscrollbar.cpp index 16649fbe9..180890a97 100644 --- a/src/eepp/ui/uiscrollbar.cpp +++ b/src/eepp/ui/uiscrollbar.cpp @@ -9,7 +9,7 @@ UIScrollBar::UIScrollBar( const UIScrollBar::CreateParams& Params ) : { UIControlAnim::CreateParams CParams = Params; CParams.Size = Sizei( 16, 16 ); - CParams.Parent( this ); + CParams.setParent( this ); mBtnDown = eeNew( UIControlAnim, ( CParams ) ); mBtnUp = eeNew( UIControlAnim, ( CParams ) ); @@ -24,7 +24,7 @@ UIScrollBar::UIScrollBar( const UIScrollBar::CreateParams& Params ) : SParams.Blend = Params.Blend; SParams.Border = Params.Border; SParams.Flags = Params.Flags; - SParams.Parent( this ); + SParams.setParent( this ); SParams.Pos = Params.Pos; SParams.Size = Params.Size; SParams.VerticalSlider = Params.VerticalScrollBar; diff --git a/src/eepp/ui/uislider.cpp b/src/eepp/ui/uislider.cpp index 70b676901..fbff0d846 100644 --- a/src/eepp/ui/uislider.cpp +++ b/src/eepp/ui/uislider.cpp @@ -18,7 +18,7 @@ UISlider::UISlider( const UISlider::CreateParams& Params ) : mOnPosChange( false ) { UIControl::CreateParams BgParams; - BgParams.Parent( this ); + BgParams.setParent( this ); if ( !mVertical ) BgParams.Size = Sizei( mSize.width() - 16, 8 ); @@ -31,9 +31,9 @@ UISlider::UISlider( const UISlider::CreateParams& Params ) : mBackSlider->center(); UIDragable::CreateParams SlideParams; - SlideParams.Parent( this ); + SlideParams.setParent( this ); SlideParams.Size = Sizei( 16, 16 ); - SlideParams.PosSet( Vector2i( 0, 0 ) ); + SlideParams.setPos( Vector2i( 0, 0 ) ); mSlider = eeNew( Private::UISliderButton, ( SlideParams ) ); mSlider->enabled( true ); diff --git a/src/eepp/ui/uispinbox.cpp b/src/eepp/ui/uispinbox.cpp index eca78c5e2..5915b7d05 100644 --- a/src/eepp/ui/uispinbox.cpp +++ b/src/eepp/ui/uispinbox.cpp @@ -11,8 +11,8 @@ UISpinBox::UISpinBox( const UISpinBox::CreateParams& Params ) : mClickStep( 1.f ) { UITextInput::CreateParams InputParams( Params ); - InputParams.PosSet( 0, 0 ); - InputParams.Parent( this ); + InputParams.setPos( 0, 0 ); + InputParams.setParent( this ); if ( InputParams.Flags & UI_AUTO_SIZE ) InputParams.Flags &= ~UI_AUTO_SIZE; @@ -25,7 +25,7 @@ UISpinBox::UISpinBox( const UISpinBox::CreateParams& Params ) : mInput = eeNew( UITextInput, ( InputParams ) ); UIControlAnim::CreateParams BtnParams( Params ); - BtnParams.Parent( this ); + BtnParams.setParent( this ); BtnParams.Size = Sizei( 16, 16 ); if ( BtnParams.Flags & UI_CLIP_ENABLE ) diff --git a/src/eepp/ui/uitabwidget.cpp b/src/eepp/ui/uitabwidget.cpp index 79473e22b..1de1726c8 100644 --- a/src/eepp/ui/uitabwidget.cpp +++ b/src/eepp/ui/uitabwidget.cpp @@ -26,19 +26,19 @@ UITabWidget::UITabWidget( UITabWidget::CreateParams& Params ) : mTabSelectedIndex( eeINDEX_NOT_FOUND ) { UIComplexControl::CreateParams TabParams; - TabParams.Parent( this ); - TabParams.PosSet( 0, 0 ); + TabParams.setParent( this ); + TabParams.setPos( 0, 0 ); TabParams.Flags |= UI_CLIP_ENABLE | UI_ANCHOR_RIGHT; - TabParams.SizeSet( mSize.width(), mTabWidgetHeight ); + TabParams.setSize( mSize.width(), mTabWidgetHeight ); mTabContainer = eeNew( UIComplexControl, ( TabParams ) ); mTabContainer->visible( true ); mTabContainer->enabled( true ); UIComplexControl::CreateParams CtrlParams; - CtrlParams.Parent( this ); - CtrlParams.PosSet( 0, mTabWidgetHeight ); - CtrlParams.SizeSet( mSize.width(), mSize.height() - mTabWidgetHeight ); + CtrlParams.setParent( this ); + CtrlParams.setPos( 0, mTabWidgetHeight ); + CtrlParams.setSize( mSize.width(), mSize.height() - mTabWidgetHeight ); CtrlParams.Flags |= UI_CLIP_ENABLE | UI_ANCHOR_BOTTOM | UI_ANCHOR_RIGHT; mCtrlContainer = eeNew( UIComplexControl, ( CtrlParams ) ); @@ -193,7 +193,7 @@ void UITabWidget::orderTabs() { UITab * UITabWidget::createTab( const String& Text, UIControl * CtrlOwned, SubTexture * Icon ) { UITab::CreateParams Params; - Params.Parent( mTabContainer ); + Params.setParent( mTabContainer ); Params.Font = mFont; Params.FontColor = mFontColor; Params.FontShadowColor = mFontShadowColor; diff --git a/src/eepp/ui/uitextedit.cpp b/src/eepp/ui/uitextedit.cpp index b7eb9ce52..f3129c41b 100644 --- a/src/eepp/ui/uitextedit.cpp +++ b/src/eepp/ui/uitextedit.cpp @@ -29,7 +29,7 @@ UITextEdit::UITextEdit( UITextEdit::CreateParams& Params ) : extraFlags |= UI_ANCHOR_BOTTOM; UITextInput::CreateParams TIParams; - TIParams.Parent( this ); + TIParams.setParent( this ); TIParams.Size = mSize; TIParams.Flags = UI_VALIGN_TOP | UI_HALIGN_LEFT | UI_TEXT_SELECTION_ENABLED | extraFlags; TIParams.MaxLength = 1024 * 1024 * 10; @@ -50,15 +50,15 @@ UITextEdit::UITextEdit( UITextEdit::CreateParams& Params ) : mTextInput->addEventListener( UIEvent::EventOnCursorPosChange , cb::Make1( this, &UITextEdit::onCursorPosChange ) ); UIScrollBar::CreateParams ScrollBarP; - ScrollBarP.Parent( this ); - ScrollBarP.PosSet( mSize.width() - 15, 0 ); + ScrollBarP.setParent( this ); + ScrollBarP.setPos( mSize.width() - 15, 0 ); ScrollBarP.Size = Sizei( 15, mSize.height() ); ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; mVScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); mVScrollBar->value( 1 ); - ScrollBarP.PosSet( 0, mSize.height() - 15 ); + ScrollBarP.setPos( 0, mSize.height() - 15 ); ScrollBarP.Size = Sizei( mSize.width() - mVScrollBar->size().width(), 15 ); ScrollBarP.VerticalScrollBar = false; mHScrollBar = eeNew( UIScrollBar, ( ScrollBarP ) ); diff --git a/src/eepp/ui/uitheme.cpp b/src/eepp/ui/uitheme.cpp index df99e1786..4946f3346 100644 --- a/src/eepp/ui/uitheme.cpp +++ b/src/eepp/ui/uitheme.cpp @@ -426,9 +426,9 @@ SubTexture * UITheme::getIconByName( const std::string& name ) { UIGfx * UITheme::createGfx( SubTexture * SubTexture, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, ColorA SubTextureColor, EE_RENDER_MODE SubTextureRender ) { UIGfx::CreateParams GfxParams; - GfxParams.Parent( Parent ); - GfxParams.PosSet( Pos ); - GfxParams.SizeSet( Size ); + GfxParams.setParent( Parent ); + GfxParams.setPos( Pos ); + GfxParams.setSize( Size ); GfxParams.Flags = Flags; GfxParams.SubTexture = SubTexture; GfxParams.SubTextureColor = SubTextureColor; @@ -441,9 +441,9 @@ UIGfx * UITheme::createGfx( SubTexture * SubTexture, UIControl * Parent, const S UISprite * UITheme::createSprite( Sprite * Sprite, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DealloSprite, EE_RENDER_MODE SpriteRender ) { UISprite::CreateParams SpriteParams; - SpriteParams.Parent( Parent ); - SpriteParams.PosSet( Pos ); - SpriteParams.SizeSet( Size ); + SpriteParams.setParent( Parent ); + SpriteParams.setPos( Pos ); + SpriteParams.setSize( Size ); SpriteParams.Flags = Flags; SpriteParams.Sprite = Sprite; SpriteParams.SpriteRender = SpriteRender; @@ -456,9 +456,9 @@ UISprite * UITheme::createSprite( Sprite * Sprite, UIControl * Parent, const Siz UICheckBox * UITheme::createCheckBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UICheckBox::CreateParams CheckBoxParams; - CheckBoxParams.Parent( Parent ); - CheckBoxParams.PosSet( Pos ); - CheckBoxParams.SizeSet( Size ); + CheckBoxParams.setParent( Parent ); + CheckBoxParams.setPos( Pos ); + CheckBoxParams.setSize( Size ); CheckBoxParams.Flags = Flags; UICheckBox * Ctrl = eeNew( UICheckBox, ( CheckBoxParams ) ); Ctrl->visible( true ); @@ -468,9 +468,9 @@ UICheckBox * UITheme::createCheckBox( UIControl * Parent, const Sizei& Size, con UIRadioButton * UITheme::createRadioButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UIRadioButton::CreateParams RadioButtonParams; - RadioButtonParams.Parent( Parent ); - RadioButtonParams.PosSet( Pos ); - RadioButtonParams.SizeSet( Size ); + RadioButtonParams.setParent( Parent ); + RadioButtonParams.setPos( Pos ); + RadioButtonParams.setSize( Size ); RadioButtonParams.Flags = Flags; UIRadioButton * Ctrl = eeNew( UIRadioButton, ( RadioButtonParams ) ); Ctrl->visible( true ); @@ -480,9 +480,9 @@ UIRadioButton * UITheme::createRadioButton( UIControl * Parent, const Sizei& Siz UITextBox * UITheme::createTextBox( const String& Text, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITextBox::CreateParams TextBoxParams; - TextBoxParams.Parent( Parent ); - TextBoxParams.PosSet( Pos ); - TextBoxParams.SizeSet( Size ); + TextBoxParams.setParent( Parent ); + TextBoxParams.setPos( Pos ); + TextBoxParams.setSize( Size ); TextBoxParams.Flags = Flags; UITextBox * Ctrl = eeNew( UITextBox, ( TextBoxParams ) ); Ctrl->visible( true ); @@ -493,9 +493,9 @@ UITextBox * UITheme::createTextBox( const String& Text, UIControl * Parent, cons UITooltip * UITheme::createTooltip( UIControl * TooltipOf, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags ) { UITooltip::CreateParams TooltipParams; - TooltipParams.Parent( Parent ); - TooltipParams.PosSet( Pos ); - TooltipParams.SizeSet( Size ); + TooltipParams.setParent( Parent ); + TooltipParams.setPos( Pos ); + TooltipParams.setSize( Size ); TooltipParams.Flags = Flags; UITooltip * Ctrl = eeNew( UITooltip, ( TooltipParams, TooltipOf ) ); Ctrl->visible( true ); @@ -505,9 +505,9 @@ UITooltip * UITheme::createTooltip( UIControl * TooltipOf, UIControl * Parent, c UITextEdit * UITheme::createTextEdit( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, UI_SCROLLBAR_MODE HScrollBar, UI_SCROLLBAR_MODE VScrollBar, bool WordWrap ) { UITextEdit::CreateParams TextEditParams; - TextEditParams.Parent( Parent ); - TextEditParams.PosSet( Pos ); - TextEditParams.SizeSet( Size ); + TextEditParams.setParent( Parent ); + TextEditParams.setPos( Pos ); + TextEditParams.setSize( Size ); TextEditParams.Flags = Flags; TextEditParams.HScrollBar = HScrollBar; TextEditParams.VScrollBar = VScrollBar; @@ -520,9 +520,9 @@ UITextEdit * UITheme::createTextEdit( UIControl * Parent, const Sizei& Size, con UITextInput * UITheme::createTextInput( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { UITextInput::CreateParams TextInputParams; - TextInputParams.Parent( Parent ); - TextInputParams.PosSet( Pos ); - TextInputParams.SizeSet( Size ); + TextInputParams.setParent( Parent ); + TextInputParams.setPos( Pos ); + TextInputParams.setSize( Size ); TextInputParams.Flags = Flags; TextInputParams.SupportFreeEditing = SupportFreeEditing; TextInputParams.MaxLength = MaxLength; @@ -534,9 +534,9 @@ UITextInput * UITheme::createTextInput( UIControl * Parent, const Sizei& Size, c UITextInputPassword * UITheme::createTextInputPassword( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SupportFreeEditing, Uint32 MaxLength ) { UITextInput::CreateParams TextInputParams; - TextInputParams.Parent( Parent ); - TextInputParams.PosSet( Pos ); - TextInputParams.SizeSet( Size ); + TextInputParams.setParent( Parent ); + TextInputParams.setPos( Pos ); + TextInputParams.setSize( Size ); TextInputParams.Flags = Flags; TextInputParams.SupportFreeEditing = SupportFreeEditing; TextInputParams.MaxLength = MaxLength; @@ -548,9 +548,9 @@ UITextInputPassword * UITheme::createTextInputPassword( UIControl * Parent, cons UISpinBox * UITheme::createSpinBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Float DefaultValue, bool AllowDotsInNumbers ) { UISpinBox::CreateParams SpinBoxParams; - SpinBoxParams.Parent( Parent ); - SpinBoxParams.PosSet( Pos ); - SpinBoxParams.SizeSet( Size ); + SpinBoxParams.setParent( Parent ); + SpinBoxParams.setPos( Pos ); + SpinBoxParams.setSize( Size ); SpinBoxParams.Flags = Flags; SpinBoxParams.DefaultValue = DefaultValue; SpinBoxParams.AllowDotsInNumbers = AllowDotsInNumbers; @@ -562,9 +562,9 @@ UISpinBox * UITheme::createSpinBox( UIControl * Parent, const Sizei& Size, const UIScrollBar * UITheme::createScrollBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalScrollBar ) { UIScrollBar::CreateParams ScrollBarParams; - ScrollBarParams.Parent( Parent ); - ScrollBarParams.PosSet( Pos ); - ScrollBarParams.SizeSet( Size ); + ScrollBarParams.setParent( Parent ); + ScrollBarParams.setPos( Pos ); + ScrollBarParams.setSize( Size ); ScrollBarParams.Flags = Flags; ScrollBarParams.VerticalScrollBar = VerticalScrollBar; UIScrollBar * Ctrl = eeNew( UIScrollBar, ( ScrollBarParams ) ); @@ -575,9 +575,9 @@ UIScrollBar * UITheme::createScrollBar( UIControl * Parent, const Sizei& Size, c UISlider * UITheme::createSlider( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool VerticalSlider, bool AllowHalfSliderOut, bool ExpandBackground ) { UISlider::CreateParams SliderParams; - SliderParams.Parent( Parent ); - SliderParams.PosSet( Pos ); - SliderParams.SizeSet( Size ); + SliderParams.setParent( Parent ); + SliderParams.setPos( Pos ); + SliderParams.setSize( Size ); SliderParams.Flags = Flags; SliderParams.VerticalSlider = VerticalSlider; SliderParams.AllowHalfSliderOut = AllowHalfSliderOut; @@ -590,9 +590,9 @@ UISlider * UITheme::createSlider( UIControl * Parent, const Sizei& Size, const V UIComboBox * UITheme::createComboBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIComboBox::CreateParams ComboParams; - ComboParams.Parent( Parent ); - ComboParams.PosSet( Pos ); - ComboParams.SizeSet( Size ); + ComboParams.setParent( Parent ); + ComboParams.setPos( Pos ); + ComboParams.setSize( Size ); ComboParams.Flags = Flags; ComboParams.MinNumVisibleItems = MinNumVisibleItems; ComboParams.PopUpToMainControl = PopUpToMainControl; @@ -605,9 +605,9 @@ UIComboBox * UITheme::createComboBox( UIControl * Parent, const Sizei& Size, con UIDropDownList * UITheme::createDropDownList( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MinNumVisibleItems, bool PopUpToMainControl, UIListBox * ListBox ) { UIDropDownList::CreateParams DDLParams; - DDLParams.Parent( Parent ); - DDLParams.PosSet( Pos ); - DDLParams.SizeSet( Size ); + DDLParams.setParent( Parent ); + DDLParams.setPos( Pos ); + DDLParams.setSize( Size ); DDLParams.Flags = Flags; DDLParams.MinNumVisibleItems = MinNumVisibleItems; DDLParams.PopUpToMainControl = PopUpToMainControl; @@ -620,9 +620,9 @@ UIDropDownList * UITheme::createDropDownList( UIControl * Parent, const Sizei& S UIListBox * UITheme::createListBox( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool SmoothScroll, Uint32 RowHeight, UI_SCROLLBAR_MODE VScrollMode, UI_SCROLLBAR_MODE HScrollMode, Recti PaddingContainer ) { UIListBox::CreateParams LBParams; - LBParams.Parent( Parent ); - LBParams.PosSet( Pos ); - LBParams.SizeSet( Size ); + LBParams.setParent( Parent ); + LBParams.setPos( Pos ); + LBParams.setSize( Size ); LBParams.Flags = Flags; LBParams.SmoothScroll = SmoothScroll; LBParams.RowHeight = RowHeight; @@ -637,9 +637,9 @@ UIListBox * UITheme::createListBox( UIControl * Parent, const Sizei& Size, const UIMenu * UITheme::createMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIMenu::CreateParams MenuParams; - MenuParams.Parent( Parent ); - MenuParams.PosSet( Pos ); - MenuParams.SizeSet( Size ); + MenuParams.setParent( Parent ); + MenuParams.setPos( Pos ); + MenuParams.setSize( Size ); MenuParams.Flags = Flags; MenuParams.RowHeight = RowHeight; MenuParams.PaddingContainer = PaddingContainer; @@ -655,9 +655,9 @@ UIMenu * UITheme::createMenu( UIControl * Parent, const Sizei& Size, const Vecto UIPopUpMenu * UITheme::createPopUpMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 RowHeight, Recti PaddingContainer, Uint32 MinWidth, Uint32 MinSpaceForIcons, Uint32 MinRightMargin ) { UIPopUpMenu::CreateParams MenuParams; - MenuParams.Parent( Parent ); - MenuParams.PosSet( Pos ); - MenuParams.SizeSet( Size ); + MenuParams.setParent( Parent ); + MenuParams.setPos( Pos ); + MenuParams.setSize( Size ); MenuParams.Flags = Flags; MenuParams.RowHeight = RowHeight; MenuParams.PaddingContainer = PaddingContainer; @@ -669,9 +669,9 @@ UIPopUpMenu * UITheme::createPopUpMenu( UIControl * Parent, const Sizei& Size, c UIProgressBar * UITheme::createProgressBar( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, bool DisplayPercent, bool VerticalExpand, Vector2f MovementSpeed, Rectf FillerMargin ) { UIProgressBar::CreateParams PBParams; - PBParams.Parent( Parent ); - PBParams.PosSet( Pos ); - PBParams.SizeSet( Size ); + PBParams.setParent( Parent ); + PBParams.setPos( Pos ); + PBParams.setSize( Size ); PBParams.Flags = Flags; PBParams.DisplayPercent = DisplayPercent; PBParams.VerticalExpand = VerticalExpand; @@ -686,9 +686,9 @@ UIProgressBar * UITheme::createProgressBar( UIControl * Parent, const Sizei& Siz UIPushButton * UITheme::createPushButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { UIPushButton::CreateParams ButtonParams; - ButtonParams.Parent( Parent ); - ButtonParams.PosSet( Pos ); - ButtonParams.SizeSet( Size ); + ButtonParams.setParent( Parent ); + ButtonParams.setPos( Pos ); + ButtonParams.setSize( Size ); ButtonParams.Flags = Flags; ButtonParams.Icon = Icon; ButtonParams.IconHorizontalMargin = IconHorizontalMargin; @@ -705,9 +705,9 @@ UIPushButton * UITheme::createPushButton( UIControl * Parent, const Sizei& Size, UISelectButton * UITheme::createSelectButton( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, SubTexture * Icon, Int32 IconHorizontalMargin, bool IconAutoMargin ) { UIPushButton::CreateParams ButtonParams; - ButtonParams.Parent( Parent ); - ButtonParams.PosSet( Pos ); - ButtonParams.SizeSet( Size ); + ButtonParams.setParent( Parent ); + ButtonParams.setPos( Pos ); + ButtonParams.setSize( Size ); ButtonParams.Flags = Flags; ButtonParams.Icon = Icon; ButtonParams.IconHorizontalMargin = IconHorizontalMargin; @@ -724,9 +724,9 @@ UISelectButton * UITheme::createSelectButton( UIControl * Parent, const Sizei& S UIWinMenu * UITheme::createWinMenu( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 MarginBetweenButtons, Uint32 ButtonMargin, Uint32 MenuHeight, Uint32 FirstButtonMargin ) { UIWinMenu::CreateParams WinMenuParams; - WinMenuParams.Parent( Parent ); - WinMenuParams.PosSet( Pos ); - WinMenuParams.SizeSet( Size ); + WinMenuParams.setParent( Parent ); + WinMenuParams.setPos( Pos ); + WinMenuParams.setSize( Size ); WinMenuParams.Flags = Flags; WinMenuParams.MarginBetweenButtons = MarginBetweenButtons; WinMenuParams.ButtonMargin = ButtonMargin; @@ -741,9 +741,9 @@ UIWinMenu * UITheme::createWinMenu( UIControl * Parent, const Sizei& Size, const UIWindow * UITheme::createWindow( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIWindow::CreateParams WinParams; - WinParams.Parent( Parent ); - WinParams.PosSet( Pos ); - WinParams.SizeSet( Size ); + WinParams.setParent( Parent ); + WinParams.setPos( Pos ); + WinParams.setSize( Size ); WinParams.Flags = Flags; WinParams.WinFlags = WinFlags; WinParams.MinWindowSize = MinWindowSize; @@ -753,9 +753,9 @@ UIWindow * UITheme::createWindow( UIControl * Parent, const Sizei& Size, const V UICommonDialog * UITheme::createCommonDialog( UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Uint32 WinFlags, Sizei MinWindowSize, Uint8 BaseAlpha, Uint32 CDLFlags, std::string DefaultFilePattern, std::string DefaultDirectory ) { UICommonDialog::CreateParams DLGParams; - DLGParams.Parent( Parent ); - DLGParams.PosSet( Pos ); - DLGParams.SizeSet( Size ); + DLGParams.setParent( Parent ); + DLGParams.setPos( Pos ); + DLGParams.setSize( Size ); DLGParams.Flags = Flags; DLGParams.WinFlags = WinFlags; DLGParams.MinWindowSize = MinWindowSize; @@ -768,9 +768,9 @@ UICommonDialog * UITheme::createCommonDialog( UIControl * Parent, const Sizei& S UIMessageBox * UITheme::createMessageBox( UI_MSGBOX_TYPE Type, const String& Message, Uint32 WinFlags, UIControl * Parent, const Sizei& Size, const Vector2i& Pos, const Uint32& Flags, Sizei MinWindowSize, Uint8 BaseAlpha ) { UIMessageBox::CreateParams MsgBoxParams; - MsgBoxParams.Parent( Parent ); - MsgBoxParams.PosSet( Pos ); - MsgBoxParams.SizeSet( Size ); + MsgBoxParams.setParent( Parent ); + MsgBoxParams.setPos( Pos ); + MsgBoxParams.setSize( Size ); MsgBoxParams.Flags = Flags; MsgBoxParams.WinFlags = WinFlags; MsgBoxParams.MinWindowSize = MinWindowSize; @@ -782,9 +782,9 @@ UIMessageBox * UITheme::createMessageBox( UI_MSGBOX_TYPE Type, const String& Mes UITabWidget * UITheme::createTabWidget( UIControl *Parent, const Sizei &Size, const Vector2i &Pos, const Uint32 &Flags, const bool &TabsClosable, const bool &SpecialBorderTabs, const Int32 &TabSeparation, const Uint32 &MaxTextLength, const Uint32 &TabWidgetHeight, const Uint32 &TabTextAlign, const Uint32 &MinTabWidth, const Uint32 &MaxTabWidth ) { UITabWidget::CreateParams TabWidgetParams; - TabWidgetParams.Parent( Parent ); - TabWidgetParams.PosSet( Pos ); - TabWidgetParams.SizeSet( Size ); + TabWidgetParams.setParent( Parent ); + TabWidgetParams.setPos( Pos ); + TabWidgetParams.setSize( Size ); TabWidgetParams.Flags = Flags; TabWidgetParams.TabsClosable = TabsClosable; TabWidgetParams.SpecialBorderTabs = SpecialBorderTabs; diff --git a/src/eepp/ui/uiwindow.cpp b/src/eepp/ui/uiwindow.cpp index d2b1bfbc9..699ff67e9 100644 --- a/src/eepp/ui/uiwindow.cpp +++ b/src/eepp/ui/uiwindow.cpp @@ -28,7 +28,7 @@ UIWindow::UIWindow( const UIWindow::CreateParams& Params ) : UIManager::instance()->windowAdd( this ); UIComplexControl::CreateParams tcParams; - tcParams.Parent( this ); + tcParams.setParent( this ); tcParams.Flags |= UI_REPORT_SIZE_CHANGE_TO_CHILDS; mContainer = eeNew( UIComplexControl, ( tcParams ) ); @@ -39,7 +39,7 @@ UIWindow::UIWindow( const UIWindow::CreateParams& Params ) : if ( !( mWinFlags & UI_WIN_NO_BORDER ) ) { UIControlAnim::CreateParams tParams; - tParams.Parent( this ); + tParams.setParent( this ); mWindowDecoration = eeNew( UIControlAnim, ( tParams ) ); mWindowDecoration->visible( true ); @@ -61,7 +61,7 @@ UIWindow::UIWindow( const UIWindow::CreateParams& Params ) : mContainer->dragEnable( true ); UIComplexControl::CreateParams ButtonParams; - ButtonParams.Parent( this ); + ButtonParams.setParent( this ); if ( mWinFlags & UI_WIN_CLOSE_BUTTON ) { mButtonClose = eeNew( UIComplexControl, ( ButtonParams ) ); @@ -788,7 +788,7 @@ const Uint8& UIWindow::baseAlpha() const { void UIWindow::title( const String& Text ) { if ( NULL == mTitle ) { UITextBox::CreateParams Params; - Params.Parent( this ); + Params.setParent( this ); Params.Flags = UI_CLIP_ENABLE | UI_VALIGN_CENTER; Params.FontColor = mTitleFontColor; diff --git a/src/eepp/ui/uiwinmenu.cpp b/src/eepp/ui/uiwinmenu.cpp index 5fd05ddf7..66709a4c4 100644 --- a/src/eepp/ui/uiwinmenu.cpp +++ b/src/eepp/ui/uiwinmenu.cpp @@ -43,7 +43,7 @@ void UIWinMenu::addMenuButton( const String& ButtonText, UIPopUpMenu * Menu ) { eeASSERT( NULL != Menu ); UISelectButton::CreateParams ButtonParams; - ButtonParams.Parent( this ); + ButtonParams.setParent( this ); ButtonParams.Flags = UI_HALIGN_CENTER | UI_VALIGN_CENTER; if ( mFlags & UI_DRAW_SHADOW ) diff --git a/src/test/eetest.cpp b/src/test/eetest.cpp index fe130a94c..a82d1870a 100644 --- a/src/test/eetest.cpp +++ b/src/test/eetest.cpp @@ -284,7 +284,7 @@ void EETest::CreateUI() { Params.Flags &= ~UI_CLIP_ENABLE; Params.Background.corners(0); Params.Background.colors( ColorA( 0x00FF0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00CC0077 ), ColorA( 0x00FF0077 ) ); - Params.Parent( C ); + Params.setParent( C ); Params.Size = Sizei( 50, 50 ); UITest * Child = eeNew( UITest, ( Params ) ); Child->position( 240, 130 ); @@ -294,7 +294,7 @@ void EETest::CreateUI() { Child->rotationInterpolation()->loop( true ); Params.Background.colors( ColorA( 0xFFFF0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xCCCC0077 ), ColorA( 0xFFFF0077 ) ); - Params.Parent( Child ); + Params.setParent( Child ); Params.Size = Sizei( 25, 25 ); UITest * Child2 = eeNew( UITest, ( Params ) ); Child2->position( 15, 15 ); @@ -306,8 +306,8 @@ void EETest::CreateUI() { mTheme->createSprite( eeNew( Sprite, ( "gn" ) ), C, Sizei(), Vector2i( 160, 100 ) ); UITextBox::CreateParams TextParams; - TextParams.Parent( C ); - TextParams.PosSet( 0, 0 ); + TextParams.setParent( C ); + TextParams.setPos( 0, 0 ); TextParams.Size = Sizei( 320, 240 ); TextParams.Flags = UI_VALIGN_TOP | UI_HALIGN_RIGHT; UITextBox * Text = eeNew( UITextBox, ( TextParams ) ); @@ -316,8 +316,8 @@ void EETest::CreateUI() { Text->text( "Turn around\nJust Turn Around\nAround!" ); UITextInput::CreateParams InputParams; - InputParams.Parent( C ); - InputParams.PosSet( 20, 216 ); + InputParams.setParent( C ); + InputParams.setPos( 20, 216 ); InputParams.Size = Sizei( 200, 22 ); InputParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TEXT_SELECTION_ENABLED; UITextInput * Input = eeNew( UITextInput, ( InputParams ) ); @@ -325,9 +325,9 @@ void EETest::CreateUI() { Input->enabled( true ); UIPushButton::CreateParams ButtonParams; - ButtonParams.Parent( C ); + ButtonParams.setParent( C ); ButtonParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_CENTER | UI_AUTO_SIZE; - ButtonParams.PosSet( 225, 216 ); + ButtonParams.setPos( 225, 216 ); ButtonParams.Size = Sizei( 90, 0 ); ButtonParams.SetIcon( mTheme->getIconByName( "ok" ) ); UIPushButton * Button = eeNew( UIPushButton, ( ButtonParams ) ); @@ -337,7 +337,7 @@ void EETest::CreateUI() { Button->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::ButtonClick ) ); Button->tooltipText( "Click and see what happens..." ); - TextParams.PosSet( 130, 20 ); + TextParams.setPos( 130, 20 ); TextParams.Size = Sizei( 80, 22 ); TextParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT; UICheckBox * Checkbox = eeNew( UICheckBox, ( TextParams ) ); @@ -345,42 +345,42 @@ void EETest::CreateUI() { Checkbox->text( "Check Me" ); Checkbox->enabled( true ); - TextParams.PosSet( 130, 40 ); + TextParams.setPos( 130, 40 ); UIRadioButton * RadioButton = eeNew( UIRadioButton, ( TextParams ) ); RadioButton->visible( true ); RadioButton->text( "Check Me" ); RadioButton->enabled( true ); - TextParams.PosSet( 130, 60 ); + TextParams.setPos( 130, 60 ); RadioButton = eeNew( UIRadioButton, ( TextParams ) ); RadioButton->visible( true ); RadioButton->text( "Check Me 2" ); RadioButton->enabled( true ); UISlider::CreateParams SliderParams; - SliderParams.Parent( C ); - SliderParams.PosSet( 220, 80 ); + SliderParams.setParent( C ); + SliderParams.setPos( 220, 80 ); SliderParams.Size = Sizei( 80, 24 ); mSlider = eeNew( UISlider, ( SliderParams ) ); mSlider->visible( true ); mSlider->enabled( true ); mSlider->addEventListener( UIEvent::EventOnValueChange, cb::Make1( this, &EETest::OnSliderValueChange ) ); - SliderParams.PosSet( 40, 110 ); + SliderParams.setPos( 40, 110 ); SliderParams.Size = Sizei( 24, 80 ); SliderParams.VerticalSlider = true; mSlider = eeNew( UISlider, ( SliderParams ) ); mSlider->visible( true ); mSlider->enabled( true ); - SliderParams.PosSet( 60, 110 ); + SliderParams.setPos( 60, 110 ); mSlider = eeNew( UISlider, ( SliderParams ) ); mSlider->visible( true ); mSlider->enabled( true ); UISpinBox::CreateParams SpinBoxParams; - SpinBoxParams.Parent( C ); - SpinBoxParams.PosSet( 80, 150 ); + SpinBoxParams.setParent( C ); + SpinBoxParams.setPos( 80, 150 ); SpinBoxParams.Size = Sizei( 80, 24 ); SpinBoxParams.Flags = UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_CLIP_ENABLE; SpinBoxParams.AllowDotsInNumbers = true; @@ -389,8 +389,8 @@ void EETest::CreateUI() { mSpinBox->enabled( true ); UIScrollBar::CreateParams ScrollBarP; - ScrollBarP.Parent( C ); - ScrollBarP.PosSet( 0, 0 ); + ScrollBarP.setParent( C ); + ScrollBarP.setPos( 0, 0 ); ScrollBarP.Size = Sizei( 15, 240 ); ScrollBarP.Flags = UI_AUTO_SIZE; ScrollBarP.VerticalScrollBar = true; @@ -401,14 +401,14 @@ void EETest::CreateUI() { mProgressBar = mTheme->createProgressBar( C, Sizei( 200, 20 ), Vector2i( 20, 190 ) ); - TextParams.PosSet( 20, 5 ); + TextParams.setPos( 20, 5 ); mTextBoxValue = eeNew( UITextBox, ( TextParams ) ); mTextBoxValue->visible( true ); OnValueChange( NULL ); UIListBox::CreateParams LBParams; - LBParams.Parent( C ); - LBParams.PosSet( 325, 8 ); + LBParams.setParent( C ); + LBParams.setPos( 325, 8 ); LBParams.Size = Sizei( 200, 240-16 ); LBParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_TOUCH_DRAG_ENABLED; // | UI_MULTI_SELECT mListBox = eeNew( UIListBox, ( LBParams ) ); @@ -427,8 +427,8 @@ void EETest::CreateUI() { } UIDropDownList::CreateParams DDLParams; - DDLParams.Parent( C ); - DDLParams.PosSet( 20, 55 ); + DDLParams.setParent( C ); + DDLParams.setPos( 20, 55 ); DDLParams.Size = Sizei( 100, 21 ); DDLParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_TOUCH_DRAG_ENABLED; UIDropDownList * mDropDownList = eeNew( UIDropDownList, ( DDLParams ) ); @@ -449,8 +449,8 @@ void EETest::CreateUI() { mDropDownList->getListBox()->setSelected( 0 ); UIComboBox::CreateParams ComboParams; - ComboParams.Parent( C ); - ComboParams.PosSet( 20, 80 ); + ComboParams.setParent( C ); + ComboParams.setPos( 20, 80 ); ComboParams.Size = Sizei( 100, 1 ); ComboParams.Flags = UI_CLIP_ENABLE | UI_AUTO_PADDING | UI_VALIGN_CENTER | UI_HALIGN_LEFT | UI_AUTO_SIZE | UI_TOUCH_DRAG_ENABLED | UI_TEXT_SELECTION_ENABLED; UIComboBox * mComboBox = eeNew( UIComboBox, ( ComboParams ) ); @@ -505,8 +505,8 @@ void EETest::CreateUI() { UIManager::instance()->mainControl()->addEventListener( UIEvent::EventMouseClick, cb::Make1( this, &EETest::MainClick ) ); UITextEdit::CreateParams TEParams; - TEParams.Parent( C ); - TEParams.PosSet( 5, 245 ); + TEParams.setParent( C ); + TEParams.setPos( 5, 245 ); TEParams.Size = Sizei( 315, 130 ); TEParams.Flags = UI_AUTO_PADDING | UI_CLIP_ENABLE | UI_TEXT_SELECTION_ENABLED; UITextEdit * TextEdit = eeNew( UITextEdit, ( TEParams ) ); @@ -515,9 +515,9 @@ void EETest::CreateUI() { TextEdit->text( mBuda ); UIGenericGrid::CreateParams GridParams; - GridParams.Parent( C ); - GridParams.PosSet( 325, 245 ); - GridParams.SizeSet( 200, 130 ); + GridParams.setParent( C ); + GridParams.setPos( 325, 245 ); + GridParams.setSize( 200, 130 ); GridParams.Flags = UI_AUTO_PADDING | UI_TOUCH_DRAG_ENABLED; GridParams.RowHeight = 24; GridParams.CollumnsCount = 3; @@ -526,7 +526,7 @@ void EETest::CreateUI() { mGenGrid->enabled( true ); UIGridCell::CreateParams CellParams; - CellParams.Parent( mGenGrid->getContainer() ); + CellParams.setParent( mGenGrid->getContainer() ); UITextBox::CreateParams TxtBoxParams; UITextInput::CreateParams TxtInputParams; @@ -764,7 +764,7 @@ void EETest::ButtonClick( const UIEvent * Event ) { if ( MouseEvent->getFlags() & EE_BUTTONS_LRM ) { UIGfx::CreateParams GfxParams; - GfxParams.Parent( UIManager::instance()->mainControl() ); + GfxParams.setParent( UIManager::instance()->mainControl() ); GfxParams.SubTexture = mTheme->getIconByName( "ok" ); UIGfx * Gfx = eeNew( UIGfx, ( GfxParams ) ); Gfx->visible( true );