MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-05 18:20:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with text commentary label bounds upon first display

Browse Source
This commit is contained in:
Blixibon 2021-07-24 18:29:14 -05:00
parent cc9f5ff7d6
commit 7fde10fef6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sp/src/game/client/c_point_commentary_node.cpp
View File

@ -123,7 +123,7 @@ private:
CPanelAnimationVarAliasType( int, m_iTypeTextT, "type_text_tall", "200", "proportional_int" ); CPanelAnimationVarAliasType( int, m_iTypeTextT, "type_text_tall", "200", "proportional_int" );
CPanelAnimationVarAliasType( int, m_iTypeTextCountXFR, "type_text_count_xpos_from_right", "10", "proportional_int" ); CPanelAnimationVarAliasType( int, m_iTypeTextCountXFR, "type_text_count_xpos_from_right", "10", "proportional_int" );
CPanelAnimationVarAliasType( int, m_iTypeTextCountYFB, "type_text_count_ypos_from_bottom", "10", "proportional_int" ); CPanelAnimationVarAliasType( int, m_iTypeTextCountYFB, "type_text_count_ypos_from_bottom", "10", "proportional_int" );
CPanelAnimationVar( Color, m_TextBackgroundColor, "BackgroundColorTextContent", "0 0 0 192" ); CPanelAnimationVar( Color, m_TextBackgroundColor, "BackgroundColorTextContent", "0 0 0 224" );
CPanelAnimationVar( Color, m_TypeTextContentColor, "TextContentColor", "255 230 180 255" ); CPanelAnimationVar( Color, m_TypeTextContentColor, "TextContentColor", "255 230 180 255" );
CPanelAnimationVar( int, m_iTextBorderSpace, "type_text_border_space", "8" ); CPanelAnimationVar( int, m_iTextBorderSpace, "type_text_border_space", "8" );
#endif #endif
@ -506,7 +506,7 @@ CHudCommentary::CHudCommentary( const char *name ) : vgui::Panel( NULL, "HudComm
m_bShouldPaint = true; m_bShouldPaint = true;
#ifdef MAPBASE #ifdef MAPBASE
m_pLabel = new vgui::Label( this, "HudCommentaryTextLabel", "" ); m_pLabel = new vgui::Label( this, "HudCommentaryTextLabel", L"Textual commentary" );
m_pImage = new vgui::ImagePanel( this, "HudCommentaryImagePanel" ); m_pImage = new vgui::ImagePanel( this, "HudCommentaryImagePanel" );
m_pImage->SetShouldScaleImage( true ); m_pImage->SetShouldScaleImage( true );
#endif #endif
@ -693,20 +693,17 @@ void CHudCommentary::PerformLayout()
int xOffset = m_iBarX; int xOffset = m_iBarX;
int yOffset = m_iBarY; int yOffset = m_iBarY;
int x, y, wide, tall; m_pLabel->SetBounds(
GetBounds( x, y, wide, tall ); xOffset + m_iTextBorderSpace, yOffset + m_iTextBorderSpace,
(float)(m_iBarWide * m_flPanelScale) - m_iTextBorderSpace, GetTall() );
// Figure out the size before setting bounds // Figure out the size before setting bounds
int lW, lT; int lW, lT;
m_pLabel->GetContentSize( lW, lT ); m_pLabel->GetContentSize( lW, lT );
lW = (float)(m_iBarWide * m_flPanelScale) - m_iTextBorderSpace;
//lT = (float)lT * m_flPanelScale; // Don't affect height when scaling //lT = (float)lT * m_flPanelScale; // Don't affect height when scaling
m_pLabel->SetBounds( m_pLabel->SetTall( lT );
xOffset + m_iTextBorderSpace,
yOffset + m_iTextBorderSpace,
lW, lT );
lW += (float)((m_iTextBorderSpace * 2) + (xOffset * 2)); lW += (float)((m_iTextBorderSpace * 2) + (xOffset * 2));
lT += (float)((m_iTextBorderSpace * 2) + (yOffset * 2)); lT += (float)((m_iTextBorderSpace * 2) + (yOffset * 2));