HeeroYui-deprecated/test_ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] work with new etk minimum dependency

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-14 21:49:12 +01:00
parent c265cd90ca
commit 7f869ad02c
5 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sources/appl/MainWindows.cpp
View File

@ -123,16 +123,15 @@ void MainWindows::onReceiveMessage(const ewol::EMessage& _msg) {
}
if (m_subWidget != NULL) {
delete (m_subWidget);
// inn theory it must be removed ...
m_subWidget->removeObject();
// in theory it must be removed ...
m_subWidget = NULL;
}
// special init forcing ...
if(_msg.getCaller() == NULL) {
m_idWidget = 1;
}
switch(m_idWidget)
{
switch(m_idWidget) {
default:
m_idWidget = 0;
case 0:

20
sources/appl/TestButton.cpp
View File

@ -42,7 +42,7 @@ static const char * l_eventChangeImageToggle = "event-change-image-toggle";
TestButton::TestButton(void) :
widget::Sizer(widget::Sizer::modeVert),
m_testWidget(NULL) {
APPL_CRITICAL("Create " __class__ " (start)");
APPL_INFO("Create " __class__ " (start)");
widget::Sizer* mySizerVert2 = NULL;
widget::Sizer* mySizerHori = NULL;
widget::Button* myButton = NULL;
@ -182,13 +182,13 @@ TestButton::~TestButton(void) {
void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
widget::Sizer::onReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
APPL_VERBOSE("Receive Event from the main windows ... : " << _msg );
if (m_testWidget == _msg.getCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (_msg.getMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
} else {
m_testWidget->setExpand(bvec2(false,m_testWidget->getExpand().y()));
@ -196,7 +196,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),true));
} else {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),false));
@ -204,7 +204,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(true,m_testWidget->getFill().y()));
} else {
m_testWidget->setFill(bvec2(false,m_testWidget->getFill().y()));
@ -212,7 +212,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),true));
} else {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),false));
@ -220,7 +220,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeToggle) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setToggleMode(true);
} else {
m_testWidget->setToggleMode(false);
@ -228,7 +228,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeTextToggle) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setSubWidgetToggle(new widget::Label("A stupid very long text on toggle <br/><br/> and on multiple lines"));
} else {
m_testWidget->setSubWidgetToggle(NULL);
@ -236,7 +236,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeImage) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
//m_testWidget->SetImage("THEME:GUI:icon.png");
//m_testWidget->SetImageSize(50);
} else {
@ -245,7 +245,7 @@ void TestButton::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeImageToggle) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
//m_testWidget->SetImageToggle("THEME:GUI:icon.png");
} else {
//m_testWidget->SetImageToggle("");

16
sources/appl/TestButtonColor.cpp
View File

@ -36,7 +36,7 @@ static const char * l_eventChangeFillY = "event-change-fill-Y";
TestButtonColor::TestButtonColor(void) :
widget::Sizer(widget::Sizer::modeVert),
m_testWidget(NULL) {
APPL_DEBUG("CREATE " __class__ " ... ");
APPL_INFO("CREATE " __class__ " ... ");
widget::Sizer* mySizerVert2 = NULL;
widget::Sizer* mySizerHori = NULL;
widget::Button* myButton = NULL;
@ -104,15 +104,13 @@ TestButtonColor::TestButtonColor(void) :
mySpacer->setColor(0x00FF0080);
mySizerHori->subWidgetAdd(mySpacer);
}
/*
m_testWidget = new widget::ButtonColor(draw::color::olive);
m_testWidget = new widget::ButtonColor(etk::color::olive);
if (NULL != m_testWidget) {
m_testWidget->setExpand(bvec2(false,false));
m_testWidget->setFill(bvec2(false,false));
m_testWidget->registerOnEvent(this, ewolEventButtonColorChange);
mySizerHori->subWidgetAdd(m_testWidget);
}
*/
mySpacer = new widget::Spacer();
if (NULL != mySpacer) {
mySpacer->setExpand(bvec2(false,false));
@ -138,13 +136,13 @@ TestButtonColor::~TestButtonColor(void) {
void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) {
widget::Sizer::onReceiveMessage(_msg);
//APPL_INFO("Receive Event from the main windows ... : \"" << eventId << "\" ==> data=\"" << data << "\"" );
//APPL_INFO("Receive Event from the main windows : " << _msg);
if (m_testWidget == _msg.getCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (_msg.getMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
} else {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
@ -152,7 +150,7 @@ void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),true));
} else {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),false));
@ -160,7 +158,7 @@ void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(true,m_testWidget->getFill().y()));
} else {
m_testWidget->setFill(bvec2(false,m_testWidget->getFill().y()));
@ -168,7 +166,7 @@ void TestButtonColor::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),true));
} else {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),false));

13
sources/appl/TestImage.cpp
View File

@ -38,7 +38,7 @@ static const char * l_eventChangeImage = "event-change-image";
TestImage::TestImage(void) :
widget::Sizer(widget::Sizer::modeVert),
m_testWidget(NULL) {
APPL_CRITICAL("Create " __class__ " (start)");
APPL_INFO("Create " __class__ " (start)");
widget::Sizer* mySizerVert2 = NULL;
widget::Sizer* mySizerHori = NULL;
widget::Button* myButton = NULL;
@ -162,7 +162,7 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) {
}
if (_msg.getMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
} else {
m_testWidget->setExpand(bvec2(false,m_testWidget->getExpand().y()));
@ -170,7 +170,7 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),true));
} else {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),false));
@ -178,7 +178,7 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(true,m_testWidget->getFill().y()));
} else {
m_testWidget->setFill(bvec2(false,m_testWidget->getFill().y()));
@ -186,7 +186,7 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),true));
} else {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),false));
@ -195,8 +195,7 @@ void TestImage::onReceiveMessage(const ewol::EMessage& _msg) {
} else if (_msg.getMessage() == l_eventChangeImage) {
if (NULL!=m_testWidget) {
static int32_t countID = 1;
switch (countID)
{
switch (countID) {
case 0:
m_testWidget->setFile("DATA:stone.png");
break;

11
sources/appl/TestLabel.cpp
View File

@ -159,10 +159,9 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) {
if (m_testWidget == _msg.getCaller()) {
APPL_WARNING("Receive Event from tested Button ... : " << _msg );
}
if (_msg.getMessage() == l_eventChangeExpendX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
} else {
m_testWidget->setExpand(bvec2(true,m_testWidget->getExpand().y()));
@ -170,7 +169,7 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeExpendY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),true));
} else {
m_testWidget->setExpand(bvec2(m_testWidget->getExpand().x(),false));
@ -178,7 +177,7 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillX) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(true,m_testWidget->getFill().y()));
} else {
m_testWidget->setFill(bvec2(false,m_testWidget->getFill().y()));
@ -186,7 +185,7 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeFillY) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),true));
} else {
m_testWidget->setFill(bvec2(m_testWidget->getFill().x(),false));
@ -194,7 +193,7 @@ void TestLabel::onReceiveMessage(const ewol::EMessage& _msg) {
}
} else if (_msg.getMessage() == l_eventChangeMaxSize) {
if (NULL!=m_testWidget) {
if (_msg.getData()=="1") {
if (_msg.getData()=="true") {
m_testWidget->setMaxSize(vec2(400,9999999999));
} else {
m_testWidget->setNoMaxSize();