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

[DEBUG] correct gravity of the checkbox when not filling the area

Browse Source
This commit is contained in:
Edouard DUPIN 2016-02-06 23:03:03 +01:00
parent 1490c4324a
commit 298bd2d106
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ewol/widget/CheckBox.cpp
View File

@ -34,7 +34,6 @@ ewol::widget::CheckBox::CheckBox() :
m_shaperIdSizeInsize(-1), m_shaperIdSizeInsize(-1),
m_value(*this, "value", false, "Basic value of the widget") { m_value(*this, "value", false, "Basic value of the widget") {
addObjectType("ewol::widget::CheckBox"); addObjectType("ewol::widget::CheckBox");
// shaper satatus update: // shaper satatus update:
CheckStatus(); CheckStatus();
// This widget can have the focus ... // This widget can have the focus ...

8
ewol/widget/Container2.cpp
View File

@ -125,7 +125,8 @@ ewol::Padding ewol::widget::Container2::onChangeSizePadded(const ewol::Padding&
if (m_userFill->y() == true) { if (m_userFill->y() == true) {
subElementSize.setY(m_size.y()); 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()); subElementSize -= vec2(_padding.x(), _padding.y());
for (size_t iii = 0; iii < 2; ++iii) { for (size_t iii = 0; iii < 2; ++iii) {
if (m_subWidget[iii] != nullptr) { 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 selectableAreaPos = origin-vec2(_padding.xLeft(), _padding.yButtom());
vec2 selectableAreaEndPos = m_size - (selectableAreaPos + subElementSize + vec2(_padding.x(), _padding.y())); vec2 selectableAreaEndPos = m_size - (selectableAreaPos + subElementSize + vec2(_padding.x(), _padding.y()));
markToRedraw(); 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) { void ewol::widget::Container2::calculateMinMaxSizePadded(const ewol::Padding& _padding) {