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

Merge pull request #301 from tyabus/vguidrawtree

Browse Source 
engine: Fixed vgui_drawtree on 64 bit engine
This commit is contained in:
nillerusr 2023-10-07 22:09:19 +03:00 committed by GitHub
commit a7096679aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/vgui_drawtreepanel.cpp
View File

@ -268,7 +268,7 @@ public:
if ( data ) if ( data )
{ {
g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetInt( "PanelPtr", 0 ) : 0; g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetPtr( "PanelPtr", 0 ) : 0;
} }
else else
{ {
@ -388,7 +388,7 @@ void VGui_RecursivePrintTree(
Q_snprintf( str, sizeof( str ), "%s", name ); Q_snprintf( str, sizeof( str ), "%s", name );
pVal->SetString( "Text", str ); pVal->SetString( "Text", str );
pVal->SetInt( "PanelPtr", current ); pVal->SetPtr( "PanelPtr", (void*)current );
pNewParent = pVal; pNewParent = pVal;
@ -417,7 +417,7 @@ bool UpdateItemState(
vgui::IPanel *ipanel = vgui::ipanel(); vgui::IPanel *ipanel = vgui::ipanel();
KeyValues *pItemData = pTree->GetItemData( iChildItemId ); KeyValues *pItemData = pTree->GetItemData( iChildItemId );
if ( pItemData->GetInt( "PanelPtr" ) != pSub->GetInt( "PanelPtr" ) || if ( pItemData->GetPtr( "PanelPtr" ) != pSub->GetPtr( "PanelPtr" ) ||
Q_stricmp( pItemData->GetString( "Text" ), pSub->GetString( "Text" ) ) != 0 ) Q_stricmp( pItemData->GetString( "Text" ), pSub->GetString( "Text" ) ) != 0 )
{ {
pTree->ModifyItem( iChildItemId, pSub ); pTree->ModifyItem( iChildItemId, pSub );
@ -425,7 +425,7 @@ bool UpdateItemState(
} }
// Ok, this is a new panel. // Ok, this is a new panel.
vgui::VPANEL vPanel = pSub->GetInt( "PanelPtr" ); vgui::VPANEL vPanel = (vgui::VPANEL)pSub->GetPtr( "PanelPtr" );
int iBaseColor[3] = { 255, 255, 255 }; int iBaseColor[3] = { 255, 255, 255 };
if ( ipanel->IsPopup( vPanel ) ) if ( ipanel->IsPopup( vPanel ) )
@ -433,7 +433,7 @@ bool UpdateItemState(
iBaseColor[0] = 255; iBaseColor[1] = 255; iBaseColor[2] = 0; iBaseColor[0] = 255; iBaseColor[1] = 255; iBaseColor[2] = 0;
} }
if ( g_FocusPanelList.Find( vPanel ) != -1 ) if ( g_FocusPanelList.Find( vPanel ) != vgui::INVALID_PANEL )
{ {
iBaseColor[0] = 0; iBaseColor[1] = 255; iBaseColor[2] = 0; iBaseColor[0] = 0; iBaseColor[1] = 255; iBaseColor[2] = 0;
pTree->ExpandItem( iChildItemId, true ); pTree->ExpandItem( iChildItemId, true );