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

[DEBUG correction of the half pixel display on the widget

Browse Source
This commit is contained in:
Edouard DUPIN 2013-05-22 21:28:45 +02:00
parent 81458d0523
commit 9b025cee66
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit b433625df8188ca5d27d5adb1eedbf42c4590744
Subproject commit a2c5f8ac4e73a0981316099b400ee0b627054cab

4
sources/ewol/widget/ContextMenu.cpp
View File

@ -199,8 +199,10 @@ void widget::ContextMenu::OnRegenerateDisplay(void)
}
bool widget::ContextMenu::OnEventInput(const ewol::EventInput& _event)
{
//EWOL_INFO("Event ouside the context menu");
if (_event.GetId() > 0) {
if (NULL != widget::Container::GetWidgetAtPos(_event.GetPos())) {
return false;
}
if( _event.GetStatus() == ewol::keyEvent::statusDown
|| _event.GetStatus() == ewol::keyEvent::statusMove
|| _event.GetStatus() == ewol::keyEvent::statusSingle

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

@ -120,10 +120,11 @@ void widget::Menu::AddSpacer(void)
void widget::Menu::OnReceiveMessage(const ewol::EMessage& _msg)
{
/*
if (true == ewol::Sizer$::OnReceiveMessage(_msg) {
if (true == ewol::Sizer::OnReceiveMessage(_msg) {
return true;
}
*/
EWOL_ERROR(" receive message : " << _msg);
if (_msg.GetMessage() == widget::Button::eventPressed) {
for(int32_t iii=0; iii<m_listElement.Size(); iii++) {
if (_msg.GetCaller() == m_listElement[iii]->m_widgetPointer) {
@ -173,8 +174,8 @@ void widget::Menu::OnReceiveMessage(const ewol::EMessage& _msg)
widget::Sizer * mySizer = NULL;
widget::Button * myButton = NULL;
// TODO : Set a gird ...
mySizer = new widget::Sizer(widget::Sizer::modeVert);
if (NULL != mySizer) {
mySizer->LockExpand(vec2(true,true));
// set it in the pop-up-system :
m_widgetContextMenu->SetSubWidget(mySizer);
@ -209,6 +210,7 @@ void widget::Menu::OnReceiveMessage(const ewol::EMessage& _msg)
}
}
}
}
ewol::WindowsPopUpAdd(m_widgetContextMenu);
}
return;

37
sources/ewol/widget/Widget.cpp
View File

@ -279,24 +279,24 @@ void ewol::Widget::SystemDraw(const DrawProperty& _displayProp)
return;
}
glViewport( tmpSize.m_origin.x(),
tmpSize.m_origin.y(),
tmpSize.m_size.x(),
tmpSize.m_size.y());
glViewport( (int32_t)tmpSize.m_origin.x(),
(int32_t)tmpSize.m_origin.y(),
(int32_t)tmpSize.m_size.x(),
(int32_t)tmpSize.m_size.y());
// special case, when origin < display origin, we need to cut the display :
ivec2 downOffset = m_origin - tmpSize.m_origin;
downOffset.setMin(ivec2(0,0));
mat4 tmpTranslate = etk::matTranslate(vec3(-tmpSize.m_size.x()/2+m_offset.x() + downOffset.x(),
mat4 tmpTranslate = etk::matTranslate(vec3ClipInt32(vec3(-tmpSize.m_size.x()/2+m_offset.x() + downOffset.x(),
-tmpSize.m_size.y()/2+m_offset.y() + downOffset.y(),
-1.0f));
-1.0f)));
mat4 tmpScale = etk::matScale(vec3(m_zoom, m_zoom, 1.0f));
mat4 tmpProjection = etk::matOrtho(-tmpSize.m_size.x()/2,
tmpSize.m_size.x()/2,
-tmpSize.m_size.y()/2,
tmpSize.m_size.y()/2,
-1,
1);
mat4 tmpProjection = etk::matOrtho((int32_t)(-tmpSize.m_size.x())>>1,
(int32_t)( tmpSize.m_size.x())>>1,
(int32_t)(-tmpSize.m_size.y())>>1,
(int32_t)( tmpSize.m_size.y())>>1,
(int32_t)(-1),
(int32_t)( 1));
mat4 tmpMat = tmpProjection * tmpScale * tmpTranslate;
ewol::openGL::Push();
@ -307,8 +307,7 @@ void ewol::Widget::SystemDraw(const DrawProperty& _displayProp)
#ifdef old_PLOP
if( (_displayProp.m_origin.x() > m_origin.x())
|| (_displayProp.m_origin.x() + _displayewol::Widget::Prop.m_size.x() < m_size.x() + m_origin.x()) ) {
EWOL_CRITICAL("plop");
|| (_displayProp.m_origin.x() + _displayProp.m_size.x() < m_size.x() + m_origin.x()) ) {
// here we invert the reference of the standard OpenGl view because the reference in the common display is Top left and not buttom left
int32_t tmpOriginX = etk_max(_displayProp.m_origin.x(), m_origin.x());
int32_t tmppp1 = _displayProp.m_origin.x() + _displayProp.m_size.x();
@ -330,11 +329,8 @@ void ewol::Widget::SystemDraw(const DrawProperty& _displayProp)
mat4 tmpMat = tmpProjection * tmpScale * tmpTranslate;
// set internal matrix system :
ewol::openGL::SetMatrix(tmpMat);
// Call the widget drawing methode
_displayProp.m_origin.setValue(tmpOriginX, tmpOriginY);
_displayProp.m_size.setValue(tmpclipX, m_size.y());
//int64_t ___startTime = ewol::GetTime();
OnDraw(_displayProp);
OnDraw();
//float ___localTime = (float)(ewol::GetTime() - ___startTime) / 1000.0f;
//EWOL_DEBUG(" Widget1 : " << ___localTime << "ms ");
} else {
@ -349,11 +345,8 @@ void ewol::Widget::SystemDraw(const DrawProperty& _displayProp)
mat4 tmpMat = tmpProjection * tmpScale * tmpTranslate;
// set internal matrix system :
ewol::openGL::SetMatrix(tmpMat);
// Call the widget drawing methode
_displayProp.m_origin = m_origin;
_displayProp.m_size = m_size;
//int64_t ___startTime = ewol::GetTime();
OnDraw(_displayProp);
OnDraw();
//float ___localTime = (float)(ewol::GetTime() - ___startTime) / 1000.0f;
//EWOL_DEBUG(" Widget2 : " << ___localTime << "ms ");
}