Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In BALM::Area rename fTopLeftInset to fLeftTopInset.

Browse Source 
This is consistent with for instance, the BSize ctor.
This commit is contained in:
Alex Wilson 2012-01-18 09:08:53 +13:00
parent f0307e765e
commit 895414da9d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/libs/alm/Area.h
View File

@ -131,7 +131,7 @@ private:
BSize fShrinkPenalties; BSize fShrinkPenalties;
BSize fGrowPenalties; BSize fGrowPenalties;
BSize fTopLeftInset; BSize fLeftTopInset;
BSize fRightBottomInset; BSize fRightBottomInset;
double fContentAspectRatio; double fContentAspectRatio;

22
src/libs/alm/Area.cpp
View File

@ -240,9 +240,9 @@ void
Area::GetInsets(float* left, float* top, float* right, float* bottom) const Area::GetInsets(float* left, float* top, float* right, float* bottom) const
{ {
if (left) if (left)
*left = fTopLeftInset.Width(); *left = fLeftTopInset.Width();
if (top) if (top)
*top = fTopLeftInset.Height(); *top = fLeftTopInset.Height();
if (right) if (right)
*right = fRightBottomInset.Width(); *right = fRightBottomInset.Width();
if (bottom) if (bottom)
@ -256,8 +256,8 @@ Area::GetInsets(float* left, float* top, float* right, float* bottom) const
float float
Area::LeftInset() const Area::LeftInset() const
{ {
if (fTopLeftInset.IsWidthSet()) if (fLeftTopInset.IsWidthSet())
return fTopLeftInset.Width(); return fLeftTopInset.Width();
BALMLayout* layout = static_cast<BALMLayout*>(fLayoutItem->Layout()); BALMLayout* layout = static_cast<BALMLayout*>(fLayoutItem->Layout());
return layout->InsetForTab(fLeft.Get()); return layout->InsetForTab(fLeft.Get());
@ -270,8 +270,8 @@ Area::LeftInset() const
float float
Area::TopInset() const Area::TopInset() const
{ {
if (fTopLeftInset.IsHeightSet()) if (fLeftTopInset.IsHeightSet())
return fTopLeftInset.Height(); return fLeftTopInset.Height();
BALMLayout* layout = static_cast<BALMLayout*>(fLayoutItem->Layout()); BALMLayout* layout = static_cast<BALMLayout*>(fLayoutItem->Layout());
return layout->InsetForTab(fTop.Get()); return layout->InsetForTab(fTop.Get());
@ -312,7 +312,7 @@ Area::SetInsets(float insets)
if (insets != B_SIZE_UNSET) if (insets != B_SIZE_UNSET)
insets = BControlLook::ComposeSpacing(insets); insets = BControlLook::ComposeSpacing(insets);
fTopLeftInset.Set(insets, insets); fLeftTopInset.Set(insets, insets);
fRightBottomInset.Set(insets, insets); fRightBottomInset.Set(insets, insets);
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
} }
@ -326,7 +326,7 @@ Area::SetInsets(float horizontal, float vertical)
if (vertical != B_SIZE_UNSET) if (vertical != B_SIZE_UNSET)
vertical = BControlLook::ComposeSpacing(vertical); vertical = BControlLook::ComposeSpacing(vertical);
fTopLeftInset.Set(horizontal, horizontal); fLeftTopInset.Set(horizontal, horizontal);
fRightBottomInset.Set(vertical, vertical); fRightBottomInset.Set(vertical, vertical);
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
} }
@ -344,7 +344,7 @@ Area::SetInsets(float left, float top, float right, float bottom)
if (bottom != B_SIZE_UNSET) if (bottom != B_SIZE_UNSET)
bottom = BControlLook::ComposeSpacing(bottom); bottom = BControlLook::ComposeSpacing(bottom);
fTopLeftInset.Set(left, top); fLeftTopInset.Set(left, top);
fRightBottomInset.Set(right, bottom); fRightBottomInset.Set(right, bottom);
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
} }
@ -356,7 +356,7 @@ Area::SetInsets(float left, float top, float right, float bottom)
void void
Area::SetLeftInset(float left) Area::SetLeftInset(float left)
{ {
fTopLeftInset.width = left; fLeftTopInset.width = left;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
} }
@ -367,7 +367,7 @@ Area::SetLeftInset(float left)
void void
Area::SetTopInset(float top) Area::SetTopInset(float top)
{ {
fTopLeftInset.height = top; fLeftTopInset.height = top;
fLayoutItem->Layout()->InvalidateLayout(); fLayoutItem->Layout()->InvalidateLayout();
} }