Valve/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-18 15:22:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on VGUI menu bar button cursor entrance

Browse Source
This commit is contained in:
RGBACatlord 2025-03-18 12:12:50 +13:00 committed by EricS-Valve
parent 6956e9680e
commit 48809cb86c
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/vgui_controls/MenuBar.h
View File

@ -41,7 +41,11 @@ protected:
virtual void PerformLayout(); virtual void PerformLayout();
virtual void Paint(); virtual void Paint();
MESSAGE_FUNC( OnMenuClose, "MenuClose" ); MESSAGE_FUNC( OnMenuClose, "MenuClose" );
MESSAGE_FUNC_INT( OnCursorEnteredMenuButton, "CursorEnteredMenuButton", VPanel); #ifdef PLATFORM_64BITS
MESSAGE_FUNC_PTR( OnCursorEnteredMenuButton, "CursorEnteredMenuButton", VPanel );
#else
MESSAGE_FUNC_INT( OnCursorEnteredMenuButton, "CursorEnteredMenuButton", VPanel );
#endif
private: private:
CUtlVector<MenuButton *> m_pMenuButtons; CUtlVector<MenuButton *> m_pMenuButtons;

8
src/vgui2/vgui_controls/MenuBar.cpp
View File

@ -221,9 +221,15 @@ void MenuBar::OnMenuClose()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: Message map // Purpose: Message map
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void MenuBar::OnCursorEnteredMenuButton(int VPanel) #ifdef PLATFORM_64BITS
void MenuBar::OnCursorEnteredMenuButton(vgui::Panel* VPanel)
{ {
VPANEL menuButton = (VPANEL)VPanel; VPANEL menuButton = (VPANEL)VPanel;
#else
void Menu::OnCursorEnteredMenuItem(int VPanel)
{
VPANEL menuButton = (VPANEL)VPanel;
#endif
// see if we had a menu open // see if we had a menu open
for ( int i = 0; i < m_pMenuButtons.Count(); i++) for ( int i = 0; i < m_pMenuButtons.Count(); i++)
{ {

4
src/vgui2/vgui_controls/MenuButton.cpp
View File

@ -238,7 +238,11 @@ void MenuButton::OnCursorEntered()
// forward the message on to the parent of this menu. // forward the message on to the parent of this menu.
KeyValues *msg = new KeyValues ("CursorEnteredMenuButton"); KeyValues *msg = new KeyValues ("CursorEnteredMenuButton");
// tell the parent this menuitem is the one that was entered so it can open the menu if it wants // tell the parent this menuitem is the one that was entered so it can open the menu if it wants
#ifdef PLATFORM_64BITS
msg->SetPtr("VPanel", (void*)GetVPanel());
#else
msg->SetInt("VPanel", GetVPanel()); msg->SetInt("VPanel", GetVPanel());
#endif
ivgui()->PostMessage(GetVParent(), msg, NULL); ivgui()->PostMessage(GetVParent(), msg, NULL);
} }