diff --git a/build b/build index d0356e2f..810f699b 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit d0356e2fd0ef6e8f34fd0ab673a016fc8b6b5b42 +Subproject commit 810f699b6c58a82381b7291faba0db76048d83ff diff --git a/sources/ewol/renderer/ResourceManager.cpp b/sources/ewol/renderer/ResourceManager.cpp index 12fd3682..33be85a8 100644 --- a/sources/ewol/renderer/ResourceManager.cpp +++ b/sources/ewol/renderer/ResourceManager.cpp @@ -10,6 +10,7 @@ #include #include #include +#include // Specific for the resource : @@ -80,6 +81,7 @@ void ewol::resource::ReLoadResources(void) } } } + ewol::RequestUpdateSize(); EWOL_INFO("------------- Resources -------------"); } diff --git a/sources/ewol/widget/Container.cpp b/sources/ewol/widget/Container.cpp index f4ed073e..5412978b 100644 --- a/sources/ewol/widget/Container.cpp +++ b/sources/ewol/widget/Container.cpp @@ -101,12 +101,7 @@ void widget::Container::CalculateMinMaxSize(void) if (NULL!=m_subWidget) { m_subWidget->CalculateMinMaxSize(); vec2 min = m_subWidget->GetCalculateMinSize(); - if (m_minSize.x() Please set pourcent size of the popo_up view"); - m_minSize.setValue(50, 50); - } else { - m_minSize = m_userMinSize.GetPixel(); - } - if (NULL != m_subWidget) { - m_subWidget->CalculateMinMaxSize(); - vec2 tmpSize = m_subWidget->GetCalculateMinSize(); - m_minSize.setMax(tmpSize); - } - EWOL_DEBUG("CalculateMinSize=" << m_minSize); - MarkToRedraw(); -} - void widget::PopUp::OnDraw(ewol::DrawProperty& displayProp) { // draw upper classes diff --git a/sources/ewol/widget/PopUp.h b/sources/ewol/widget/PopUp.h index 306d52c1..e665b00e 100644 --- a/sources/ewol/widget/PopUp.h +++ b/sources/ewol/widget/PopUp.h @@ -32,7 +32,7 @@ namespace widget { public: // Derived function virtual void OnRegenerateDisplay(void); virtual void CalculateSize(const vec2& availlable); - virtual void CalculateMinMaxSize(void); + //virtual void CalculateMinMaxSize(void); virtual const char * const GetObjectType(void) { return "ewol::PopUp"; }; virtual ewol::Widget* GetWidgetAtPos(const vec2& pos); }; diff --git a/sources/ewol/widget/Sizer.cpp b/sources/ewol/widget/Sizer.cpp index 963dea3a..030b5b4a 100644 --- a/sources/ewol/widget/Sizer.cpp +++ b/sources/ewol/widget/Sizer.cpp @@ -111,22 +111,22 @@ void widget::Sizer::CalculateSize(const vec2& availlable) vec2 tmpSize = m_subWidget[iii]->GetCalculateMinSize(); // Set the origin : //EWOL_DEBUG("[" << GetId() << "] Set ORIGIN : " << tmpOrigin); - m_subWidget[iii]->SetOrigin(tmpOrigin); + m_subWidget[iii]->SetOrigin(vec2ClipInt32(tmpOrigin)); // Now Update his Size his size in X and the curent sizer size in Y: if (m_mode==widget::Sizer::modeVert) { if (true == m_subWidget[iii]->CanExpand().y()) { - m_subWidget[iii]->CalculateSize(vec2(m_size.x(), tmpSize.y()+sizeToAddAtEveryOne)); + m_subWidget[iii]->CalculateSize(vec2ClipInt32(vec2(m_size.x(), tmpSize.y()+sizeToAddAtEveryOne))); tmpOrigin.setY(tmpOrigin.y() + tmpSize.y()+sizeToAddAtEveryOne); } else { - m_subWidget[iii]->CalculateSize(vec2(m_size.x(), tmpSize.y())); + m_subWidget[iii]->CalculateSize(vec2ClipInt32(vec2(m_size.x(), tmpSize.y()))); tmpOrigin.setY(tmpOrigin.y() + tmpSize.y()); } } else { if (true == m_subWidget[iii]->CanExpand().x()) { - m_subWidget[iii]->CalculateSize(vec2(tmpSize.x()+sizeToAddAtEveryOne, m_size.y())); + m_subWidget[iii]->CalculateSize(vec2ClipInt32(vec2(tmpSize.x()+sizeToAddAtEveryOne, m_size.y()))); tmpOrigin.setX(tmpOrigin.x() + tmpSize.x()+sizeToAddAtEveryOne); } else { - m_subWidget[iii]->CalculateSize(vec2(tmpSize.x(), m_size.y())); + m_subWidget[iii]->CalculateSize(vec2ClipInt32(vec2(tmpSize.x(), m_size.y()))); tmpOrigin.setX(tmpOrigin.x() + tmpSize.x()); } } diff --git a/sources/ewol/widget/meta/FileChooser.cpp b/sources/ewol/widget/meta/FileChooser.cpp index fd8964e4..81aa4a74 100644 --- a/sources/ewol/widget/meta/FileChooser.cpp +++ b/sources/ewol/widget/meta/FileChooser.cpp @@ -119,6 +119,7 @@ widget::FileChooser::FileChooser(void) EWOL_ERROR("Can not allocate widget ==> display might be in error"); } else { mySizerVert->LockExpand(bvec2(true,true)); + mySizerVert->SetExpand(bvec2(true,true)); // set it in the pop-up-system : SetSubWidget(mySizerVert); diff --git a/sources/ewol/widget/meta/Parameter.cpp b/sources/ewol/widget/meta/Parameter.cpp index 41be32ea..c1c60071 100644 --- a/sources/ewol/widget/meta/Parameter.cpp +++ b/sources/ewol/widget/meta/Parameter.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -49,6 +50,7 @@ widget::Parameter::Parameter(void) : } else { EWOL_INFO("add widget"); mySizerVert->LockExpand(bvec2(true,true)); + mySizerVert->SetExpand(bvec2(true,true)); // set it in the pop-up-system : SetSubWidget(mySizerVert); @@ -66,17 +68,21 @@ widget::Parameter::Parameter(void) : mySizerHori->SubWidgetAdd(mySpacer); } - // TODO : set if back : - /* - m_widgetCancel = new widget::Button("Close"); + m_widgetCancel = new widget::Button(); if (NULL == m_widgetCancel) { EWOL_ERROR("Can not allocate widget ==> display might be in error"); } else { - m_widgetCancel->SetImage("icon/Remove.svg"); + m_widgetCancel->SetSubWidget( + new widget::Composer(widget::Composer::String, + "\n" + " \n" + " \n" + " \n" + " \n" + "RegisterOnEvent(this, ewolEventButtonPressed, ewolEventParameterClose); mySizerHori->SubWidgetAdd(m_widgetCancel); } - */ } mySizerHori = new widget::Sizer(widget::Sizer::modeHori); diff --git a/sources/ewol/widget/meta/ParameterList.cpp b/sources/ewol/widget/meta/ParameterList.cpp index 8edb60da..c80c1bbf 100644 --- a/sources/ewol/widget/meta/ParameterList.cpp +++ b/sources/ewol/widget/meta/ParameterList.cpp @@ -51,7 +51,7 @@ widget::ParameterList::~ParameterList(void) } -void widget::ParameterList::CalculateMinSize(void) +void widget::ParameterList::CalculateMinMaxSize(void) { /*int32_t fontId = GetDefaultFontId(); int32_t minWidth = ewol::GetWidth(fontId, m_label); diff --git a/sources/ewol/widget/meta/ParameterList.h b/sources/ewol/widget/meta/ParameterList.h index 5b5a9be0..e1cbc3f9 100644 --- a/sources/ewol/widget/meta/ParameterList.h +++ b/sources/ewol/widget/meta/ParameterList.h @@ -46,7 +46,7 @@ namespace widget { virtual const char * const GetObjectType(void) { return "EwolParameterList"; }; virtual ~ParameterList(void); // Derived function - virtual void CalculateMinSize(void); + virtual void CalculateMinMaxSize(void); void SetLabel(etk::UString newLabel); // Drawing capabilities .... private: