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

Updated decorators to reflect the removal of _layerdata

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6603 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2004-02-15 20:31:40 +00:00
parent 67387a90b7
commit 747e75bf8d
3 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/add-ons/decorators/BeDecorator/BeDecorator.cpp
View File

@ -207,7 +207,7 @@ void BeDecorator::_DoLayout(void)
if(strlen(GetTitle())>1)
{
if(_driver)
titlepixelwidth=_driver->StringWidth(GetTitle(),_TitleWidth(), &_layerdata);
titlepixelwidth=_driver->StringWidth(GetTitle(),_TitleWidth(), &_drawdata);
else
titlepixelwidth=10;
@ -330,8 +330,8 @@ void BeDecorator::_DrawTitle(BRect r)
STRACE(("_DrawTitle(%f,%f,%f,%f)\n", r.left, r.top, r.right, r.bottom));
// Designed simply to redraw the title when it has changed on
// the client side.
_layerdata.highcolor=_colors->window_tab_text;
_layerdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
_drawdata.highcolor=_colors->window_tab_text;
_drawdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
int32 titlecount=_ClipTitle((_zoomrect.left-textoffset)-(_closerect.right+textoffset));
BString titlestr( GetTitle() );
@ -347,10 +347,10 @@ void BeDecorator::_DrawTitle(BRect r)
// is a little different. If it isn't moved, title placement looks really funky
if(_look==B_FLOATING_WINDOW_LOOK)
_driver->DrawString(titlestr.String(),titlecount,
BPoint(_closerect.right+textoffset,_closerect.bottom+1),&_layerdata);
BPoint(_closerect.right+textoffset,_closerect.bottom+1),&_drawdata);
else
_driver->DrawString(titlestr.String(),titlecount,
BPoint(_closerect.right+textoffset,_closerect.bottom),&_layerdata);
BPoint(_closerect.right+textoffset,_closerect.bottom),&_drawdata);
}
void BeDecorator::_SetFocus(void)
@ -459,7 +459,7 @@ void BeDecorator::DrawBlendedRect(BRect r, bool down)
int32 w=r.IntegerWidth(), h=r.IntegerHeight();
RGBColor temprgbcol;
rgb_color tmpcol,halfcol, startcol, endcol;
rgb_color halfcol, startcol, endcol;
float rstep,gstep,bstep,i;
int steps=(w<h)?w:h;
@ -498,8 +498,8 @@ void BeDecorator::DrawBlendedRect(BRect r, bool down)
BPoint(r.left+i,r.top+steps),temprgbcol);
}
// _layerdata.highcolor=startcol;
// _driver->FillRect(r,&_layerdata,pat_solidhigh);
// _drawdata.highcolor=startcol;
// _driver->FillRect(r,&_drawdata,pat_solidhigh);
_driver->StrokeRect(r,framecolors[3]);
}
@ -510,8 +510,8 @@ void BeDecorator::_DrawFrame(BRect invalid)
// we must clip the lines drawn by this function to the invalid rectangle we are given
#ifdef USE_VIEW_FILL_HACK
_layerdata.highcolor = RGBColor(192,192,192 );
_driver->FillRect(_frame,_layerdata.highcolor);
_drawdata.highcolor = RGBColor(192,192,192 );
_driver->FillRect(_frame,_drawdata.highcolor);
#endif
if(!borderwidth)
@ -780,7 +780,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
}
}
_driver->StrokeLineArray(points,numlines,&_layerdata,colors);
_driver->StrokeLineArray(points,numlines,&_drawdata,colors);
delete rightindices;
delete leftindices;
@ -837,30 +837,30 @@ void BeDecorator::_DrawFrame(BRect invalid)
_driver->Lock();
for(i=0;i<=steps; i++)
{
_layerdata.highcolor.SetColor(uint8(startcol.red-(i*rstep)),
_drawdata.highcolor.SetColor(uint8(startcol.red-(i*rstep)),
uint8(startcol.green-(i*gstep)),
uint8(startcol.blue-(i*bstep)));
_driver->StrokeLine(BPoint(r.left,r.top+i),
BPoint(r.left+i,r.top),_layerdata.highcolor);
BPoint(r.left+i,r.top),_drawdata.highcolor);
_layerdata.highcolor.SetColor(uint8(halfcol.red-(i*rstep)),
_drawdata.highcolor.SetColor(uint8(halfcol.red-(i*rstep)),
uint8(halfcol.green-(i*gstep)),
uint8(halfcol.blue-(i*bstep)));
_driver->StrokeLine(BPoint(r.left+steps,r.top+i),
BPoint(r.left+i,r.top+steps),_layerdata.highcolor);
BPoint(r.left+i,r.top+steps),_drawdata.highcolor);
}
_driver->Unlock();
// _layerdata.highcolor=framecolors[4];
// _driver->StrokeRect(r,&_layerdata,pat_solidhigh);
// _drawdata.highcolor=framecolors[4];
// _driver->StrokeRect(r,&_drawdata,pat_solidhigh);
}
else
{
_layerdata.highcolor=framecolors[4];
_drawdata.highcolor=framecolors[4];
_driver->StrokeLine(BPoint(r.right,r.top),BPoint(r.right-3,r.top),
_layerdata.highcolor);
_drawdata.highcolor);
_driver->StrokeLine(BPoint(r.left,r.bottom),BPoint(r.left,r.bottom-3),
_layerdata.highcolor);
_drawdata.highcolor);
}
}
}

102
src/add-ons/decorators/MacDecorator/MacDecorator.cpp
View File

@ -117,7 +117,7 @@ printf("MacDecorator()::_DoLayout()\n");
_zoomrect.OffsetBy(0-(_zoomrect.Width()+4),0);
if(GetTitle() && _driver)
{
titlepixelwidth=_driver->StringWidth(GetTitle(),strlen(GetTitle()),&_layerdata);
titlepixelwidth=_driver->StringWidth(GetTitle(),strlen(GetTitle()),&_drawdata);
if(titlepixelwidth<(_zoomrect.left-_closerect.right-10))
{
@ -157,11 +157,11 @@ void MacDecorator::MoveBy(BPoint pt)
void MacDecorator::_DrawTitle(BRect r)
{
if(GetFocus())
_layerdata.highcolor=textcol;
_drawdata.highcolor=textcol;
else
_layerdata.highcolor=inactive_textcol;
_drawdata.highcolor=inactive_textcol;
_layerdata.lowcolor=frame_midcol;
_drawdata.lowcolor=frame_midcol;
int32 titlecount=_ClipTitle((_zoomrect.left-5)-(_closerect.right+5));
BString titlestr=GetTitle();
@ -172,7 +172,7 @@ void MacDecorator::_DrawTitle(BRect r)
titlecount+=2;
}
_driver->DrawString(titlestr.String(),titlecount,
BPoint(_tabrect.left+textoffset,_closerect.bottom-1),&_layerdata);
BPoint(_tabrect.left+textoffset,_closerect.bottom-1),&_drawdata);
}
void MacDecorator::GetFootprint(BRegion *region)
@ -210,7 +210,7 @@ printf("MacDecorator::Draw()\n");
// Draw the top view's client area - just a hack :)
// RGBColor blue(100,100,255);
// _layerdata.highcolor=blue;
// _drawdata.highcolor=blue;
_driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,_colors->document_background);
@ -229,26 +229,26 @@ void MacDecorator::_DrawZoom(BRect r)
BPoint pt(r.LeftTop()),pt2(r.RightTop());
pt2.x--;
_layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.y--;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt=r.RightBottom();
pt2=r.RightTop();
pt2.y++;
_layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.x++;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
rect.InsetBy(1,1);
DrawBlendedRect(rect,down);
@ -259,8 +259,8 @@ void MacDecorator::_DrawZoom(BRect r)
rect.left--;
rect.right++;
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.highcolor);
}
void MacDecorator::_DrawClose(BRect r)
@ -273,26 +273,26 @@ void MacDecorator::_DrawClose(BRect r)
BPoint pt(r.LeftTop()),pt2(r.RightTop());
pt2.x--;
_layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.y--;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt=r.RightBottom();
pt2=r.RightTop();
pt2.y++;
_layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.x++;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
rect.InsetBy(1,1);
DrawBlendedRect(rect,down);
@ -303,8 +303,8 @@ void MacDecorator::_DrawClose(BRect r)
// rect.left++;
// rect.right--;
// _layerdata.highcolor.SetColor(0,0,0);
// _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh);
// _drawdata.highcolor.SetColor(0,0,0);
// _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_drawdata,pat_solidhigh);
}
void MacDecorator::_DrawMinimize(BRect r)
@ -317,26 +317,26 @@ void MacDecorator::_DrawMinimize(BRect r)
BPoint pt(r.LeftTop()),pt2(r.RightTop());
pt2.x--;
_layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.y--;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt=r.RightBottom();
pt2=r.RightTop();
pt2.y++;
_layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_drawdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt2=r.LeftBottom();
pt2.x++;
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
rect.InsetBy(1,1);
DrawBlendedRect(rect,down);
@ -347,8 +347,8 @@ void MacDecorator::_DrawMinimize(BRect r)
rect.bottom-=4;
rect.InsetBy(-2,0);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
}
void MacDecorator::_DrawTab(BRect r)
@ -358,12 +358,12 @@ void MacDecorator::_DrawTab(BRect r)
if(_look==B_NO_BORDER_WINDOW_LOOK)
return;
// _layerdata.highcolor=frame_lowcol;
// _driver->StrokeRect(_tabrect,_layerdata.highcolor);
// _drawdata.highcolor=frame_lowcol;
// _driver->StrokeRect(_tabrect,_drawdata.highcolor);
// UpdateTitle(layer->name->String());
BRect rect(_tabrect);
_layerdata.highcolor.SetColor(frame_midcol);
_drawdata.highcolor.SetColor(frame_midcol);
_driver->FillRect(rect,frame_midcol);
@ -387,20 +387,20 @@ void MacDecorator::_DrawTab(BRect r)
BPoint pt(_closerect.right+5,_closerect.top),
pt2(_tabrect.left+textoffset-5,_closerect.top);
_layerdata.highcolor.SetColor(frame_highcol);
_drawdata.highcolor.SetColor(frame_highcol);
for(int32 i=0;i<6;i++)
{
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt.y+=2;
pt2.y+=2;
}
pt.Set(_closerect.right+6,_closerect.top+1),
pt2.Set(_tabrect.left+textoffset-4,_closerect.top+1);
_layerdata.highcolor.SetColor(frame_lowcol);
_drawdata.highcolor.SetColor(frame_lowcol);
for(int32 i=0;i<6;i++)
{
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt.y+=2;
pt2.y+=2;
}
@ -411,19 +411,19 @@ void MacDecorator::_DrawTab(BRect r)
pt2.Set(_zoomrect.left-6,_zoomrect.top);
if(pt.x<pt2.x)
{
_layerdata.highcolor.SetColor(frame_highcol);
_drawdata.highcolor.SetColor(frame_highcol);
for(int32 i=0;i<6;i++)
{
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt.y+=2;
pt2.y+=2;
}
pt.Set(_tabrect.left+textoffset+titlepixelwidth+7,_zoomrect.top+1),
pt2.Set(_zoomrect.left-5,_zoomrect.top+1);
_layerdata.highcolor.SetColor(frame_lowcol);
_drawdata.highcolor.SetColor(frame_lowcol);
for(int32 i=0;i<6;i++)
{
_driver->StrokeLine(pt,pt2,_layerdata.highcolor);
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
pt.y+=2;
pt2.y+=2;
}
@ -477,18 +477,18 @@ void MacDecorator::DrawBlendedRect(BRect r, bool down)
SetRGBColor(&tmpcol, uint8(startcol.red-(i*rstep)),
uint8(startcol.green-(i*gstep)),
uint8(startcol.blue-(i*bstep)));
_layerdata.highcolor=tmpcol;
_drawdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(rect.left,rect.top+i),
BPoint(rect.left+i,rect.top),_layerdata.highcolor);
BPoint(rect.left+i,rect.top),_drawdata.highcolor);
SetRGBColor(&tmpcol, uint8(halfcol.red-(i*rstep)),
uint8(halfcol.green-(i*gstep)),
uint8(halfcol.blue-(i*bstep)) );
_layerdata.highcolor=tmpcol;
_drawdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(rect.left+steps,rect.top+i),
BPoint(rect.left+i,rect.top+steps),_layerdata.highcolor);
BPoint(rect.left+i,rect.top+steps),_drawdata.highcolor);
}
}

38
src/add-ons/decorators/WinDecorator/WinDecorator.cpp
View File

@ -141,8 +141,8 @@ void WinDecorator::GetFootprint(BRegion *region)
void WinDecorator::_DrawTitle(BRect r)
{
_layerdata.highcolor=_colors->window_tab_text;
_layerdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
_drawdata.highcolor=_colors->window_tab_text;
_drawdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
int32 titlecount=_ClipTitle((_minimizerect.left-5)-(_tabrect.left+5));
BString titlestr=GetTitle();
@ -153,7 +153,7 @@ void WinDecorator::_DrawTitle(BRect r)
titlecount+=2;
}
_driver->DrawString(titlestr.String(),titlecount,
BPoint(_tabrect.left+5,_closerect.bottom-1),&_layerdata);
BPoint(_tabrect.left+5,_closerect.bottom-1),&_drawdata);
}
void WinDecorator::_SetFocus(void)
@ -184,7 +184,7 @@ printf("WinDecorator::Draw(): "); update.PrintToStream();
#endif
// Draw the top view's client area - just a hack :)
// RGBColor blue(100,100,255);
// _layerdata.highcolor=blue;
// _drawdata.highcolor=blue;
_driver->FillRect(_borderrect,_colors->document_background);
@ -203,7 +203,7 @@ printf("WinDecorator::Draw()\n");
// Draw the top view's client area - just a hack :)
// RGBColor blue(100,100,255);
// _layerdata.highcolor=blue;
// _drawdata.highcolor=blue;
_driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,_colors->document_background);
@ -227,10 +227,10 @@ void WinDecorator::_DrawZoom(BRect r)
if(GetZoom())
rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
rect.InsetBy(1,1);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_layerdata.highcolor);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.highcolor);
}
@ -249,12 +249,12 @@ void WinDecorator::_DrawClose(BRect r)
if(GetClose())
rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_layerdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_drawdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_drawdata.highcolor);
rect.OffsetBy(1,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_layerdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_layerdata.highcolor);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_drawdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_drawdata.highcolor);
}
void WinDecorator::_DrawMinimize(BRect r)
@ -262,13 +262,13 @@ void WinDecorator::_DrawMinimize(BRect r)
// Just like DrawZoom, but for a Minimize button
DrawBeveledRect(r,GetMinimize());
_layerdata.highcolor=textcol;
_drawdata.highcolor=textcol;
BRect rect(r.left+5,r.bottom-4,r.right-5,r.bottom-3);
if(GetMinimize())
rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_layerdata.highcolor);
_drawdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,_drawdata.highcolor);
}
void WinDecorator::_DrawTab(BRect r)
@ -316,7 +316,7 @@ void WinDecorator::DrawBeveledRect(BRect r, bool down)
BPoint pt;
// Top highlight
_layerdata.highcolor=higher;
_drawdata.highcolor=higher;
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),higher);
// Left highlight
@ -367,8 +367,8 @@ void WinDecorator::_DrawFrame(BRect rect)
BRect r=_borderrect;
_layerdata.highcolor.SetColor(255,0,0);
_driver->StrokeRect(r,_layerdata.highcolor);
_drawdata.highcolor.SetColor(255,0,0);
_driver->StrokeRect(r,_drawdata.highcolor);
BPoint pt;