From 3a973788bbd6685ba814567fdfaf93054c8b9208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=AD=C2=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Fri, 24 Feb 2017 22:20:18 -0300
Subject: [PATCH] Some cleanup.

--HG--
branch : dev
---
 src/eepp/gaming/mapeditor/mapeditor.cpp | 12 ++------
 src/eepp/ui/uicheckbox.cpp              | 17 +++--------
 src/eepp/ui/uipushbutton.cpp            |  2 +-
 src/eepp/ui/uiradiobutton.cpp           | 17 +++--------
 src/eepp/ui/uiwinmenu.cpp               | 40 +++++++++++--------------
 5 files changed, 29 insertions(+), 59 deletions(-)

diff --git a/src/eepp/gaming/mapeditor/mapeditor.cpp b/src/eepp/gaming/mapeditor/mapeditor.cpp
index 53a47b76b..58f69cb7f 100644
--- a/src/eepp/gaming/mapeditor/mapeditor.cpp
+++ b/src/eepp/gaming/mapeditor/mapeditor.cpp
@@ -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;
diff --git a/src/eepp/ui/uicheckbox.cpp b/src/eepp/ui/uicheckbox.cpp
index f66c39bf4..6c579f1f7 100644
--- a/src/eepp/ui/uicheckbox.cpp
+++ b/src/eepp/ui/uicheckbox.cpp
@@ -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) );
diff --git a/src/eepp/ui/uipushbutton.cpp b/src/eepp/ui/uipushbutton.cpp
index f4d434dc2..507fef087 100644
--- a/src/eepp/ui/uipushbutton.cpp
+++ b/src/eepp/ui/uipushbutton.cpp
@@ -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 ) {
diff --git a/src/eepp/ui/uiradiobutton.cpp b/src/eepp/ui/uiradiobutton.cpp
index 2229c8b22..eaa36cf9c 100644
--- a/src/eepp/ui/uiradiobutton.cpp
+++ b/src/eepp/ui/uiradiobutton.cpp
@@ -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) );
diff --git a/src/eepp/ui/uiwinmenu.cpp b/src/eepp/ui/uiwinmenu.cpp
index 00c63e0db..cd7d2d8f9 100644
--- a/src/eepp/ui/uiwinmenu.cpp
+++ b/src/eepp/ui/uiwinmenu.cpp
@@ -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;
 				}
 			}
 		}