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

* more pleasing insets/offsets and the proportion of the zoom button scales

Browse Source 
with the font size


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22005 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2007-08-17 16:24:01 +00:00
parent 871d97a9f5
commit 15a6a1bd6d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/DefaultDecorator.cpp
+11 -10
View File
@@ -1011,17 +1011,19 @@ void
DefaultDecorator::_DrawZoom(BRect r) DefaultDecorator::_DrawZoom(BRect r)
{ {
STRACE(("_DrawZoom(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom)); STRACE(("_DrawZoom(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom));
// If this has been implemented, then the decorator has a Zoom button
// which should be drawn based on the state of the member zoomstate float inset = floorf(r.Width() / 4.0);
BRect zr(r); BRect zr(r);
zr.left += 3.0; zr.left += inset;
zr.top += 3.0; zr.top += inset;
_DrawBlendedRect(zr, GetZoom()); _DrawBlendedRect(zr, GetZoom());
inset = floorf(r.Width() / 2.1);
zr = r; zr = r;
zr.right -= 5.0; zr.right -= inset;
zr.bottom -= 5.0; zr.bottom -= inset;
_DrawBlendedRect(zr, GetZoom()); _DrawBlendedRect(zr, GetZoom());
} }
@@ -1126,15 +1128,14 @@ DefaultDecorator::_GetButtonSizeAndOffset(const BRect& tabRect, float* _offset,
bool smallTab = fLook == B_FLOATING_WINDOW_LOOK bool smallTab = fLook == B_FLOATING_WINDOW_LOOK
|| fLook == kLeftTitledWindowLook; || fLook == kLeftTitledWindowLook;
*_offset = smallTab ? floorf(fDrawState.Font().Size() / 2.5) *_offset = smallTab ? floorf(fDrawState.Font().Size() / 2.6)
: floorf(fDrawState.Font().Size() / 2.0); : floorf(fDrawState.Font().Size() / 2.3);
*_inset = smallTab ? floorf(fDrawState.Font().Size() / 5.0) *_inset = smallTab ? floorf(fDrawState.Font().Size() / 5.0)
: floorf(fDrawState.Font().Size() / 6.0); : floorf(fDrawState.Font().Size() / 6.0);
printf("");
// "+ 2" so that the rects are centered within the solid area // "+ 2" so that the rects are centered within the solid area
// (without the 2 pixels for the top border) // (without the 2 pixels for the top border)
*_size = tabSize - *_inset * *_offset + *_inset; *_size = tabSize - 2 * *_offset + *_inset;
} }
// _LayoutTabItems // _LayoutTabItems