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

Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

This commit is contained in:
Walzer 2011-01-06 10:44:26 +08:00
parent b8bc227718 4a6989b6ff
commit ca8dc4bc07
6 changed files with 79 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos2dx/include/CCKeypadDelegate.h
View File

@ -41,6 +41,9 @@ public:
// The back key clicked
virtual void keyBackClicked() {}
// The menu key clicked. only avialble on uphone & android
virtual void keyMenuClicked() {};
};
/**

1
cocos2dx/include/CCKeypadDispatcher.h
View File

@ -33,6 +33,7 @@ namespace cocos2d {
typedef enum {
// the back key clicked msg
kTypeBackClicked = 1,
kTypeMenuClicked,
} ccKeypadMSGType;
struct _ccCArray;

12
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.cpp
View File

@ -29,10 +29,10 @@ THE SOFTWARE.
namespace cocos2d {
static CCKeypadDispatcher* s_KeypadDispatcher = NULL;
//------------------------------------------------------------------
//
// CCKeypadDispatcher
//
//------------------------------------------------------------------
//
// CCKeypadDispatcher
//
//------------------------------------------------------------------
CCKeypadDispatcher::CCKeypadDispatcher()
: m_bLocked(false)
@ -154,7 +154,9 @@ bool CCKeypadDispatcher::dispatchKeypadMSG(ccKeypadMSGType nMsgType)
case kTypeBackClicked:
pDelegate->keyBackClicked();
break;
case kTypeMenuClicked:
pDelegate->keyMenuClicked();
break;
default:
break;
}

5
cocos2dx/platform/uphone/CCXEGLView_uphone.cpp
View File

@ -257,6 +257,11 @@ Boolean CCXEGLView::EventHandler(TApplication * pApp, EventType * pEvent)
{
bHandled = CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeBackClicked);
}
else if (pEvent->sParam1 == SYS_KEY_SOFTKEY_LEFT_UP ||
pEvent->sParam1 == SYS_KEY_SOFTKEY_LEFT_LONG)
{
bHandled == CCKeypadDispatcher::sharedDispatcher()->dispatchKeypadMSG(kTypeMenuClicked);
}
}
break;

72
tests/tests/KeypadTest/KeypadTest.cpp
View File

@ -1,37 +1,45 @@
#include "KeypadTest.h"
KeypadTest::KeypadTest()
: m_bShow(true)
{
CGSize s = CCDirector::sharedDirector()->getWinSize();
CCLabel* label = CCLabel::labelWithString("Keypad Test", "Arial", 28);
addChild(label, 0);
label->setPosition( ccp(s.width/2, s.height-50) );
CCLabel* subtitle = CCLabel::labelWithString("only goes well in cocos2d-uphone now!", "Arial", 18);
addChild(subtitle, 0);
subtitle->setPosition( ccp(s.width/2, s.height-100) );
setIsKeypadEnabled(true);
// create a label to display the tip string
m_pLabel = CCLabel::labelWithString("Key Back Clicked!", "Arial", 22);
m_pLabel->setPosition(ccp(s.width / 2, s.height / 2));
addChild(m_pLabel, 0);
m_pLabel->setIsVisible(false);
m_pLabel->retain();
}
KeypadTest::~KeypadTest()
{
m_pLabel->release();
}
void KeypadTest::keyBackClicked()
{
m_pLabel->setIsVisible(m_bShow);
m_bShow = !m_bShow;
}
KeypadTest::KeypadTest()
: m_bShow(true)
{
CGSize s = CCDirector::sharedDirector()->getWinSize();
CCLabel* label = CCLabel::labelWithString("Keypad Test", "Arial", 28);
addChild(label, 0);
label->setPosition( ccp(s.width/2, s.height-50) );
CCLabel* subtitle = CCLabel::labelWithString("only goes well in cocos2d-uphone now!", "Arial", 18);
addChild(subtitle, 0);
subtitle->setPosition( ccp(s.width/2, s.height-100) );
setIsKeypadEnabled(true);
// create a label to display the tip string
m_pLabel = CCLabel::labelWithString("Please press any key...", "Arial", 22);
m_pLabel->setPosition(ccp(s.width / 2, s.height / 2));
addChild(m_pLabel, 0);
// m_pLabel->setIsVisible(false);
m_pLabel->retain();
}
KeypadTest::~KeypadTest()
{
m_pLabel->release();
}
void KeypadTest::keyBackClicked()
{
m_pLabel->setString("BACK clicked!");
// m_pLabel->setIsVisible(m_bShow);
// m_bShow = !m_bShow;
}
void KeypadTest::keyMenuClicked()
{
m_pLabel->setString("MENU clicked!");
// m_pLabel->setIsVisible(m_bShow);
// m_bShow = !m_bShow;
}
void KeypadTestScene::runThisTest()
{

45
tests/tests/KeypadTest/KeypadTest.h
View File

@ -1,26 +1,27 @@
#ifndef _KEYPAD_TEST_H_
#define _KEYPAD_TEST_H_
#ifndef _KEYPAD_TEST_H_
#define _KEYPAD_TEST_H_
#include "cocos2d.h"
#include "../testBasic.h"
class KeypadTest : public CCLayer
{
public:
KeypadTest();
~KeypadTest();
virtual void keyBackClicked();
private:
CCLabel* m_pLabel;
bool m_bShow;
};
class KeypadTestScene : public TestScene
{
public:
virtual void runThisTest();
};
#endif
class KeypadTest : public CCLayer
{
public:
KeypadTest();
~KeypadTest();
virtual void keyBackClicked();
virtual void keyMenuClicked();
private:
CCLabel* m_pLabel;
bool m_bShow;
};
class KeypadTestScene : public TestScene
{
public:
virtual void runThisTest();
};
#endif