Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-11 17:17:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martí­n Lucas Golini
2017-02-24 22:20:18 -03:00
parent 8e514cdac0
commit 3a973788bb
5 changed files with 29 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eepp/gaming/mapeditor/mapeditor.cpp
View File

@@ -444,19 +444,11 @@ void MapEditor::CreateUIMap() {
Float ScrollV = 16;
if ( NULL != HScrollSkin ) {
SubTexture * tTex = HScrollSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tTex ) {
ScrollH = tTex->getSize().getHeight();
}
ScrollH = HScrollSkin->getSize().getHeight();
}
if ( NULL != VScrollSkin ) {
SubTexture * tTex = VScrollSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tTex ) {
ScrollV = tTex->getSize().getHeight();
}
ScrollV = VScrollSkin->getSize().getHeight();
}
UIComplexControl::CreateParams Params;

17
src/eepp/ui/uicheckbox.cpp
View File

@@ -75,27 +75,18 @@ void UICheckBox::setTheme( UITheme * Theme ) {
}
void UICheckBox::doAftersetTheme() {
SubTexture * tSubTexture = NULL;
UISkin * tSkin = mActiveButton->getSkin();
if ( tSkin ) {
tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tSubTexture ) {
mActiveButton->setPixelsSize( tSubTexture->getRealSize() );
mActiveButton->centerVertical();
}
mActiveButton->setPixelsSize( tSkin->getSize() );
mActiveButton->centerVertical();
}
tSkin = mInactiveButton->getSkin();
if ( NULL != tSkin ) {
tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tSubTexture ) {
mInactiveButton->setPixelsSize( tSubTexture->getRealSize() );
mInactiveButton->centerVertical();
}
mInactiveButton->setPixelsSize( tSkin->getSize() );
mInactiveButton->centerVertical();
}
setPadding( Recti(0,0,0,0) );

2
src/eepp/ui/uipushbutton.cpp
View File

@@ -70,7 +70,7 @@ void UIPushButton::onSizeChange() {
mTextBox->setPosition( 0, 0 );
}
mIcon->setPosition( mIconSpace, 0 );
mIcon->setPosition( pxToDpI( mIconSpace ), 0 );
mIcon->centerVertical();
if ( NULL != mTextBox ) {

17
src/eepp/ui/uiradiobutton.cpp
View File

@@ -76,27 +76,18 @@ void UIRadioButton::setTheme( UITheme * Theme ) {
mActiveButton->setThemeControl ( Theme, "radiobutton_active" );
mInactiveButton->setThemeControl( Theme, "radiobutton_inactive" );
SubTexture * tSubTexture = NULL;
UISkin * tSkin = mActiveButton->getSkin();
if ( tSkin ) {
tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tSubTexture ) {
mActiveButton->setPixelsSize( tSubTexture->getRealSize() );
mActiveButton->centerVertical();
}
mActiveButton->setPixelsSize( tSkin->getSize() );
mActiveButton->centerVertical();
}
tSkin = mInactiveButton->getSkin();
if ( NULL != tSkin ) {
tSubTexture = tSkin->getSubTexture( UISkinState::StateNormal );
if ( NULL != tSubTexture ) {
mInactiveButton->setPixelsSize( tSubTexture->getRealSize() );
mInactiveButton->centerVertical();
}
mInactiveButton->setPixelsSize( tSkin->getSize() );
mInactiveButton->centerVertical();
}
setPadding( Recti(0,0,0,0) );

40
src/eepp/ui/uiwinmenu.cpp
View File

@@ -124,33 +124,29 @@ void UIWinMenu::refreshButtons() {
Uint32 xpos = mFirstButtonMargin;
Int32 h = 0, th = 0, ycenter = 0;
if ( NULL != getSkin() ) {
SubTexture * subTexture = getSkin()->getSubTexture( UISkinState::StateNormal );
UISkin * skin = getSkin();
if ( NULL != subTexture ) {
h = subTexture->getSize().getHeight();
if ( NULL != skin ) {
h = skin->getSize().getHeight();
if ( mButtons.begin() != mButtons.end() ) {
UISelectButton * tbut = mButtons.begin()->first;
if ( mButtons.begin() != mButtons.end() ) {
UISelectButton * tbut = mButtons.begin()->first;
if ( NULL != tbut->getSkin() ) {
SubTexture * tSubTexture2 = tbut->getSkin()->getSubTexture( UISkinState::StateSelected );
skin = tbut->getSkin();
if ( NULL != tSubTexture2 ) {
th = tSubTexture2->getSize().getHeight();
if ( NULL != skin ) {
th = skin->getSize( UISkinState::StateSelected ).getHeight();
switch ( VAlignGet( getFlags() ) ) {
case UI_VALIGN_CENTER:
ycenter = ( h - th ) / 2;
break;
case UI_VALIGN_BOTTOM:
ycenter = ( h - th );
break;
case UI_VALIGN_TOP:
ycenter = 0;
break;
}
}
switch ( VAlignGet( getFlags() ) ) {
case UI_VALIGN_CENTER:
ycenter = ( h - th ) / 2;
break;
case UI_VALIGN_BOTTOM:
ycenter = ( h - th );
break;
case UI_VALIGN_TOP:
ycenter = 0;
break;
}
}
}