i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* When inside a layouted environment, InvalidateLayout() in MakeDefault()

Browse Source 
instead of just resizing.
* When the view thinks it knows the correct size, it needs to
  ResetLayoutInvalidation(). TODO: Actually all views that cache layout size
  info need to do this.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36214 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-04-13 13:19:49 +00:00
parent d2e28b603d
commit a66b66ff5a
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Button.cpp
+14 -4
View File
@@ -429,8 +429,12 @@ BButton::MakeDefault(bool flag)
if (!fDrawAsDefault) { if (!fDrawAsDefault) {
fDrawAsDefault = true; fDrawAsDefault = true;
ResizeBy(6.0f, 6.0f); if ((Flags() & B_SUPPORTS_LAYOUT) != 0)
MoveBy(-3.0f, -3.0f); InvalidateLayout();
else {
ResizeBy(6.0f, 6.0f);
MoveBy(-3.0f, -3.0f);
}
} }
if (window && oldDefault != this) if (window && oldDefault != this)
@@ -441,8 +445,12 @@ BButton::MakeDefault(bool flag)
fDrawAsDefault = false; fDrawAsDefault = false;
ResizeBy(-6.0f, -6.0f); if ((Flags() & B_SUPPORTS_LAYOUT) != 0)
MoveBy(3.0f, 3.0f); InvalidateLayout();
else {
ResizeBy(-6.0f, -6.0f);
MoveBy(3.0f, 3.0f);
}
if (window && oldDefault == this) if (window && oldDefault == this)
window->SetDefaultButton(NULL); window->SetDefaultButton(NULL);
@@ -727,6 +735,8 @@ BButton::_ValidatePreferredSize()
fPreferredSize.height fPreferredSize.height
= ceilf((fontHeight.ascent + fontHeight.descent) * 1.8) = ceilf((fontHeight.ascent + fontHeight.descent) * 1.8)
+ (fDrawAsDefault ? 6.0f : 0); + (fDrawAsDefault ? 6.0f : 0);
ResetLayoutInvalidation();
} }
return fPreferredSize; return fPreferredSize;