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

Updated to match recent changes in the DisplayDriver API

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6004 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-01-10 13:40:59 +00:00
parent 49916ae455
commit 519933bdac
3 changed files with 109 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/decorators/BeDecorator/BeDecorator.cpp
+18 -27
View File
@@ -335,10 +335,8 @@ printf("BeDecorator: Draw(%.1f,%.1f,%.1f,%.1f)\n",update.left,update.top,update.
_DrawTab(update); _DrawTab(update);
// Draw the top view's client area - just a hack :) // Draw the top view's client area - just a hack :)
_layerdata.highcolor=_colors->document_background;
if(_borderrect.Intersects(update)) if(_borderrect.Intersects(update))
_driver->FillRect(_borderrect & update,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect & update,_colors->document_background);
_DrawFrame(update); _DrawFrame(update);
@@ -384,10 +382,8 @@ void BeDecorator::_DrawTab(BRect r)
if(_look==B_NO_BORDER_WINDOW_LOOK) if(_look==B_NO_BORDER_WINDOW_LOOK)
return; return;
_layerdata.highcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab; _driver->FillRect(_tabrect, ((GetFocus())?_colors->window_tab:_colors->inactive_window_tab) );
_driver->FillRect(_tabrect,&_layerdata,pat_solidhigh); _driver->StrokeLine(_tabrect.LeftBottom(),_tabrect.RightBottom(),1.0,framecolors[3]);
_layerdata.highcolor=framecolors[3];
_driver->StrokeLine(_tabrect.LeftBottom(),_tabrect.RightBottom(),&_layerdata,pat_solidhigh);
_DrawTitle(_tabrect); _DrawTitle(_tabrect);
@@ -439,24 +435,22 @@ void BeDecorator::DrawBlendedRect(BRect r, bool down)
SetRGBColor(&tmpcol, uint8(startcol.red-(i*rstep)), SetRGBColor(&tmpcol, uint8(startcol.red-(i*rstep)),
uint8(startcol.green-(i*gstep)), uint8(startcol.green-(i*gstep)),
uint8(startcol.blue-(i*bstep))); uint8(startcol.blue-(i*bstep)));
_layerdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(r.left,r.top+i), _driver->StrokeLine(BPoint(r.left,r.top+i),
BPoint(r.left+i,r.top),&_layerdata,pat_solidhigh); BPoint(r.left+i,r.top),1.0,tmpcol);
SetRGBColor(&tmpcol, uint8(halfcol.red-(i*rstep)), SetRGBColor(&tmpcol, uint8(halfcol.red-(i*rstep)),
uint8(halfcol.green-(i*gstep)), uint8(halfcol.green-(i*gstep)),
uint8(halfcol.blue-(i*bstep))); uint8(halfcol.blue-(i*bstep)));
_layerdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(r.left+steps,r.top+i), _driver->StrokeLine(BPoint(r.left+steps,r.top+i),
BPoint(r.left+i,r.top+steps),&_layerdata,pat_solidhigh); BPoint(r.left+i,r.top+steps),1.0,tmpcol);
} }
// _layerdata.highcolor=startcol; // _layerdata.highcolor=startcol;
// _driver->FillRect(r,&_layerdata,pat_solidhigh); // _driver->FillRect(r,&_layerdata,pat_solidhigh);
_layerdata.highcolor=framecolors[3]; _driver->StrokeRect(r,1.0,framecolors[3]);
_driver->StrokeRect(r,&_layerdata,pat_solidhigh);
} }
void BeDecorator::_DrawFrame(BRect invalid) void BeDecorator::_DrawFrame(BRect invalid)
@@ -466,7 +460,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
// we must clip the lines drawn by this function to the invalid rectangle we are given // we must clip the lines drawn by this function to the invalid rectangle we are given
#ifdef USE_VIEW_FILL_HACK #ifdef USE_VIEW_FILL_HACK
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect,_layerdata.highcolor);
#endif #endif
if(!borderwidth) if(!borderwidth)
@@ -735,7 +729,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
} }
} }
_driver->StrokeLineArray(points,numlines,colors,&_layerdata); _driver->StrokeLineArray(points,numlines,1.0,colors);
delete rightindices; delete rightindices;
delete leftindices; delete leftindices;
@@ -752,19 +746,16 @@ void BeDecorator::_DrawFrame(BRect invalid)
{ {
r.right-=4; r.right-=4;
r.bottom-=4; r.bottom-=4;
_layerdata.highcolor=framecolors[2];
_driver->StrokeLine(r.LeftTop(),r.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),r.RightTop(),1.0,framecolors[2]);
_driver->StrokeLine(r.LeftTop(),r.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),r.LeftBottom(),1.0,framecolors[2]);
r.OffsetBy(1,1); r.OffsetBy(1,1);
_layerdata.highcolor=framecolors[0]; _driver->StrokeLine(r.LeftTop(),r.RightTop(),1.0,framecolors[0]);
_driver->StrokeLine(r.LeftTop(),r.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),r.LeftBottom(),1.0,framecolors[0]);
_driver->StrokeLine(r.LeftTop(),r.LeftBottom(),&_layerdata,pat_solidhigh);
r.OffsetBy(1,1); r.OffsetBy(1,1);
_layerdata.highcolor=framecolors[1]; _driver->FillRect(r,framecolors[1]);
_driver->FillRect(r,&_layerdata,pat_solidhigh);
/* r.left+=2; /* r.left+=2;
r.top+=2; r.top+=2;
@@ -800,13 +791,13 @@ void BeDecorator::_DrawFrame(BRect invalid)
uint8(startcol.blue-(i*bstep))); uint8(startcol.blue-(i*bstep)));
_driver->StrokeLine(BPoint(r.left,r.top+i), _driver->StrokeLine(BPoint(r.left,r.top+i),
BPoint(r.left+i,r.top),&_layerdata,pat_solidhigh); BPoint(r.left+i,r.top),1.0,_layerdata.highcolor);
_layerdata.highcolor.SetColor(uint8(halfcol.red-(i*rstep)), _layerdata.highcolor.SetColor(uint8(halfcol.red-(i*rstep)),
uint8(halfcol.green-(i*gstep)), uint8(halfcol.green-(i*gstep)),
uint8(halfcol.blue-(i*bstep))); uint8(halfcol.blue-(i*bstep)));
_driver->StrokeLine(BPoint(r.left+steps,r.top+i), _driver->StrokeLine(BPoint(r.left+steps,r.top+i),
BPoint(r.left+i,r.top+steps),&_layerdata,pat_solidhigh); BPoint(r.left+i,r.top+steps),1.0,_layerdata.highcolor);
} }
_driver->Unlock(); _driver->Unlock();
// _layerdata.highcolor=framecolors[4]; // _layerdata.highcolor=framecolors[4];
@@ -816,9 +807,9 @@ void BeDecorator::_DrawFrame(BRect invalid)
{ {
_layerdata.highcolor=framecolors[4]; _layerdata.highcolor=framecolors[4];
_driver->StrokeLine(BPoint(r.right,r.top),BPoint(r.right-3,r.top), _driver->StrokeLine(BPoint(r.right,r.top),BPoint(r.right-3,r.top),
&_layerdata,pat_solidhigh); 1.0,_layerdata.highcolor);
_driver->StrokeLine(BPoint(r.left,r.bottom),BPoint(r.left,r.bottom-3), _driver->StrokeLine(BPoint(r.left,r.bottom),BPoint(r.left,r.bottom-3),
&_layerdata,pat_solidhigh); 1.0,_layerdata.highcolor);
} }
} }
} }
src/add-ons/decorators/MacDecorator/MacDecorator.cpp
+57 -81
View File
@@ -193,11 +193,10 @@ void MacDecorator::Draw(BRect update)
printf("MacDecorator::Draw(): "); update.PrintToStream(); printf("MacDecorator::Draw(): "); update.PrintToStream();
#endif #endif
// Draw the top view's client area - just a hack :) // Draw the top view's client area - just a hack :)
_layerdata.highcolor=_colors->document_background; _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh);
if(_borderrect.Intersects(update)) if(_borderrect.Intersects(update))
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect,_colors->document_background);
_DrawFrame(update); _DrawFrame(update);
_DrawTab(update); _DrawTab(update);
@@ -213,10 +212,8 @@ printf("MacDecorator::Draw()\n");
// RGBColor blue(100,100,255); // RGBColor blue(100,100,255);
// _layerdata.highcolor=blue; // _layerdata.highcolor=blue;
_layerdata.highcolor=_colors->document_background; _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh);
DrawFrame(); DrawFrame();
DrawTab(); DrawTab();
@@ -233,25 +230,25 @@ void MacDecorator::_DrawZoom(BRect r)
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(136,136,136); _layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.y--; pt2.y--;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt=r.RightBottom(); pt=r.RightBottom();
pt2=r.RightTop(); pt2=r.RightTop();
pt2.y++; pt2.y++;
_layerdata.highcolor.SetColor(255,255,255); _layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.x++; pt2.x++;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
DrawBlendedRect(rect,down); DrawBlendedRect(rect,down);
@@ -263,7 +260,7 @@ void MacDecorator::_DrawZoom(BRect r)
rect.right++; rect.right++;
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,_layerdata.highcolor);
} }
void MacDecorator::_DrawClose(BRect r) void MacDecorator::_DrawClose(BRect r)
@@ -277,25 +274,25 @@ void MacDecorator::_DrawClose(BRect r)
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(136,136,136); _layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.y--; pt2.y--;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt=r.RightBottom(); pt=r.RightBottom();
pt2=r.RightTop(); pt2=r.RightTop();
pt2.y++; pt2.y++;
_layerdata.highcolor.SetColor(255,255,255); _layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.x++; pt2.x++;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
DrawBlendedRect(rect,down); DrawBlendedRect(rect,down);
@@ -321,25 +318,25 @@ void MacDecorator::_DrawMinimize(BRect r)
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(136,136,136); _layerdata.highcolor.SetColor(136,136,136);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.y--; pt2.y--;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt=r.RightBottom(); pt=r.RightBottom();
pt2=r.RightTop(); pt2=r.RightTop();
pt2.y++; pt2.y++;
_layerdata.highcolor.SetColor(255,255,255); _layerdata.highcolor.SetColor(255,255,255);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt2=r.LeftBottom(); pt2=r.LeftBottom();
pt2.x++; pt2.x++;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
DrawBlendedRect(rect,down); DrawBlendedRect(rect,down);
@@ -351,7 +348,7 @@ void MacDecorator::_DrawMinimize(BRect r)
rect.InsetBy(-2,0); rect.InsetBy(-2,0);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
} }
void MacDecorator::_DrawTab(BRect r) void MacDecorator::_DrawTab(BRect r)
@@ -362,29 +359,26 @@ void MacDecorator::_DrawTab(BRect r)
return; return;
// _layerdata.highcolor=frame_lowcol; // _layerdata.highcolor=frame_lowcol;
// _driver->StrokeRect(_tabrect,&_layerdata,pat_solidhigh); // _driver->StrokeRect(_tabrect,1.0,_layerdata.highcolor);
// UpdateTitle(layer->name->String()); // UpdateTitle(layer->name->String());
BRect rect(_tabrect); BRect rect(_tabrect);
_layerdata.highcolor.SetColor(frame_midcol); _layerdata.highcolor.SetColor(frame_midcol);
_driver->FillRect(rect,&_layerdata,pat_solidhigh); _driver->FillRect(rect,frame_midcol);
if(GetFocus()) if(GetFocus())
{ {
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,frame_lowercol);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),1.0,frame_lowercol);
_driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.RightBottom(),rect.RightTop(),1.0,frame_lowercol);
_driver->StrokeLine(rect.RightBottom(),rect.RightTop(),&_layerdata,pat_solidhigh);
rect.InsetBy(1,1); rect.InsetBy(1,1);
rect.bottom++; rect.bottom++;
_layerdata.highcolor.SetColor(frame_highcol); _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,frame_highcol);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),1.0,frame_highcol);
_driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.RightBottom(),rect.RightTop(),1.0,frame_lowcol);
_layerdata.highcolor.SetColor(frame_lowcol);
_driver->StrokeLine(rect.RightBottom(),rect.RightTop(),&_layerdata,pat_solidhigh);
// Draw the neat little lines on either side of the title if there's room // Draw the neat little lines on either side of the title if there's room
if((_tabrect.left+textoffset)>(_closerect.right+5)) if((_tabrect.left+textoffset)>(_closerect.right+5))
@@ -396,7 +390,7 @@ void MacDecorator::_DrawTab(BRect r)
_layerdata.highcolor.SetColor(frame_highcol); _layerdata.highcolor.SetColor(frame_highcol);
for(int32 i=0;i<6;i++) for(int32 i=0;i<6;i++)
{ {
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt.y+=2; pt.y+=2;
pt2.y+=2; pt2.y+=2;
} }
@@ -406,7 +400,7 @@ void MacDecorator::_DrawTab(BRect r)
_layerdata.highcolor.SetColor(frame_lowcol); _layerdata.highcolor.SetColor(frame_lowcol);
for(int32 i=0;i<6;i++) for(int32 i=0;i<6;i++)
{ {
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt.y+=2; pt.y+=2;
pt2.y+=2; pt2.y+=2;
} }
@@ -420,7 +414,7 @@ void MacDecorator::_DrawTab(BRect r)
_layerdata.highcolor.SetColor(frame_highcol); _layerdata.highcolor.SetColor(frame_highcol);
for(int32 i=0;i<6;i++) for(int32 i=0;i<6;i++)
{ {
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt.y+=2; pt.y+=2;
pt2.y+=2; pt2.y+=2;
} }
@@ -429,7 +423,7 @@ void MacDecorator::_DrawTab(BRect r)
_layerdata.highcolor.SetColor(frame_lowcol); _layerdata.highcolor.SetColor(frame_lowcol);
for(int32 i=0;i<6;i++) for(int32 i=0;i<6;i++)
{ {
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,_layerdata.highcolor);
pt.y+=2; pt.y+=2;
pt2.y+=2; pt2.y+=2;
} }
@@ -483,17 +477,16 @@ void MacDecorator::DrawBlendedRect(BRect r, bool down)
SetRGBColor(&tmpcol, uint8(startcol.red-(i*rstep)), SetRGBColor(&tmpcol, uint8(startcol.red-(i*rstep)),
uint8(startcol.green-(i*gstep)), uint8(startcol.green-(i*gstep)),
uint8(startcol.blue-(i*bstep))); uint8(startcol.blue-(i*bstep)));
_layerdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(rect.left,rect.top+i), _driver->StrokeLine(BPoint(rect.left,rect.top+i),
BPoint(rect.left+i,rect.top),&_layerdata,pat_solidhigh); BPoint(rect.left+i,rect.top),1.0,tmpcol);
SetRGBColor(&tmpcol, uint8(halfcol.red-(i*rstep)), SetRGBColor(&tmpcol, uint8(halfcol.red-(i*rstep)),
uint8(halfcol.green-(i*gstep)), uint8(halfcol.green-(i*gstep)),
uint8(halfcol.blue-(i*bstep))); uint8(halfcol.blue-(i*bstep)) );
_layerdata.highcolor=tmpcol;
_driver->StrokeLine(BPoint(rect.left+steps,rect.top+i), _driver->StrokeLine(BPoint(rect.left+steps,rect.top+i),
BPoint(rect.left+i,rect.top+steps),&_layerdata,pat_solidhigh); BPoint(rect.left+i,rect.top+steps),1.0,tmpcol);
} }
} }
@@ -516,80 +509,68 @@ void MacDecorator::_DrawFrame(BRect rect)
pt2=r.LeftBottom(); pt2=r.LeftBottom();
// Draw the left side of the frame // Draw the left side of the frame
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt2.x++; pt2.x++;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_highcol); _driver->StrokeLine(pt,pt2,1.0,frame_highcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt2.x++; pt2.x++;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_midcol); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt2.x++; pt2.x++;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
pt.x++; pt.x++;
pt2.x++; pt2.x++;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_lowcol); _driver->StrokeLine(pt,pt2,1.0,frame_lowcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt.y+=2; pt.y+=2;
topleftpt=pt; topleftpt=pt;
pt2.x++; pt2.x++;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt=r.RightTop(); pt=r.RightTop();
pt2=r.RightBottom(); pt2=r.RightBottom();
// Draw the right side of the frame // Draw the right side of the frame
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x--; pt.x--;
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(frame_lowcol); _driver->StrokeLine(pt,pt2,1.0,frame_lowcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x--; pt.x--;
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(frame_midcol); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x--; pt.x--;
pt2.x--; pt2.x--;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
pt.x--; pt.x--;
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(frame_highcol); _driver->StrokeLine(pt,pt2,1.0,frame_highcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x--; pt.x--;
pt.y+=2; pt.y+=2;
toprightpt=pt; toprightpt=pt;
pt2.x--; pt2.x--;
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
// Draw the top side of the frame that is not in the tab // Draw the top side of the frame that is not in the tab
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(topleftpt,toprightpt,1.0,frame_lowercol);
_driver->StrokeLine(topleftpt,toprightpt,&_layerdata,pat_solidhigh);
topleftpt.y--; topleftpt.y--;
toprightpt.x++; toprightpt.x++;
toprightpt.y--; toprightpt.y--;
_layerdata.highcolor.SetColor(frame_lowcol); _driver->StrokeLine(topleftpt,toprightpt,1.0,frame_lowcol);
_driver->StrokeLine(topleftpt,toprightpt,&_layerdata,pat_solidhigh);
pt=r.RightTop(); pt=r.RightTop();
pt2=r.RightBottom(); pt2=r.RightBottom();
@@ -599,42 +580,37 @@ void MacDecorator::_DrawFrame(BRect rect)
pt2=r.RightBottom(); pt2=r.RightBottom();
// Draw the bottom side of the frame // Draw the bottom side of the frame
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_lowcol); _driver->StrokeLine(pt,pt2,1.0,frame_lowcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_midcol); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x++; pt.x++;
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,pt2,1.0,frame_midcol);
pt.x++; pt.x++;
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_highcol); _driver->StrokeLine(pt,pt2,1.0,frame_highcol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.x+=2; pt.x+=2;
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
_layerdata.highcolor.SetColor(frame_lowercol); _driver->StrokeLine(pt,pt2,1.0,frame_lowercol);
_driver->StrokeLine(pt,pt2,&_layerdata,pat_solidhigh);
pt.y--; pt.y--;
pt2.x--; pt2.x--;
pt2.y--; pt2.y--;
src/add-ons/decorators/WinDecorator/WinDecorator.cpp
+34 -49
View File
@@ -186,11 +186,10 @@ printf("WinDecorator::Draw(): "); update.PrintToStream();
// RGBColor blue(100,100,255); // RGBColor blue(100,100,255);
// _layerdata.highcolor=blue; // _layerdata.highcolor=blue;
_layerdata.highcolor=_colors->document_background; _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh);
if(_borderrect.Intersects(update)) if(_borderrect.Intersects(update))
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect,_colors->document_background);
_DrawFrame(update); _DrawFrame(update);
_DrawTab(update); _DrawTab(update);
@@ -206,10 +205,8 @@ printf("WinDecorator::Draw()\n");
// RGBColor blue(100,100,255); // RGBColor blue(100,100,255);
// _layerdata.highcolor=blue; // _layerdata.highcolor=blue;
_layerdata.highcolor=_colors->document_background; _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh); _driver->FillRect(_borderrect,_colors->document_background);
_driver->FillRect(_borderrect,&_layerdata,pat_solidhigh);
DrawFrame(); DrawFrame();
DrawTab(); DrawTab();
@@ -231,9 +228,9 @@ void WinDecorator::_DrawZoom(BRect r)
rect.OffsetBy(1,1); rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
rect.InsetBy(1,1); rect.InsetBy(1,1);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,_layerdata.highcolor);
} }
@@ -253,11 +250,11 @@ void WinDecorator::_DrawClose(BRect r)
rect.OffsetBy(1,1); rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),1.0,_layerdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),1.0,_layerdata.highcolor);
rect.OffsetBy(1,0); rect.OffsetBy(1,0);
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),1.0,_layerdata.highcolor);
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),1.0,_layerdata.highcolor);
} }
void WinDecorator::_DrawMinimize(BRect r) void WinDecorator::_DrawMinimize(BRect r)
@@ -271,7 +268,7 @@ void WinDecorator::_DrawMinimize(BRect r)
rect.OffsetBy(1,1); rect.OffsetBy(1,1);
_layerdata.highcolor.SetColor(0,0,0); _layerdata.highcolor.SetColor(0,0,0);
_driver->StrokeRect(rect,&_layerdata,pat_solidhigh); _driver->StrokeRect(rect,1.0,_layerdata.highcolor);
} }
void WinDecorator::_DrawTab(BRect r) void WinDecorator::_DrawTab(BRect r)
@@ -281,13 +278,11 @@ void WinDecorator::_DrawTab(BRect r)
if(_look==B_NO_BORDER_WINDOW_LOOK) if(_look==B_NO_BORDER_WINDOW_LOOK)
return; return;
// _layerdata.highcolor=frame_lowcol; // _driver->StrokeRect(_tabrect,1.0,frame_lowcol);
// _driver->StrokeRect(_tabrect,&_layerdata,pat_solidhigh);
// UpdateTitle(layer->name->String()); // UpdateTitle(layer->name->String());
_layerdata.highcolor=tab_highcol; _driver->FillRect(_tabrect,tab_highcol);
_driver->FillRect(_tabrect,&_layerdata,pat_solidhigh);
// Draw the buttons if we're supposed to // Draw the buttons if we're supposed to
if(!(_flags & B_NOT_CLOSABLE)) if(!(_flags & B_NOT_CLOSABLE))
@@ -322,47 +317,42 @@ void WinDecorator::DrawBeveledRect(BRect r, bool down)
// Top highlight // Top highlight
_layerdata.highcolor=higher; _layerdata.highcolor=higher;
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,higher);
// Left highlight // Left highlight
_driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),1.0,higher);
// Right shading // Right shading
_layerdata.highcolor=lower;
pt=rect.RightTop(); pt=rect.RightTop();
pt.y++; pt.y++;
_driver->StrokeLine(pt,rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,rect.RightBottom(),1.0,lower);
// Bottom shading // Bottom shading
pt=rect.LeftBottom(); pt=rect.LeftBottom();
pt.x++; pt.x++;
_driver->StrokeLine(pt,rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,rect.RightBottom(),1.0,lower);
rect.InsetBy(1,1); rect.InsetBy(1,1);
// Top inside highlight // Top inside highlight
_layerdata.highcolor=higher; _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),1.0,higher);
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_layerdata,pat_solidhigh);
// Left inside highlight // Left inside highlight
_driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(rect.LeftTop(),rect.LeftBottom(),1.0,higher);
// Right inside shading // Right inside shading
_layerdata.highcolor=lower;
pt=rect.RightTop(); pt=rect.RightTop();
pt.y++; pt.y++;
_driver->StrokeLine(pt,rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,rect.RightBottom(),1.0,lower);
// Bottom inside shading // Bottom inside shading
pt=rect.LeftBottom(); pt=rect.LeftBottom();
pt.x++; pt.x++;
_driver->StrokeLine(pt,rect.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(pt,rect.RightBottom(),1.0,lower);
rect.InsetBy(1,1); rect.InsetBy(1,1);
_layerdata.highcolor=mid; _driver->FillRect(rect,mid);
_driver->FillRect(rect,&_layerdata,pat_solidhigh);
} }
void WinDecorator::_SetColors(void) void WinDecorator::_SetColors(void)
@@ -378,40 +368,35 @@ void WinDecorator::_DrawFrame(BRect rect)
BRect r=_borderrect; BRect r=_borderrect;
_layerdata.highcolor.SetColor(255,0,0); _layerdata.highcolor.SetColor(255,0,0);
_driver->StrokeRect(r,&_layerdata,pat_solidhigh); _driver->StrokeRect(r,1.0,_layerdata.highcolor);
BPoint pt; BPoint pt;
_layerdata.highcolor=frame_midcol;
pt=r.RightTop(); pt=r.RightTop();
pt.x--; pt.x--;
_driver->StrokeLine(r.LeftTop(),pt,&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),pt,1.0,frame_midcol);
pt=r.LeftBottom(); pt=r.LeftBottom();
pt.y--; pt.y--;
_driver->StrokeLine(r.LeftTop(),pt,&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),pt,1.0,frame_midcol);
_layerdata.highcolor=frame_lowercol; _driver->StrokeLine(r.RightTop(),r.RightBottom(),1.0,frame_lowercol);
_driver->StrokeLine(r.RightTop(),r.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftBottom(),r.RightBottom(),1.0,frame_lowercol);
_driver->StrokeLine(r.LeftBottom(),r.RightBottom(),&_layerdata,pat_solidhigh);
r.InsetBy(1,1); r.InsetBy(1,1);
_layerdata.highcolor=frame_highcol;
pt=r.RightTop(); pt=r.RightTop();
pt.x--; pt.x--;
_driver->StrokeLine(r.LeftTop(),pt,&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),pt,1.0,frame_highcol);
pt=r.LeftBottom(); pt=r.LeftBottom();
pt.y--; pt.y--;
_driver->StrokeLine(r.LeftTop(),pt,&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftTop(),pt,1.0,frame_highcol);
_layerdata.highcolor=frame_lowcol; _driver->StrokeLine(r.RightTop(),r.RightBottom(),1.0,frame_lowcol);
_driver->StrokeLine(r.RightTop(),r.RightBottom(),&_layerdata,pat_solidhigh); _driver->StrokeLine(r.LeftBottom(),r.RightBottom(),1.0,frame_lowcol);
_driver->StrokeLine(r.LeftBottom(),r.RightBottom(),&_layerdata,pat_solidhigh);
r.InsetBy(1,1); r.InsetBy(1,1);
_layerdata.highcolor=frame_midcol; _driver->StrokeRect(r,1.0,frame_midcol);
_driver->StrokeRect(r,&_layerdata,pat_solidhigh);
r.InsetBy(1,1); r.InsetBy(1,1);
_driver->StrokeRect(r,&_layerdata,pat_solidhigh); _driver->StrokeRect(r,1.0,frame_midcol);
} }
extern "C" float get_decorator_version(void) extern "C" float get_decorator_version(void)