TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

setFirstResonder Safeties

Browse source 
make sure we've properly added gui elements before trying to set the to be the responding one, or running callbacks against them
This commit is contained in:
AzaezelX 2025-02-25 18:23:45 -06:00
parent 9f3785d893
commit 5fb73edc00
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/core/guiCanvas.cpp
View file

@ -2169,7 +2169,7 @@ void GuiCanvas::setFirstResponder( GuiControl* newResponder )
if( oldResponder && ( oldResponder != newResponder ) ) if( oldResponder && ( oldResponder != newResponder ) )
oldResponder->onLoseFirstResponder(); oldResponder->onLoseFirstResponder();
if( newResponder && ( newResponder != oldResponder ) ) if( newResponder && ( newResponder != oldResponder ) && newResponder->isProperlyAdded())
newResponder->onGainFirstResponder(); newResponder->onGainFirstResponder();
} }

4
Engine/source/gui/core/guiControl.cpp
View file

@ -2230,10 +2230,10 @@ void GuiControl::setFirstResponder( GuiControl* firstResponder )
void GuiControl::setFirstResponder() void GuiControl::setFirstResponder()
{ {
if( mAwake && mVisible ) if( mAwake && mVisible && isProperlyAdded())
{ {
GuiControl *parent = getParent(); GuiControl *parent = getParent();
if ( mProfile->mCanKeyFocus == true && parent != NULL ) if ( mProfile->mCanKeyFocus == true && parent && parent->isProperlyAdded())
parent->setFirstResponder( this ); parent->setFirstResponder( this );
} }
} }

2
Engine/source/gui/core/guiControl.h
View file

@ -741,7 +741,7 @@ class GuiControl : public SimGroup
GuiControl *getFirstResponder() { return mFirstResponder; } GuiControl *getFirstResponder() { return mFirstResponder; }
/// Occurs when the control gains first-responder status. /// Occurs when the control gains first-responder status.
virtual void onGainFirstResponder(); void onGainFirstResponder();
/// Occurs when the control loses first-responder status. /// Occurs when the control loses first-responder status.
virtual void onLoseFirstResponder(); virtual void onLoseFirstResponder();

5
Engine/source/gui/editor/inspector/field.cpp
View file

@ -233,7 +233,7 @@ void GuiInspectorField::setFirstResponder( GuiControl *firstResponder )
{ {
Parent::setFirstResponder( firstResponder ); Parent::setFirstResponder( firstResponder );
if ( firstResponder == this || firstResponder == mEdit ) if (( firstResponder == this || firstResponder == mEdit ) && firstResponder->isProperlyAdded())
{ {
mInspector->setHighlightField( this ); mInspector->setHighlightField( this );
} }
@ -851,7 +851,8 @@ void GuiInspectorField::setHLEnabled( bool enabled )
edit->setCursorPos(0); edit->setCursorPos(0);
} }
} }
_executeSelectedCallback(); if (isProperlyAdded())
_executeSelectedCallback();
} }
} }