diff --git a/sources/ewol/renderer/os/gui.X11.cpp b/sources/ewol/renderer/os/gui.X11.cpp index c5808fec..5eb4f7bf 100644 --- a/sources/ewol/renderer/os/gui.X11.cpp +++ b/sources/ewol/renderer/os/gui.X11.cpp @@ -358,9 +358,9 @@ void guiInterface::SetIcon(etk::UString inputFile) for(ivec2 pos(0,0); pos.y()>3))<<11 - + ((uint16_t)((uint16_t)tmpColor.g>>2))<<5 - + ((uint16_t)((uint16_t)tmpColor.b>>3)); + int16_t tmpVal = (((uint16_t)((uint16_t)tmpColor.r>>3))<<11) + + (((uint16_t)((uint16_t)tmpColor.g>>2))<<5) + + ((uint16_t)((uint16_t)tmpColor.b>>3)); *tmpPointer++ = (uint8_t)(tmpVal>>8); *tmpPointer++ = (uint8_t)(tmpVal&0x00FF); } diff --git a/sources/ewol/widget/Label.cpp b/sources/ewol/widget/Label.cpp index c259be59..9b66b98c 100644 --- a/sources/ewol/widget/Label.cpp +++ b/sources/ewol/widget/Label.cpp @@ -145,6 +145,5 @@ bool widget::Label::LoadXML(TiXmlNode* _node) // TODO : Unparse data type XML ... EWOL_DEBUG("Load label:" << _node->ToElement()->GetText()); SetLabel(_node->ToElement()->GetText()); - EWOL_ERROR(" parse text : \"" << m_label << "\""); return true; } diff --git a/sources/ewol/widget/PopUp.cpp b/sources/ewol/widget/PopUp.cpp index e899249b..918a4adc 100644 --- a/sources/ewol/widget/PopUp.cpp +++ b/sources/ewol/widget/PopUp.cpp @@ -64,7 +64,6 @@ void widget::PopUp::SetShaperName(const etk::UString& _shaperName) void widget::PopUp::CalculateSize(const vec2& _availlable) { ewol::Widget::CalculateSize(_availlable); - m_size = _availlable; if (NULL != m_subWidget) { vec2 subWidgetSize = m_subWidget->GetCalculateMinSize(); if (true == m_subWidget->CanExpand().x()) { @@ -117,6 +116,14 @@ void widget::PopUp::OnRegenerateDisplay(void) m_shaper.Clear(); vec2 padding = m_shaper.GetPadding(); vec2 tmpSize(0,0); + bvec2 expand = CanExpand(); + bvec2 fill = CanFill(); + if (fill.x()) { + tmpSize.setX(m_size.x()-padding.x()*2); + } + if (fill.y()) { + tmpSize.setY(m_size.y()-padding.y()*2); + } if (NULL != m_subWidget) { vec2 tmpSize = m_subWidget->GetSize(); }