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

Fix the check for the max tab offset when there is only one tab.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42528 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-08-01 01:30:47 +00:00
parent bd545a2af2
commit e089170a15
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/decorator/DefaultDecorator.cpp
+28 -16
View File
@@ -452,9 +452,12 @@ DefaultDecorator::_DoLayout()
void
DefaultDecorator::_DoTabLayout()
{
float tabPosition = 0;
if (fTabList.CountItems() == 1)
tabPosition = _TabAt(0)->tabOffset;
float tabOffset = 0;
if (fTabList.CountItems() == 1) {
float tabSize;
tabOffset = _SingleTabOffsetAndSize(tabSize);
}
float sumTabWidth = 0;
// calculate our tab rect
for (int32 i = 0; i < fTabList.CountItems(); i++) {
@@ -524,15 +527,15 @@ DefaultDecorator::_DoTabLayout()
// make sure fTabOffset is within limits and apply it to
// the tabRect
if (tab->tabLocation != 0.0
tab->tabOffset = (uint32)tabOffset;
if (tab->tabLocation != 0.0 && fTabList.CountItems() == 1
&& tab->tabOffset > (fRightBorder.right - fLeftBorder.left
- tabRect.Width())) {
tab->tabOffset = uint32(fRightBorder.right - fLeftBorder.left
- tabRect.Width());
}
tab->tabOffset = (uint32)tabPosition;
tabRect.OffsetBy(tab->tabOffset, 0);
tabPosition += tabRect.Width();
tabOffset += tabRect.Width();
sumTabWidth += tabRect.Width();
}
@@ -1253,17 +1256,8 @@ DefaultDecorator::_ResizeBy(BPoint offset, BRegion* dirty)
BRect oldTabRect(tabRect);
float tabSize;
float maxLocation;
if (fLook != kLeftTitledWindowLook) {
tabSize = fRightBorder.right - fLeftBorder.left;
} else {
tabSize = fBottomBorder.bottom - fTopBorder.top;
}
maxLocation = tabSize - tab->maxTabSize;
if (maxLocation < 0)
maxLocation = 0;
float tabOffset = _SingleTabOffsetAndSize(tabSize);
float tabOffset = floorf(tab->tabLocation * maxLocation);
float delta = tabOffset - tab->tabOffset;
tab->tabOffset = (uint32)tabOffset;
if (fLook != kLeftTitledWindowLook)
@@ -1888,6 +1882,24 @@ DefaultDecorator::_DefaultTextOffset() const
}
float
DefaultDecorator::_SingleTabOffsetAndSize(float& tabSize)
{
float maxLocation;
if (fLook != kLeftTitledWindowLook) {
tabSize = fRightBorder.right - fLeftBorder.left;
} else {
tabSize = fBottomBorder.bottom - fTopBorder.top;
}
DefaultDecorator::Tab* tab = _TabAt(0);
maxLocation = tabSize - tab->maxTabSize;
if (maxLocation < 0)
maxLocation = 0;
return floorf(tab->tabLocation * maxLocation);
}
void
DefaultDecorator::_CalculateTabsRegion()
{
src/servers/app/decorator/DefaultDecorator.h
+1
View File
@@ -181,6 +181,7 @@ private:
Decorator::Tab* tab = NULL);
inline float _DefaultTextOffset() const;
inline float _SingleTabOffsetAndSize(float& tabSize);
void _CalculateTabsRegion();
protected: