Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4103 from luisparravicini/issue-2882 

[ci skip]added | operator for Control::EventType
This commit is contained in:
minggo 2013-11-07 18:59:33 -08:00
parent 61970934a2 8b1d3af720
commit 109adaf337
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/GUI/CCControlExtension/CCControl.cpp
View File

@ -326,4 +326,9 @@ bool Control::hasVisibleParents() const
} }
return true; return true;
} }
Control::EventType operator|(Control::EventType a, Control::EventType b) {
return static_cast<Control::EventType>(static_cast<int>(a) | static_cast<int>(b));
}
NS_CC_EXT_END NS_CC_EXT_END

2
extensions/GUI/CCControlExtension/CCControl.h
View File

@ -262,6 +262,8 @@ protected:
CC_SYNTHESIZE_READONLY(State, _state, State); CC_SYNTHESIZE_READONLY(State, _state, State);
}; };
Control::EventType operator|(Control::EventType a, Control::EventType b);
// end of GUI group // end of GUI group
/// @} /// @}
/// @} /// @}

19
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
View File

@ -110,6 +110,7 @@ ControlButton *ControlButtonTest_HelloVariableSize::standardButtonWithTitle(cons
ControlButtonTest_Event::ControlButtonTest_Event() ControlButtonTest_Event::ControlButtonTest_Event()
: _displayValueLabel(NULL) : _displayValueLabel(NULL)
, _displayBitmaskLabel(NULL)
{ {
} }
@ -117,6 +118,7 @@ ControlButtonTest_Event::ControlButtonTest_Event()
ControlButtonTest_Event::~ControlButtonTest_Event() ControlButtonTest_Event::~ControlButtonTest_Event()
{ {
CC_SAFE_RELEASE_NULL(_displayValueLabel); CC_SAFE_RELEASE_NULL(_displayValueLabel);
CC_SAFE_RELEASE_NULL(_displayBitmaskLabel);
} }
bool ControlButtonTest_Event::init() bool ControlButtonTest_Event::init()
@ -130,7 +132,13 @@ bool ControlButtonTest_Event::init()
_displayValueLabel->setAnchorPoint(Point(0.5f, -1)); _displayValueLabel->setAnchorPoint(Point(0.5f, -1));
_displayValueLabel->setPosition(Point(screenSize.width / 2.0f, screenSize.height / 2.0f)); _displayValueLabel->setPosition(Point(screenSize.width / 2.0f, screenSize.height / 2.0f));
addChild(_displayValueLabel, 1); addChild(_displayValueLabel, 1);
setDisplayBitmaskLabel(LabelTTF::create("No bitmask event", "Marker Felt", 24));
_displayBitmaskLabel->setAnchorPoint(Point(0.5f, -1));
Point bitmaskLabelPos = _displayValueLabel->getPosition() - Point(0, _displayBitmaskLabel->getBoundingBox().size.height);
_displayBitmaskLabel->setPosition(bitmaskLabelPos);
addChild(_displayBitmaskLabel, 1);
// Add the button // Add the button
auto backgroundButton = Scale9Sprite::create("extensions/button.png"); auto backgroundButton = Scale9Sprite::create("extensions/button.png");
auto backgroundHighlightedButton = Scale9Sprite::create("extensions/buttonHighlighted.png"); auto backgroundHighlightedButton = Scale9Sprite::create("extensions/buttonHighlighted.png");
@ -162,11 +170,20 @@ bool ControlButtonTest_Event::init()
controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchUpInsideAction), Control::EventType::TOUCH_UP_INSIDE); controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchUpInsideAction), Control::EventType::TOUCH_UP_INSIDE);
controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchUpOutsideAction), Control::EventType::TOUCH_UP_OUTSIDE); controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchUpOutsideAction), Control::EventType::TOUCH_UP_OUTSIDE);
controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchCancelAction), Control::EventType::TOUCH_CANCEL); controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchCancelAction), Control::EventType::TOUCH_CANCEL);
// test for issue 2882
controlButton->addTargetWithActionForControlEvents(this, cccontrol_selector(ControlButtonTest_Event::touchBitmaskAction),
Control::EventType::TOUCH_DOWN | Control::EventType::DRAG_INSIDE | Control::EventType::DRAG_OUTSIDE | Control::EventType::DRAG_ENTER | Control::EventType::DRAG_EXIT | Control::EventType::TOUCH_UP_INSIDE | Control::EventType::TOUCH_UP_OUTSIDE | Control::EventType::TOUCH_CANCEL | Control::EventType::VALUE_CHANGED);
return true; return true;
} }
return false; return false;
} }
void ControlButtonTest_Event::touchBitmaskAction(Object *senderz, Control::EventType controlEvent)
{
_displayBitmaskLabel->setString(String::createWithFormat("using bitmask (%d)", controlEvent)->getCString());
}
void ControlButtonTest_Event::touchDownAction(Object *senderz, Control::EventType controlEvent) void ControlButtonTest_Event::touchDownAction(Object *senderz, Control::EventType controlEvent)
{ {
_displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString()); _displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString());

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
View File

@ -54,8 +54,10 @@ public:
void touchUpInsideAction(Object *sender, Control::EventType controlEvent); void touchUpInsideAction(Object *sender, Control::EventType controlEvent);
void touchUpOutsideAction(Object *sender, Control::EventType controlEvent); void touchUpOutsideAction(Object *sender, Control::EventType controlEvent);
void touchCancelAction(Object *sender, Control::EventType controlEvent); void touchCancelAction(Object *sender, Control::EventType controlEvent);
void touchBitmaskAction(Object *sender, Control::EventType controlEvent);
protected: protected:
CC_SYNTHESIZE_RETAIN(LabelTTF *, _displayValueLabel, DisplayValueLabel) CC_SYNTHESIZE_RETAIN(LabelTTF *, _displayValueLabel, DisplayValueLabel)
CC_SYNTHESIZE_RETAIN(LabelTTF *, _displayBitmaskLabel, DisplayBitmaskLabel)
CONTROL_SCENE_CREATE_FUNC(ControlButtonTest_Event) CONTROL_SCENE_CREATE_FUNC(ControlButtonTest_Event)
}; };