atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct the menu not hide error

Browse Source
This commit is contained in:
Edouard DUPIN 2014-08-15 22:49:34 +02:00
parent 71f656fb41
commit bee8936d54
2 changed files with 82 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
sources/ewol/widget/Menu.cpp
View File

@ -50,12 +50,6 @@ void ewol::widget::Menu::subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidge
} }
void ewol::widget::Menu::clear() { void ewol::widget::Menu::clear() {
for (size_t iii=0; iii < m_listElement.size(); iii++) {
if (m_listElement[iii] != nullptr) {
delete(m_listElement[iii]);
m_listElement[iii] = nullptr;
}
}
m_listElement.clear(); m_listElement.clear();
} }
@ -71,46 +65,41 @@ int32_t ewol::widget::Menu::add(int32_t _parent,
std::string _image, std::string _image,
const char *_generateEvent, const char *_generateEvent,
const std::string _message) { const std::string _message) {
ewol::widget::MenuElement* tmpObject = new ewol::widget::MenuElement(); ewol::widget::MenuElement tmpObject;
if (tmpObject == nullptr) { tmpObject.m_localId = m_staticId++;
EWOL_ERROR("Allocation problem"); tmpObject.m_parentId = _parent;
return -1; tmpObject.m_label = std::string("<left>") + _label + "</left>";
} tmpObject.m_image = _image;
tmpObject->m_localId = m_staticId++; tmpObject.m_generateEvent = _generateEvent;
tmpObject->m_parentId = _parent; tmpObject.m_message = _message;
tmpObject->m_widgetPointer = nullptr; if (-1 == tmpObject.m_parentId) {
tmpObject->m_label = std::string("<left>") + _label + "</left>";
tmpObject->m_image = _image;
tmpObject->m_generateEvent = _generateEvent;
tmpObject->m_message = _message;
m_listElement.push_back(tmpObject);
if (-1 == tmpObject->m_parentId) {
std::shared_ptr<ewol::widget::Button> myButton = ewol::widget::Button::create(); std::shared_ptr<ewol::widget::Button> myButton = ewol::widget::Button::create();
if (myButton == nullptr) { if (myButton == nullptr) {
EWOL_ERROR("Allocation button error"); EWOL_ERROR("Allocation button error");
return tmpObject->m_localId; return tmpObject.m_localId;
} }
if (tmpObject->m_image.size()!=0) { if (tmpObject.m_image.size()!=0) {
std::string composeString ="<sizer mode=\"hori\">\n"; std::string composeString ="<sizer mode=\"hori\">\n";
if (etk::end_with(tmpObject->m_image, ".edf") == true) { if (etk::end_with(tmpObject.m_image, ".edf") == true) {
composeString+=" <image src=\"" + tmpObject->m_image + "\" size=\"8,8mm\" distance-field='true'/>\n"; composeString+=" <image src=\"" + tmpObject.m_image + "\" size=\"8,8mm\" distance-field='true'/>\n";
} else { } else {
composeString+=" <image src=\"" + tmpObject->m_image + "\" size=\"8,8mm\"/>\n"; composeString+=" <image src=\"" + tmpObject.m_image + "\" size=\"8,8mm\"/>\n";
} }
composeString+=" <label>" + tmpObject->m_label + "</label>\n"; composeString+=" <label>" + tmpObject.m_label + "</label>\n";
composeString+="</sizer>\n"; composeString+="</sizer>\n";
myButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, composeString)); myButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, composeString));
} else { } else {
myButton->setSubWidget(ewol::widget::Label::create(tmpObject->m_label) ); myButton->setSubWidget(ewol::widget::Label::create(tmpObject.m_label) );
} }
// add it in the widget list // add it in the widget list
ewol::widget::Sizer::subWidgetAdd(myButton); ewol::widget::Sizer::subWidgetAdd(myButton);
// keep the specific event ... // keep the specific event ...
myButton->registerOnEvent(shared_from_this(), ewol::widget::Button::eventPressed, widget::Button::eventPressed); myButton->registerOnEvent(shared_from_this(), ewol::widget::Button::eventPressed, widget::Button::eventPressed);
tmpObject->m_widgetPointer = myButton; tmpObject.m_widgetPointer = myButton;
} }
return tmpObject->m_localId; m_listElement.push_back(tmpObject);
return tmpObject.m_localId;
} }
void ewol::widget::Menu::addSpacer() { void ewol::widget::Menu::addSpacer() {
@ -126,34 +115,36 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
*/ */
EWOL_ERROR(" receive message : " << _msg); EWOL_ERROR(" receive message : " << _msg);
if (_msg.getMessage() == ewol::widget::Button::eventPressed) { if (_msg.getMessage() == ewol::widget::Button::eventPressed) {
for (size_t iii=0; iii<m_listElement.size(); iii++) { for (auto &it : m_listElement) {
if (_msg.getCaller() == m_listElement[iii]->m_widgetPointer) { if (_msg.getCaller() == it.m_widgetPointer.lock()) {
// 2 posible case (have a message or have a child ... // 2 posible case (have a message or have a child ...
if (m_listElement[iii]->m_generateEvent != nullptr) { if (it.m_generateEvent != nullptr) {
EWOL_DEBUG("Menu == > generate Event"); EWOL_DEBUG("Menu == > generate Event");
// Send a multicast event ... // Send a multicast event ...
sendMultiCast(m_listElement[iii]->m_generateEvent, m_listElement[iii]->m_message); sendMultiCast(it.m_generateEvent, it.m_message);
if (nullptr != m_widgetContextMenu) { std::shared_ptr<ewol::widget::ContextMenu> tmpContext = m_widgetContextMenu.lock();
if (tmpContext != nullptr) {
EWOL_DEBUG("Mark the menu to remove ..."); EWOL_DEBUG("Mark the menu to remove ...");
m_widgetContextMenu.reset(); tmpContext->destroy();
} }
return; return;
} else{ } else{
EWOL_DEBUG("Menu == > load Sub Menu"); EWOL_DEBUG("Menu == > load Sub Menu");
bool findChild = false; bool findChild = false;
for (size_t jjj=0; jjj<m_listElement.size(); jjj++) { for (auto &it2 : m_listElement) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) { if (it.m_localId == it2.m_parentId) {
findChild = true; findChild = true;
break; break;
} }
} }
if (false == findChild) { if (false == findChild) {
EWOL_WARNING("Event on menu element with no child an no event... label=" << m_listElement[iii]->m_label); EWOL_WARNING("Event on menu element with no child an no event... label=" << it.m_label);
return; return;
} }
// create a context menu : // create a context menu :
m_widgetContextMenu = ewol::widget::ContextMenu::create(); std::shared_ptr<ewol::widget::ContextMenu> tmpContext = ewol::widget::ContextMenu::create();
if (nullptr == m_widgetContextMenu) { m_widgetContextMenu = tmpContext;
if (tmpContext == nullptr) {
EWOL_ERROR("Allocation Error"); EWOL_ERROR("Allocation Error");
return; return;
} }
@ -167,7 +158,7 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
newPosition.setValue(tmpOri.x() + tmpSize.x()/2, newPosition.setValue(tmpOri.x() + tmpSize.x()/2,
tmpOri.y() ); tmpOri.y() );
} }
m_widgetContextMenu->setPositionMark(ewol::widget::ContextMenu::markTop, newPosition ); tmpContext->setPositionMark(ewol::widget::ContextMenu::markTop, newPosition );
std::shared_ptr<ewol::widget::Sizer> mySizer; std::shared_ptr<ewol::widget::Sizer> mySizer;
std::shared_ptr<ewol::widget::Button> myButton; std::shared_ptr<ewol::widget::Button> myButton;
@ -176,36 +167,32 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
if (nullptr != mySizer) { if (nullptr != mySizer) {
mySizer->lockExpand(vec2(true,true)); mySizer->lockExpand(vec2(true,true));
// set it in the pop-up-system : // set it in the pop-up-system :
m_widgetContextMenu->setSubWidget(mySizer); tmpContext->setSubWidget(mySizer);
bool menuHaveImage = false; bool menuHaveImage = false;
for (int64_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) { for (auto &it2 : m_listElement) {
if (m_listElement[iii]!=nullptr) { if (it.m_localId == it2.m_parentId) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) { if (it2.m_image.size()!=0) {
if (m_listElement[jjj]->m_image.size()!=0) {
menuHaveImage = true; menuHaveImage = true;
break; break;
} }
} }
} }
} for (auto it2=m_listElement.rbegin(); it2!=m_listElement.rend() ; ++it2) {
for (int64_t jjj=m_listElement.size()-1; jjj >= 0; jjj--) { if (it.m_localId == it2->m_parentId) {
if (m_listElement[iii]!=nullptr) {
if (m_listElement[iii]->m_localId == m_listElement[jjj]->m_parentId) {
myButton = ewol::widget::Button::create(); myButton = ewol::widget::Button::create();
if (nullptr == myButton) { if (myButton == nullptr) {
EWOL_ERROR("Allocation Error"); EWOL_ERROR("Allocation Error");
} else { } else {
if (m_listElement[jjj]->m_image.size()!=0) { if (it2->m_image.size()!=0) {
std::string composeString = "<composer expand=\"true,false\" fill=\"true,true\">\n"; std::string composeString = "<composer expand=\"true,false\" fill=\"true,true\">\n";
composeString+= " <sizer mode=\"hori\" expand=\"true,false\" fill=\"true,true\" lock=\"true\">\n"; composeString+= " <sizer mode=\"hori\" expand=\"true,false\" fill=\"true,true\" lock=\"true\">\n";
if (etk::end_with(m_listElement[jjj]->m_image, ".edf") == true) { if (etk::end_with(it2->m_image, ".edf") == true) {
composeString+=" <image src=\"" + m_listElement[jjj]->m_image + "\" size=\"8,8mm\" distance-field='true'/>\n"; composeString+=" <image src=\"" + it2->m_image + "\" size=\"8,8mm\" distance-field='true'/>\n";
} else { } else {
composeString+=" <image src=\"" + m_listElement[jjj]->m_image + "\" size=\"8,8mm\"/>\n"; composeString+=" <image src=\"" + it2->m_image + "\" size=\"8,8mm\"/>\n";
} }
composeString+=" <label exand=\"true,true\" fill=\"true,true\">" + m_listElement[jjj]->m_label + "</label>\n"; composeString+=" <label exand=\"true,true\" fill=\"true,true\">" + it2->m_label + "</label>\n";
composeString+=" </sizer>\n"; composeString+=" </sizer>\n";
composeString+="</composer>\n"; composeString+="</composer>\n";
myButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, composeString)); myButton->setSubWidget(ewol::widget::Composer::create(widget::Composer::String, composeString));
@ -215,11 +202,11 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
std::string("<composer expand=\"true,false\" fill=\"true,true\">\n") + std::string("<composer expand=\"true,false\" fill=\"true,true\">\n") +
" <sizer mode=\"hori\" expand=\"true,false\" fill=\"true,true\" lock=\"true\">\n" " <sizer mode=\"hori\" expand=\"true,false\" fill=\"true,true\" lock=\"true\">\n"
" <spacer min-size=\"8,0mm\"/>\n" " <spacer min-size=\"8,0mm\"/>\n"
" <label exand=\"true,true\" fill=\"true,true\"><![CDATA[" + m_listElement[jjj]->m_label + "]]></label>\n" " <label exand=\"true,true\" fill=\"true,true\"><![CDATA[" + it2->m_label + "]]></label>\n"
" </sizer>\n" " </sizer>\n"
"</composer>\n")); "</composer>\n"));
} else { } else {
std::shared_ptr<ewol::widget::Label> tmpLabel = widget::Label::create(std::string("<left>") + m_listElement[jjj]->m_label + "</left>\n"); std::shared_ptr<ewol::widget::Label> tmpLabel = widget::Label::create(std::string("<left>") + it2->m_label + "</left>\n");
if (tmpLabel != nullptr) { if (tmpLabel != nullptr) {
tmpLabel->setExpand(bvec2(true,false)); tmpLabel->setExpand(bvec2(true,false));
tmpLabel->setFill(bvec2(true,true)); tmpLabel->setFill(bvec2(true,true));
@ -233,8 +220,7 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
myButton->setFill(bvec2(true,false)); myButton->setFill(bvec2(true,false));
// add it in the widget list // add it in the widget list
mySizer->subWidgetAdd(myButton); mySizer->subWidgetAdd(myButton);
m_listElement[jjj]->m_widgetPointer = myButton; it2->m_widgetPointer = myButton;
}
} }
} }
} }
@ -242,9 +228,8 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
std::shared_ptr<ewol::widget::Windows> currentWindows = getWindows(); std::shared_ptr<ewol::widget::Windows> currentWindows = getWindows();
if (currentWindows == nullptr) { if (currentWindows == nullptr) {
EWOL_ERROR("Can not get the curent Windows..."); EWOL_ERROR("Can not get the curent Windows...");
m_widgetContextMenu.reset();
} else { } else {
currentWindows->popUpWidgetPush(m_widgetContextMenu); currentWindows->popUpWidgetPush(tmpContext);
} }
} }
return; return;
@ -254,17 +239,3 @@ void ewol::widget::Menu::onReceiveMessage(const ewol::object::Message& _msg) {
} }
void ewol::widget::Menu::onObjectRemove(const std::shared_ptr<ewol::Object>& _removeObject) {
ewol::widget::Sizer::onObjectRemove(_removeObject);
if (m_widgetContextMenu == _removeObject) {
m_widgetContextMenu.reset();
}
for (size_t jjj=0; jjj<m_listElement.size(); jjj++) {
if (m_listElement[jjj] != nullptr) {
if (m_listElement[jjj]->m_widgetPointer == _removeObject) {
m_listElement[jjj]->m_widgetPointer.reset();
}
}
}
}

9
sources/ewol/widget/Menu.h
View File

@ -23,7 +23,7 @@ namespace ewol {
MenuElement() { }; MenuElement() { };
int32_t m_localId; int32_t m_localId;
int32_t m_parentId; int32_t m_parentId;
std::shared_ptr<ewol::Widget> m_widgetPointer; std::weak_ptr<ewol::Widget> m_widgetPointer;
std::string m_label; std::string m_label;
std::string m_image; std::string m_image;
const char* m_generateEvent; const char* m_generateEvent;
@ -45,17 +45,16 @@ namespace ewol {
virtual void subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidget); virtual void subWidgetRemove(std::shared_ptr<ewol::Widget> _newWidget);
virtual void subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget); virtual void subWidgetUnLink(std::shared_ptr<ewol::Widget> _newWidget);
private: private:
std::vector<ewol::widget::MenuElement*> m_listElement; std::vector<ewol::widget::MenuElement> m_listElement;
int32_t m_staticId; // unique ID for every element of the menu ... int32_t m_staticId; // unique ID for every element of the menu ...
std::shared_ptr<ewol::widget::ContextMenu> m_widgetContextMenu; std::weak_ptr<ewol::widget::ContextMenu> m_widgetContextMenu;
public: public:
void clear(); void clear();
int32_t addTitle(std::string _label, std::string _image="", const char * _generateEvent = nullptr, const std::string _message = ""); int32_t addTitle(std::string _label, std::string _image="", const char * _generateEvent = nullptr, const std::string _message = "");
int32_t add(int32_t parent, std::string _label, std::string _image="", const char * _generateEvent = nullptr, const std::string _message = ""); int32_t add(int32_t _parent, std::string _label, std::string _image="", const char * _generateEvent = nullptr, const std::string _message = "");
void addSpacer(); void addSpacer();
// Derived function // Derived function
virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onReceiveMessage(const ewol::object::Message& _msg);
virtual void onObjectRemove(const std::shared_ptr<ewol::Object>& _removeObject);
}; };
}; };
}; };