TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 04:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Added logic to guiButtonBaseCtrl so if highlighted and is part of a group, will signal the siblings in the group as well

Browse source 
- Standardizes highlighting behavior between keybind and mouse highlighting of buttons
- Standardized onHighlighted callback for buttonBase
- Fixed handling of up/down nav with gamepad stick
- Added logic to make holding down nav keybinds iterate over buttons in menu lists
This commit is contained in:
Areloch 2023-12-27 11:42:43 -06:00
parent 36d00e09d3
commit f5ab97242f
4 changed files with 301 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

161
Engine/source/gui/buttons/guiButtonBaseCtrl.h
View file

@ -24,7 +24,7 @@
#define _GUIBUTTONBASECTRL_H_
#ifndef _GUICONTROL_H_
#include "gui/core/guiControl.h"
#include "gui/core/guiControl.h"
#endif
@ -33,108 +33,99 @@
///
class GuiButtonBaseCtrl : public GuiControl
{
public:
typedef GuiControl Parent;
public:
enum ButtonType
{
ButtonTypePush,
ButtonTypeCheck,
ButtonTypeRadio,
};
typedef GuiControl Parent;
protected:
StringTableEntry mButtonText;
StringTableEntry mButtonTextID;
bool mDepressed;
bool mHighlighted;
bool mStateOn;
S32 mButtonType;
S32 mRadioGroup;
bool mUseMouseEvents;
/// Point where left mouse button was pressed down. Used to find when to start
/// a mouse drag.
Point2I mMouseDownPoint;
///
bool mMouseDragged;
/// @name Callbacks
/// @{
enum ButtonType
{
ButtonTypePush,
ButtonTypeCheck,
ButtonTypeRadio,
};
DECLARE_CALLBACK( void, onMouseDown, () );
DECLARE_CALLBACK( void, onMouseUp, () );
DECLARE_CALLBACK( void, onClick, () );
DECLARE_CALLBACK( void, onRightClick, () );
DECLARE_CALLBACK( void, onDoubleClick, () );
DECLARE_CALLBACK( void, onMouseEnter, () );
DECLARE_CALLBACK( void, onMouseLeave, () );
DECLARE_CALLBACK( void, onMouseDragged, () );
DECLARE_CALLBACK( void, onHighlighted, (bool));
protected:
/// @}
StringTableEntry mButtonText;
StringTableEntry mButtonTextID;
bool mDepressed;
bool mHighlighted;
bool mStateOn;
S32 mButtonType;
S32 mRadioGroup;
bool mUseMouseEvents;
public:
/// Point where left mouse button was pressed down. Used to find when to start
/// a mouse drag.
Point2I mMouseDownPoint;
GuiButtonBaseCtrl();
bool onWake();
///
bool mMouseDragged;
DECLARE_CONOBJECT( GuiButtonBaseCtrl );
DECLARE_CATEGORY( "Gui Buttons" );
DECLARE_DESCRIPTION( "A basic button control." );
static void initPersistFields();
/// @name Callbacks
/// @{
void setText(const char *text);
void setTextID(S32 id);
void setTextID(const char *id);
const char *getText();
void setStateOn( bool bStateOn );
bool getStateOn() const { return mStateOn; }
DECLARE_CALLBACK(void, onMouseDown, ());
DECLARE_CALLBACK(void, onMouseUp, ());
DECLARE_CALLBACK(void, onClick, ());
DECLARE_CALLBACK(void, onRightClick, ());
DECLARE_CALLBACK(void, onDoubleClick, ());
DECLARE_CALLBACK(void, onMouseEnter, ());
DECLARE_CALLBACK(void, onMouseLeave, ());
DECLARE_CALLBACK(void, onMouseDragged, ());
DECLARE_CALLBACK(void, onHighlighted, (bool));
void setDepressed( bool depressed ) { mDepressed = depressed; }
void resetState()
{
mDepressed = false;
mHighlighted = false;
onHighlighted_callback(false);
}
/// @}
void setHighlighted(bool highlighted)
{
mHighlighted = highlighted;
onHighlighted_callback(highlighted);
}
bool isHighlighted() { return mHighlighted; }
public:
void acceleratorKeyPress(U32 index);
void acceleratorKeyRelease(U32 index);
GuiButtonBaseCtrl();
bool onWake();
void onMouseDown(const GuiEvent &);
void onMouseUp(const GuiEvent &);
void onMouseDragged( const GuiEvent& event );
void onRightMouseUp(const GuiEvent &);
DECLARE_CONOBJECT(GuiButtonBaseCtrl);
DECLARE_CATEGORY("Gui Buttons");
DECLARE_DESCRIPTION("A basic button control.");
void onMouseEnter(const GuiEvent &);
void onMouseLeave(const GuiEvent &);
static void initPersistFields();
bool onKeyDown(const GuiEvent &event);
bool onKeyUp(const GuiEvent &event);
void setText(const char* text);
void setTextID(S32 id);
void setTextID(const char* id);
const char* getText();
void setStateOn(bool bStateOn);
bool getStateOn() const { return mStateOn; }
void setScriptValue(const char *value);
const char *getScriptValue();
void setDepressed(bool depressed) { mDepressed = depressed; }
void resetState() { mDepressed = false; mHighlighted = false; }
void onMessage(GuiControl *,S32 msg);
void onAction();
bool usesMouseEvents() const { return mUseMouseEvents; }
void setUseMouseEvents( bool val ) { mUseMouseEvents = val; }
void setHighlighted(bool highlighted);
bool isHighlighted() { return mHighlighted; }
void acceleratorKeyPress(U32 index);
void acceleratorKeyRelease(U32 index);
void onMouseDown(const GuiEvent&);
void onMouseUp(const GuiEvent&);
void onMouseDragged(const GuiEvent& event);
void onRightMouseUp(const GuiEvent&);
void onMouseEnter(const GuiEvent&);
void onMouseLeave(const GuiEvent&);
bool onKeyDown(const GuiEvent& event);
bool onKeyUp(const GuiEvent& event);
void setScriptValue(const char* value);
const char* getScriptValue();
void onMessage(GuiControl*, S32 msg);
void onAction();
bool usesMouseEvents() const { return mUseMouseEvents; }
void setUseMouseEvents(bool val) { mUseMouseEvents = val; }
};
typedef GuiButtonBaseCtrl::ButtonType GuiButtonType;
DefineEnumType( GuiButtonType );
DefineEnumType(GuiButtonType);
#endif