H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-08 01:39:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add proportionality support for GameUI panels (#35)

Browse Source 
* Add proportionality support for GameUI panels

* Add Android platform define

* Fix button wrong state on fast clicking

Co-authored-by: JusicP <slender87844@gmail.com>
This commit is contained in:
nillerusr
2022-01-09 17:04:47 +03:00
committed by GitHub
co-authored by JusicP
parent 1f3436945f
commit 9d77bb17c5
20 changed files with 296 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vgui2/vgui_controls/Button.cpp
+11 -7
View File
@@ -71,7 +71,6 @@ void Button::Init()
_keyFocusBorder = NULL;
m_bSelectionStateSaved = false;
m_bStaySelectedOnClick = false;
m_bStaySelectedOnClick = false;
m_bStayArmedOnClick = false;
m_sArmedSoundName = UTL_INVAL_SYMBOL;
m_sDepressedSoundName = UTL_INVAL_SYMBOL;
@@ -140,11 +139,12 @@ void Button::SetSelected( bool state )
InvalidateLayout(false);
}
if ( !m_bStayArmedOnClick && state && _buttonFlags.IsFlagSet( ARMED ) )
{
_buttonFlags.SetFlag( ARMED, false );
InvalidateLayout(false);
}
// Jusic: idk what is it for
//if (!m_bStayArmedOnClick && state && _buttonFlags.IsFlagSet(ARMED))
//{
// _buttonFlags.SetFlag( ARMED, false );
// InvalidateLayout(false);
//}
}
void Button::SetBlink( bool state )
@@ -877,7 +877,11 @@ void Button::ApplySettings( KeyValues *inResourceData )
SetReleasedSound(sound);
}
_activationType = (ActivationType_t)inResourceData->GetInt( "button_activation_type", ACTIVATE_ONRELEASED );
int iButtonActivationType = inResourceData->GetInt( "button_activation_type", -1 );
if (iButtonActivationType != -1)
{
_activationType = (ActivationType_t)iButtonActivationType;
}
}