From 298bd2d10685706bf697d71e657d2e873e361741 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Sat, 6 Feb 2016 23:03:03 +0100 Subject: [PATCH] [DEBUG] correct gravity of the checkbox when not filling the area --- ewol/widget/CheckBox.cpp | 1 - ewol/widget/Container2.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ewol/widget/CheckBox.cpp b/ewol/widget/CheckBox.cpp index 633881b7..3df81ff1 100644 --- a/ewol/widget/CheckBox.cpp +++ b/ewol/widget/CheckBox.cpp @@ -34,7 +34,6 @@ ewol::widget::CheckBox::CheckBox() : m_shaperIdSizeInsize(-1), m_value(*this, "value", false, "Basic value of the widget") { addObjectType("ewol::widget::CheckBox"); - // shaper satatus update: CheckStatus(); // This widget can have the focus ... diff --git a/ewol/widget/Container2.cpp b/ewol/widget/Container2.cpp index 1d5143fc..82241eb1 100644 --- a/ewol/widget/Container2.cpp +++ b/ewol/widget/Container2.cpp @@ -125,7 +125,8 @@ ewol::Padding ewol::widget::Container2::onChangeSizePadded(const ewol::Padding& if (m_userFill->y() == true) { subElementSize.setY(m_size.y()); } - vec2 origin = (m_size - subElementSize)*0.5f + vec2(_padding.xLeft(), _padding.yButtom()); + vec2 delta = ewol::gravityGenerateDelta(m_gravity, m_size - subElementSize); + vec2 origin = delta + vec2(_padding.xLeft(), _padding.yButtom()); subElementSize -= vec2(_padding.x(), _padding.y()); for (size_t iii = 0; iii < 2; ++iii) { if (m_subWidget[iii] != nullptr) { @@ -141,7 +142,10 @@ ewol::Padding ewol::widget::Container2::onChangeSizePadded(const ewol::Padding& vec2 selectableAreaPos = origin-vec2(_padding.xLeft(), _padding.yButtom()); vec2 selectableAreaEndPos = m_size - (selectableAreaPos + subElementSize + vec2(_padding.x(), _padding.y())); markToRedraw(); - return ewol::Padding(selectableAreaPos.x(), selectableAreaEndPos.y(), selectableAreaEndPos.x(), selectableAreaPos.y()); + return ewol::Padding(selectableAreaPos.x(), + selectableAreaEndPos.y(), + selectableAreaEndPos.x(), + selectableAreaPos.y()); } void ewol::widget::Container2::calculateMinMaxSizePadded(const ewol::Padding& _padding) {