Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00
Code Activity

Sync with latest source-sdk-2013.

Browse Source
This commit is contained in:
Nicholas Hastings
2014-10-30 12:30:57 -04:00
parent 6abc7fddca
commit aa5841f220
407 changed files with 6784 additions and 10498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
vgui2/vgui_controls/ImagePanel.cpp
View File

@ -38,6 +38,7 @@ ImagePanel::ImagePanel(Panel *parent, const char *name) : Panel(parent, name)
m_bTileImage = false;
m_bTileHorizontally = false;
m_bTileVertically = false;
m_bPositionImage = true;
m_fScaleAmount = 0.0f;
m_FillColor = Color(0, 0, 0, 0);
m_DrawColor = Color(255,255,255,255);
@ -143,25 +144,28 @@ void ImagePanel::PaintBackground()
// HPE_END
//=============================================================================
if ( m_bCenterImage )
if ( m_bPositionImage )
{
int wide, tall;
GetSize(wide, tall);
int imageWide, imageTall;
m_pImage->GetSize( imageWide, imageTall );
if ( m_bScaleImage && m_fScaleAmount > 0.0f )
if ( m_bCenterImage )
{
imageWide = static_cast<int>( static_cast<float>(imageWide) * m_fScaleAmount );
imageTall = static_cast<int>( static_cast<float>(imageTall) * m_fScaleAmount );
}
int wide, tall;
GetSize(wide, tall);
m_pImage->SetPos( (wide - imageWide) / 2, (tall - imageTall) / 2 );
}
else
{
m_pImage->SetPos(0, 0);
int imageWide, imageTall;
m_pImage->GetSize( imageWide, imageTall );
if ( m_bScaleImage && m_fScaleAmount > 0.0f )
{
imageWide = static_cast<int>( static_cast<float>(imageWide) * m_fScaleAmount );
imageTall = static_cast<int>( static_cast<float>(imageTall) * m_fScaleAmount );
}
m_pImage->SetPos( (wide - imageWide) / 2, (tall - imageTall) / 2 );
}
else
{
m_pImage->SetPos(0, 0);
}
}
if (m_bScaleImage)
@ -217,7 +221,11 @@ void ImagePanel::PaintBackground()
if ( !m_bTileVertically )
break;
}
m_pImage->SetPos(0, 0);
if ( m_bPositionImage )
{
m_pImage->SetPos(0, 0);
}
}
else
{
@ -259,6 +267,7 @@ void ImagePanel::GetSettings(KeyValues *outResourceData)
outResourceData->SetString("border", GetBorder()->GetName());
}
outResourceData->GetInt("positionImage", m_bPositionImage );
outResourceData->SetInt("scaleImage", m_bScaleImage);
outResourceData->SetFloat("scaleAmount", m_fScaleAmount);
outResourceData->SetInt("tileImage", m_bTileImage);
@ -278,6 +287,7 @@ void ImagePanel::ApplySettings(KeyValues *inResourceData)
m_pszFillColorName = NULL;
m_pszDrawColorName = NULL; // HPE addition
m_bPositionImage = inResourceData->GetInt("positionImage", 1);
m_bScaleImage = inResourceData->GetInt("scaleImage", 0);
m_fScaleAmount = inResourceData->GetFloat("scaleAmount", 0.0f);
m_bTileImage = inResourceData->GetInt("tileImage", 0);