vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

VGUI: Misc tweaks I've come across when doing TW 1.3

Browse source
This commit is contained in:
Marco Cawthorne 2020-03-03 22:47:44 +01:00
parent d41026aed7
commit f3f2176fc7
10 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vgui/font.cpp
View file

@ -43,7 +43,7 @@ void Font_Load ( string strFile, font_s &fntNew )
string strTemp;
string strFontPath;
filestream fileFont = fopen( strFile, FILE_READ );
fntNew.iID = FONT_DEFAULT;
fntNew.iID = 0;
fntNew.iScale = 8;
fntNew.vecColor = '1 1 1';
fntNew.flAlpha = 1.0f;

2
src/vgui/include.src
View file

@ -1,4 +1,6 @@
#ifndef WASTES
#define CLASSIC_VGUI
#endif
#includelist
../vgui/font.cpp

3
src/vgui/ui_button.cpp
View file

@ -73,6 +73,7 @@ void CUIButton :: SetTitle ( string strName )
{
m_strTitle = strName;
m_strTitleActive = sprintf( "^3%s", m_strTitle );
drawfont = g_fntDefault.iID;
SetSize( [ stringwidth( m_strTitle, TRUE, [ g_fntDefault.iScale, g_fntDefault.iScale ] ) + 16, 24 ] );
}
void CUIButton :: SetIcon ( string strName )
@ -119,7 +120,7 @@ void CUIButton :: Draw ( void )
}
}
if ( m_strIcon ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin + '2 2', m_strIcon, '16 16', '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin + '2 2', m_strIcon, '16 16', '1 1 1', 1.0f, 0);
}
}

8
src/vgui/ui_checkbox.cpp
View file

@ -84,9 +84,9 @@ void CUICheckbox :: Draw ( void )
}
if ( m_iFlags & CHECKBOX_CHECKED ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_checked", '16 16', '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_checked", '16 16', '1 1 1', 1.0f, 0);
} else {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_emptybox", '16 16', '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_emptybox", '16 16', '1 1 1', 1.0f, 0);
}
#else
if ( m_iFlags & CHECKBOX_DOWN ) {
@ -97,9 +97,9 @@ void CUICheckbox :: Draw ( void )
}
if ( m_iFlags & CHECKBOX_CHECKED ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_checked", '16 16', m_vecColor, 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_checked", '16 16', m_vecColor, 1.0f, 0);
} else {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_emptybox", '16 16', m_vecColor, 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_emptybox", '16 16', m_vecColor, 1.0f, 0);
}
#endif
if ( m_strTitle ) {

6
src/vgui/ui_label.cpp
View file

@ -43,7 +43,11 @@ void CUILabel :: SetTitle ( string strName )
#else
m_strTitle = sprintf("%s%s", Font_RGBtoHex(UI_MAINCOLOR), strName);
#endif
SetSize( [ stringwidth( m_strTitle, TRUE, [ g_fntDefault.iScale, g_fntDefault.iScale ] ), 16 ] );
drawfont = g_fntDefault.iID;
/* hack, add 2 just to make sure it doesn't immediately wrap. bug
* in engines' textfield thing in combo with ttf. */
SetSize( [ 2 + stringwidth( m_strTitle, TRUE, [ g_fntDefault.iScale, g_fntDefault.iScale ] ), 16 ] );
}
void CUILabel :: Draw ( void )
{

2
src/vgui/ui_pic.cpp
View file

@ -45,7 +45,7 @@ void CUIPic :: CUIPic ( void )
void CUIPic :: Draw ( void )
{
if ( m_strImage ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, m_strImage, m_vecSize, '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, m_strImage, m_vecSize, '1 1 1', 1.0f, 0);
}
}

12
src/vgui/ui_radio.cpp
View file

@ -89,21 +89,21 @@ void CUIRadio :: Draw ( void )
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '1 1 1', 0.5f );
}
if ( m_iFlags & RADIO_ACTIVE ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', '1 1 1', 1.0f, 0);
} else {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', '1 1 1', 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', '1 1 1', 1.0f, 0);
}
#else
if ( m_iFlags & RADIO_DOWN ) {
drawfill( m_parent.m_vecOrigin + m_vecOrigin, [m_vecSize[0], 1], m_vecColor, 1.0f );
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ 0, m_vecSize[1] - 1], [m_vecSize[0], 1], m_vecColor, 1.0f );
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ 0, m_vecSize[1] - 1], [m_vecSize[0], 1], m_vecColor, 1.0f, 0);
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ 0, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f );
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f );
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f, 0);
}
if ( m_iFlags & RADIO_ACTIVE ) {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', m_vecColor, 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiosel", '16 16', m_vecColor, 1.0f, 0);
} else {
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', m_vecColor, 1.0f );
drawpic( m_parent.m_vecOrigin + m_vecOrigin, "textures/ui/steam/icon_radiounsel", '16 16', m_vecColor, 1.0f, 0);
}
#endif

10
src/vgui/ui_scrollbar.cpp
View file

@ -66,7 +66,7 @@ void CUIScrollbar :: Draw ( void )
vector vecSize = [ 20, m_iLength ];
#ifndef CLASSIC_VGUI
drawfill( m_parent.m_vecOrigin + m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha );
drawfill( m_parent.m_vecOrigin + m_vecOrigin, vecSize, m_vecColor, m_flAlpha );
if ( m_iFlags & BUTTON_DOWN ) {
drawfill( m_parent.m_vecOrigin + m_vecOrigin + [ 0, vecSize[1] - 1], [vecSize[0], 1], '1 1 1', 0.5f );
@ -120,7 +120,7 @@ void CUIScrollbar :: Draw ( void )
drawfill( vecUpPos + [ 0, 1], [1, 18], '1 1 1', 0.5f );
drawfill( vecUpPos + [ 19, 1], [1, 18], '0 0 0', 0.5f );
}
drawpic( vecUpPos + '2 2', "textures/ui/steam/icon_up", '16 16', '1 1 1', 1.0f );
drawpic( vecUpPos + '2 2', "textures/ui/steam/icon_up", '16 16', '1 1 1', 1.0f, 0);
#else
if ( m_iFlags & SCROLLBAR_UP_DOWN ) {
drawfill( vecUpPos, '20 20', m_vecColor, 0.25f );
@ -134,7 +134,7 @@ void CUIScrollbar :: Draw ( void )
drawfill( vecUpPos + [ 0, 1], [1, 18], m_vecColor, 1.0f );
drawfill( vecUpPos + [ 19, 1], [1, 18], m_vecColor, 1.0f );
}
drawpic( vecUpPos + '2 2', "textures/ui/steam/icon_up", '16 16', m_vecColor, 1.0f );
drawpic( vecUpPos + '2 2', "textures/ui/steam/icon_up", '16 16', m_vecColor, 1.0f, 0);
#endif
// Button DOWN
#ifndef CLASSIC_VGUI
@ -150,7 +150,7 @@ void CUIScrollbar :: Draw ( void )
drawfill( vecDownPos + [ 0, 1], [1, 18], '1 1 1', 0.5f );
drawfill( vecDownPos + [ 19, 1], [1, 18], '0 0 0', 0.5f );
}
drawpic( vecDownPos + '2 2', "textures/ui/steam/icon_down", '16 16', '1 1 1', 1.0f );
drawpic( vecDownPos + '2 2', "textures/ui/steam/icon_down", '16 16', '1 1 1', 1.0f, 0);
#else
if ( m_iFlags & SCROLLBAR_DN_DOWN ) {
drawfill( vecDownPos, '20 20', m_vecColor, 0.25f );
@ -164,7 +164,7 @@ void CUIScrollbar :: Draw ( void )
drawfill( vecDownPos + [ 0, 1], [1, 18], m_vecColor, 1.0f );
drawfill( vecDownPos + [ 19, 1], [1, 18], m_vecColor, 1.0f );
}
drawpic( vecDownPos + '2 2', "textures/ui/steam/icon_down", '16 16', m_vecColor, 1.0f );
drawpic( vecDownPos + '2 2', "textures/ui/steam/icon_down", '16 16', m_vecColor, 1.0f, 0);
#endif
}

8
src/vgui/ui_textbox.cpp
View file

@ -19,7 +19,7 @@ enumflags
TEXTBOX_VISIBLE,
TEXTBOX_HOVER,
TEXTBOX_DOWN,
TEXTBOX_FOCUS,
TEXTBOX_FOCUS
};
class CUITextBox : CUIWidget
@ -103,9 +103,13 @@ void CUITextBox :: Input ( float flEVType, float flKey, float flChar, float flDe
m_strText = substring( m_strText, 0, strlen( m_strText ) - 1 );
}
break;
case K_ENTER:
break;
default:
if ( m_iFlags & TEXTBOX_FOCUS ) {
m_strText = sprintf( "%s%s", m_strText, chr2str( flChar ) );
if ((flChar >= 48 && flChar <= 57) || (flChar >= 65 && flChar <= 90) || (flChar >= 97 && flChar <= 122)) {
m_strText = sprintf( "%s%s", m_strText, chr2str( flChar ) );
}
}
}
} else if ( flEVType == IE_KEYUP ) {

6
src/vgui/ui_window.cpp
View file

@ -173,7 +173,7 @@ void CUIWindow :: Draw ( void )
drawfill( m_vecOrigin + [ m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], m_vecColor, 1.0f );
if ( m_iFlags & WINDOW_CANRESIZE ) {
drawpic( m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', m_vecColor, 1.0f );
drawpic( m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', m_vecColor, 1.0f, 0);
}
#else
drawfill( m_vecOrigin, m_vecSize, m_vecColor, m_flAlpha );
@ -183,14 +183,14 @@ void CUIWindow :: Draw ( void )
drawfill( m_vecOrigin + [ m_vecSize[0] - 1, 1], [1, m_vecSize[1] - 2], '0 0 0', 0.5f );
if ( m_iFlags & WINDOW_CANRESIZE ) {
drawpic( m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', '1 1 1', 1.0f );
drawpic( m_vecOrigin + m_vecSize - '16 16', "textures/ui/steam/icon_resizer", '16 16', '1 1 1', 1.0f, 0);
}
#endif
if ( m_strTitle ) {
if ( m_strIcon ) {
Font_DrawText( m_vecOrigin + [ 26, 8 ], m_strTitle, g_fntDefault );
drawpic( m_vecOrigin + [ 4, 4 ], m_strIcon, '16 16', '1 1 1', 1.0f );
drawpic( m_vecOrigin + [ 4, 4 ], m_strIcon, '16 16', '1 1 1', 1.0f, 0);
} else {
Font_DrawText( m_vecOrigin + [ 8, 8 ], m_strTitle, g_fntDefault );
}