mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 18:08:44 +00:00
CHANGED: #1471 Don't show the over texture for buttons when in editor mode.
This commit is contained in:
parent
c2b902250f
commit
1bdb92f565
5 changed files with 21 additions and 8 deletions
|
@ -105,6 +105,8 @@ namespace NLGUI
|
|||
_RenderLayer= 0;
|
||||
|
||||
_AvoidResizeParent= false;
|
||||
|
||||
editorSelected = false;
|
||||
}
|
||||
|
||||
// dtor
|
||||
|
@ -458,8 +460,17 @@ namespace NLGUI
|
|||
|
||||
bool isInGroup( CInterfaceGroup *group );
|
||||
|
||||
static void setEditorMode( bool b ){ editorMode = b; }
|
||||
|
||||
void setEditorSelected( bool b ){ editorSelected = b; }
|
||||
bool isEditorSelected() const{ return editorSelected; }
|
||||
|
||||
protected:
|
||||
|
||||
bool editorSelected;
|
||||
|
||||
static bool editorMode;
|
||||
|
||||
///the parent
|
||||
CInterfaceGroup* _Parent;
|
||||
|
||||
|
|
|
@ -135,7 +135,7 @@ namespace NLGUI
|
|||
{
|
||||
case ToggleButton:
|
||||
{
|
||||
if (_Pushed)
|
||||
if (_Pushed && !editorMode )
|
||||
{
|
||||
nTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -161,7 +161,7 @@ namespace NLGUI
|
|||
}
|
||||
else
|
||||
{
|
||||
if ((_Over) && (CWidgetManager::getInstance()->getCapturePointerLeft() == this))
|
||||
if ( (_Over) && (CWidgetManager::getInstance()->getCapturePointerLeft() == this) && !editorMode )
|
||||
{
|
||||
nTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -177,7 +177,7 @@ namespace NLGUI
|
|||
break;
|
||||
case PushButton:
|
||||
{
|
||||
if (_Over && (CWidgetManager::getInstance()->getCapturePointerLeft() == this))
|
||||
if ( _Over && (CWidgetManager::getInstance()->getCapturePointerLeft() == this) && !editorMode )
|
||||
{
|
||||
nTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -218,7 +218,7 @@ namespace NLGUI
|
|||
|
||||
|
||||
|
||||
if (_Over)
|
||||
if ( _Over && !editorMode )
|
||||
{
|
||||
|
||||
if ((lastOver == false) && (_AHOnOver != NULL))
|
||||
|
|
|
@ -278,7 +278,7 @@ namespace NLGUI
|
|||
{
|
||||
case ToggleButton:
|
||||
{
|
||||
if (_Pushed)
|
||||
if (_Pushed && !editorMode )
|
||||
{
|
||||
pTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -304,7 +304,7 @@ namespace NLGUI
|
|||
}
|
||||
else
|
||||
{
|
||||
if ((_Over) && (CWidgetManager::getInstance()->getCapturePointerLeft() == this))
|
||||
if ((_Over) && (CWidgetManager::getInstance()->getCapturePointerLeft() == this) && !editorMode )
|
||||
{
|
||||
pTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -320,7 +320,7 @@ namespace NLGUI
|
|||
break;
|
||||
case PushButton:
|
||||
{
|
||||
if (_Over && (CWidgetManager::getInstance()->getCapturePointerLeft() == this))
|
||||
if (_Over && (CWidgetManager::getInstance()->getCapturePointerLeft() == this) && !editorMode )
|
||||
{
|
||||
pTxId = _TextureIdPushed;
|
||||
color = getCurrentColorPushed(globalColor);
|
||||
|
@ -355,7 +355,7 @@ namespace NLGUI
|
|||
rVR.drawRotFlipBitmap ( _RenderLayer, x+_BmpLeftW+txw, y, _BmpRightW, txh, 0, false, pTxId[2], color );
|
||||
|
||||
// *** Draw Over
|
||||
if (_Over && (_OverWhenPushed || !(_Pushed || CWidgetManager::getInstance()->getCapturePointerLeft() == this)))
|
||||
if ( !editorMode && _Over && (_OverWhenPushed || !(_Pushed || CWidgetManager::getInstance()->getCapturePointerLeft() == this)))
|
||||
{
|
||||
if ((lastOver == false) && (_AHOnOver != NULL))
|
||||
CAHManager::getInstance()->runActionHandler (_AHOnOver, this, _AHOverParams);
|
||||
|
|
|
@ -31,6 +31,7 @@ using namespace NLMISC;
|
|||
|
||||
namespace NLGUI
|
||||
{
|
||||
bool CInterfaceElement::editorMode = false;
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
CInterfaceElement::~CInterfaceElement()
|
||||
|
|
|
@ -62,6 +62,7 @@ namespace GUIEditor
|
|||
|
||||
NLGUI::CAHManager::setEditorMode( true );
|
||||
NLGUI::CLuaManager::setEditorMode( true );
|
||||
NLGUI::CInterfaceElement::setEditorMode( true );
|
||||
|
||||
NLGUI::CViewRenderer::setDriver( getDriver() );
|
||||
NLGUI::CViewRenderer::setTextContext( getTextContext() );
|
||||
|
|
Loading…
Reference in a new issue