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

Updated look so inactive window tabs look right

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6224 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-01-22 02:23:08 +00:00
parent 2874b546de
commit da1903328a
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/DefaultDecorator.cpp
+8 -21
View File
@@ -302,12 +302,14 @@ STRACE(("DefaultDecorator: Get Footprint\n"));
if(!region) if(!region)
return; return;
if(_look == B_NO_BORDER_WINDOW_LOOK){ if(_look == B_NO_BORDER_WINDOW_LOOK)
{
region->Set(_frame); region->Set(_frame);
return; return;
} }
if(_look == B_BORDERED_WINDOW_LOOK){ if(_look == B_BORDERED_WINDOW_LOOK)
{
region->Set(_borderrect); region->Set(_borderrect);
return; return;
} }
@@ -316,7 +318,8 @@ STRACE(("DefaultDecorator: Get Footprint\n"));
region->Include(_tabrect); region->Include(_tabrect);
} }
BRect DefaultDecorator::SlideTab(float dx, float dy=0){ BRect DefaultDecorator::SlideTab(float dx, float dy=0)
{
//return Decorator::SlideTab(dx,dy); //return Decorator::SlideTab(dx,dy);
return _tabrect; return _tabrect;
} }
@@ -354,8 +357,6 @@ void DefaultDecorator::_SetFocus(void)
// SetFocus() performs necessary duties for color swapping and // SetFocus() performs necessary duties for color swapping and
// other things when a window is deactivated or activated. // other things when a window is deactivated or activated.
// Removed Adi's short-term color hack and replaced with a more palatable substitute for the old,
// dark colors
if(GetFocus()) if(GetFocus())
{ {
button_highcol.SetColor(tint_color(_colors->window_tab.GetColor32(),B_LIGHTEN_2_TINT)); button_highcol.SetColor(tint_color(_colors->window_tab.GetColor32(),B_LIGHTEN_2_TINT));
@@ -373,6 +374,7 @@ void DefaultDecorator::_SetFocus(void)
void DefaultDecorator::Draw(BRect update) void DefaultDecorator::Draw(BRect update)
{ {
STRACE(("DefaultDecorator: Draw(%.1f,%.1f,%.1f,%.1f)\n",update.left,update.top,update.right,update.bottom)); STRACE(("DefaultDecorator: Draw(%.1f,%.1f,%.1f,%.1f)\n",update.left,update.top,update.right,update.bottom));
// We need to draw a few things: the tab, the resize thumb, the borders, // We need to draw a few things: the tab, the resize thumb, the borders,
// and the buttons // and the buttons
@@ -434,20 +436,6 @@ STRACE(("_DrawTab(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom));
BPoint( _tabrect.right - 2, _tabrect.bottom ), BPoint( _tabrect.right - 2, _tabrect.bottom ),
_layerdata.pensize,_layerdata.highcolor); _layerdata.pensize,_layerdata.highcolor);
_layerdata.highcolor = RGBColor( 255, 255, 0 );
_driver->StrokeLine( BPoint( _tabrect.left + 1, _tabrect.top + 1),
BPoint( _tabrect.left + 1, _tabrect.bottom),
_layerdata.pensize,_layerdata.highcolor);
_driver->StrokeLine( BPoint( _tabrect.left + 1, _tabrect.top + 1),
BPoint( _tabrect.right - 1, _tabrect.top + 1),
_layerdata.pensize,_layerdata.highcolor);
_layerdata.highcolor = RGBColor( 175, 123, 0 );
_driver->StrokeLine( BPoint( _tabrect.right - 1, _tabrect.top + 2),
BPoint( _tabrect.right - 1, _tabrect.bottom),
_layerdata.pensize,_layerdata.highcolor);
_DrawTitle(_tabrect); _DrawTitle(_tabrect);
// Draw the buttons if we're supposed to // Draw the buttons if we're supposed to
@@ -551,9 +539,8 @@ STRACE(("_DrawFrame(%f,%f,%f,%f)\n", invalid.left, invalid.top,
if(_look == B_NO_BORDER_WINDOW_LOOK) if(_look == B_NO_BORDER_WINDOW_LOOK)
return; return;
if(!borderwidth){ if(!borderwidth)
return; return;
}
// Data specifically for the StrokeLineArray call. // Data specifically for the StrokeLineArray call.
int32 numlines=0, maxlines=20; int32 numlines=0, maxlines=20;