expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: expvintl:master
Branches Tags
expvintl:master
expvintl:aswarm
expvintl:physx
expvintl:sourcevr
expvintl:bullshit
expvintl:ios
expvintl:new-sdk
expvintl:shaderapigl
expvintl:mathlib-optimize
expvintl:musl-port
expvintl:serverbrowser
expvintl:win64
expvintl:optimization
expvintl:dedicated-build-fix
expvintl:64bits
expvintl:sanitize
expvintl:ssdk2013
expvintl:windows
expvintl:ToGLES3
expvintl:misalign-fixes
expvintl:vpc-parser
expvintl:dedicated
expvintl:gameui
expvintl:android-fixes
expvintl:android
expvintl:1.16
expvintl:1.15
expvintl:1.14
expvintl:1.13
expvintl:1.12
expvintl:1.11
...
pull from: expvintl:64bits
Branches Tags
expvintl:master
expvintl:aswarm
expvintl:physx
expvintl:sourcevr
expvintl:bullshit
expvintl:ios
expvintl:new-sdk
expvintl:shaderapigl
expvintl:mathlib-optimize
expvintl:musl-port
expvintl:serverbrowser
expvintl:win64
expvintl:optimization
expvintl:dedicated-build-fix
expvintl:64bits
expvintl:sanitize
expvintl:ssdk2013
expvintl:windows
expvintl:ToGLES3
expvintl:misalign-fixes
expvintl:vpc-parser
expvintl:dedicated
expvintl:gameui
expvintl:android-fixes
expvintl:android
expvintl:1.16
expvintl:1.15
expvintl:1.14
expvintl:1.13
expvintl:1.12
expvintl:1.11

1 Commits
master ... 64bits

Author SHA1 Message Date
nillerusr
898716f600 game/client: make font size proportional 2022-06-19 15:17:06 +03:00
1 changed files with 7 additions and 5 deletions
Show Stats Expand all files Collapse all files

12
game/client/hud_closecaption.cpp
View File

@ -820,6 +820,8 @@ CHudCloseCaption::CHudCloseCaption( const char *pElementName )
vgui::Panel *pParent = g_pClientMode->GetViewport(); vgui::Panel *pParent = g_pClientMode->GetViewport();
SetParent( pParent ); SetParent( pParent );
SetProportional( true );
m_nGoalHeight = 0; m_nGoalHeight = 0;
m_nCurrentHeight = 0; m_nCurrentHeight = 0;
m_flGoalAlpha = 1.0f; m_flGoalAlpha = 1.0f;
@ -1575,17 +1577,17 @@ void CHudCloseCaption::CreateFonts( void )
{ {
vgui::IScheme *pScheme = vgui::scheme()->GetIScheme( GetScheme() ); vgui::IScheme *pScheme = vgui::scheme()->GetIScheme( GetScheme() );
m_hFonts[CCFONT_NORMAL] = pScheme->GetFont( "CloseCaption_Normal" ); m_hFonts[CCFONT_NORMAL] = pScheme->GetFont( "CloseCaption_Normal", true );
if ( IsPC() ) if ( IsPC() )
{ {
m_hFonts[CCFONT_BOLD] = pScheme->GetFont( "CloseCaption_Bold" ); m_hFonts[CCFONT_BOLD] = pScheme->GetFont( "CloseCaption_Bold", true );
m_hFonts[CCFONT_ITALIC] = pScheme->GetFont( "CloseCaption_Italic" ); m_hFonts[CCFONT_ITALIC] = pScheme->GetFont( "CloseCaption_Italic", true );
m_hFonts[CCFONT_ITALICBOLD] = pScheme->GetFont( "CloseCaption_BoldItalic" ); m_hFonts[CCFONT_ITALICBOLD] = pScheme->GetFont( "CloseCaption_BoldItalic", true );
} }
else else
{ {
m_hFonts[CCFONT_SMALL] = pScheme->GetFont( "CloseCaption_Small" ); m_hFonts[CCFONT_SMALL] = pScheme->GetFont( "CloseCaption_Small", true );
} }
m_nLineHeight = MAX( 6, vgui::surface()->GetFontTall( m_hFonts[ CCFONT_NORMAL ] ) ); m_nLineHeight = MAX( 6, vgui::surface()->GetFontTall( m_hFonts[ CCFONT_NORMAL ] ) );