Fixed build for decorators
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12593 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
parent
d79f4a5812
commit
3b93536aba
@ -32,7 +32,6 @@
|
||||
#include "BeDecorator.h"
|
||||
#include "PatternHandler.h"
|
||||
#include "RGBColor.h"
|
||||
#include "RectUtils.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#define USE_VIEW_FILL_HACK
|
||||
@ -330,8 +329,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.
|
||||
_drawdata.highcolor=_colors->window_tab_text;
|
||||
_drawdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
|
||||
_drawdata.SetHighColor(_colors->window_tab_text);
|
||||
_drawdata.SetLowColor((GetFocus())?_colors->window_tab:_colors->inactive_window_tab);
|
||||
|
||||
int32 titlecount=_ClipTitle((_zoomrect.left-textoffset)-(_closerect.right+textoffset));
|
||||
BString titlestr( GetTitle() );
|
||||
@ -498,7 +497,7 @@ void BeDecorator::DrawBlendedRect(BRect r, bool down)
|
||||
BPoint(r.left+i,r.top+steps),temprgbcol);
|
||||
}
|
||||
|
||||
// _drawdata.highcolor=startcol;
|
||||
// _drawdata.SetHighColor(startcol);
|
||||
// _driver->FillRect(r,&_drawdata,pat_solidhigh);
|
||||
_driver->StrokeRect(r,framecolors[3]);
|
||||
}
|
||||
@ -510,8 +509,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
|
||||
_drawdata.highcolor = RGBColor(192,192,192 );
|
||||
_driver->FillRect(_frame,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(192,192,192 ));
|
||||
_driver->FillRect(_frame,_drawdata.HighColor());
|
||||
#endif
|
||||
|
||||
if(!borderwidth)
|
||||
@ -566,7 +565,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
BPoint start, end;
|
||||
|
||||
// Right side
|
||||
if(TestRectIntersection(rightborder,invalid))
|
||||
if(rightborder.Intersects(invalid))
|
||||
{
|
||||
|
||||
// We may not have to redraw the entire width of the frame itself. Rare case, but
|
||||
@ -578,11 +577,11 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
// calculations
|
||||
r=(rightborder);
|
||||
r.bottom=r.top+borderwidth;
|
||||
topcorner=TestRectIntersection(invalid,r);
|
||||
topcorner=invalid.Intersects(r);
|
||||
|
||||
r=rightborder;
|
||||
r.top=r.bottom-borderwidth;
|
||||
bottomcorner=TestRectIntersection(invalid,r);
|
||||
bottomcorner=invalid.Intersects(r);
|
||||
step=(borderwidth==5)?1:2;
|
||||
colorindex=0;
|
||||
|
||||
@ -618,7 +617,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
}
|
||||
|
||||
// Left side
|
||||
if(TestRectIntersection(leftborder,invalid))
|
||||
if(leftborder.Intersects(invalid))
|
||||
{
|
||||
|
||||
// We may not have to redraw the entire width of the frame itself. Rare case, but
|
||||
@ -630,11 +629,11 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
// calculations
|
||||
r=leftborder;
|
||||
r.bottom=r.top+borderwidth;
|
||||
topcorner=TestRectIntersection(invalid,r);
|
||||
topcorner=invalid.Intersects(r);
|
||||
|
||||
r=leftborder;
|
||||
r.top=r.bottom-borderwidth;
|
||||
bottomcorner=TestRectIntersection(invalid,r);
|
||||
bottomcorner=invalid.Intersects(r);
|
||||
step=(borderwidth==5)?1:2;
|
||||
colorindex=0;
|
||||
|
||||
@ -670,7 +669,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
}
|
||||
|
||||
// Top side
|
||||
if(TestRectIntersection(topborder,invalid))
|
||||
if(topborder.Intersects(invalid))
|
||||
{
|
||||
|
||||
// We may not have to redraw the entire width of the frame itself. Rare case, but
|
||||
@ -683,13 +682,13 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
r=topborder;
|
||||
r.bottom=r.top+borderwidth;
|
||||
r.right=r.left+borderwidth;
|
||||
leftcorner=TestRectIntersection(invalid,r);
|
||||
leftcorner=invalid.Intersects(r);
|
||||
|
||||
r=topborder;
|
||||
r.top=r.bottom-borderwidth;
|
||||
r.left=r.right-borderwidth;
|
||||
|
||||
rightcorner=TestRectIntersection(invalid,r);
|
||||
rightcorner=invalid.Intersects(r);
|
||||
step=(borderwidth==5)?1:2;
|
||||
colorindex=0;
|
||||
|
||||
@ -727,7 +726,7 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
}
|
||||
|
||||
// Bottom side
|
||||
if(TestRectIntersection(bottomborder,invalid))
|
||||
if(bottomborder.Intersects(invalid))
|
||||
{
|
||||
|
||||
// We may not have to redraw the entire width of the frame itself. Rare case, but
|
||||
@ -740,13 +739,13 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
r=bottomborder;
|
||||
r.bottom=r.top+borderwidth;
|
||||
r.right=r.left+borderwidth;
|
||||
leftcorner=TestRectIntersection(invalid,r);
|
||||
leftcorner=invalid.Intersects(r);
|
||||
|
||||
r=bottomborder;
|
||||
r.top=r.bottom-borderwidth;
|
||||
r.left=r.right-borderwidth;
|
||||
|
||||
rightcorner=TestRectIntersection(invalid,r);
|
||||
rightcorner=invalid.Intersects(r);
|
||||
step=(borderwidth==5)?1:2;
|
||||
colorindex=0;
|
||||
|
||||
@ -840,30 +839,30 @@ void BeDecorator::_DrawFrame(BRect invalid)
|
||||
_driver->Lock();
|
||||
for(i=0;i<=steps; i++)
|
||||
{
|
||||
_drawdata.highcolor.SetColor(uint8(startcol.red-(i*rstep)),
|
||||
_drawdata.SetHighColor(RGBColor(uint8(startcol.red-(i*rstep)),
|
||||
uint8(startcol.green-(i*gstep)),
|
||||
uint8(startcol.blue-(i*bstep)));
|
||||
uint8(startcol.blue-(i*bstep))));
|
||||
|
||||
_driver->StrokeLine(BPoint(r.left,r.top+i),
|
||||
BPoint(r.left+i,r.top),_drawdata.highcolor);
|
||||
BPoint(r.left+i,r.top),_drawdata.HighColor());
|
||||
|
||||
_drawdata.highcolor.SetColor(uint8(halfcol.red-(i*rstep)),
|
||||
_drawdata.SetHighColor(RGBColor(uint8(halfcol.red-(i*rstep)),
|
||||
uint8(halfcol.green-(i*gstep)),
|
||||
uint8(halfcol.blue-(i*bstep)));
|
||||
uint8(halfcol.blue-(i*bstep))));
|
||||
_driver->StrokeLine(BPoint(r.left+steps,r.top+i),
|
||||
BPoint(r.left+i,r.top+steps),_drawdata.highcolor);
|
||||
BPoint(r.left+i,r.top+steps),_drawdata.HighColor());
|
||||
}
|
||||
_driver->Unlock();
|
||||
// _drawdata.highcolor=framecolors[4];
|
||||
// _drawdata.SetHighColor(framecolors[4]);
|
||||
// _driver->StrokeRect(r,&_drawdata,pat_solidhigh);
|
||||
}
|
||||
else
|
||||
{
|
||||
_drawdata.highcolor=framecolors[4];
|
||||
_drawdata.SetHighColor(framecolors[4]);
|
||||
_driver->StrokeLine(BPoint(r.right,r.top),BPoint(r.right-3,r.top),
|
||||
_drawdata.highcolor);
|
||||
_drawdata.HighColor());
|
||||
_driver->StrokeLine(BPoint(r.left,r.bottom),BPoint(r.left,r.bottom-3),
|
||||
_drawdata.highcolor);
|
||||
_drawdata.HighColor());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#include <Point.h>
|
||||
#include "DisplayDriver.h"
|
||||
#include <View.h>
|
||||
#include "LayerData.h"
|
||||
@ -157,11 +158,11 @@ void MacDecorator::MoveBy(BPoint pt)
|
||||
void MacDecorator::_DrawTitle(BRect r)
|
||||
{
|
||||
if(GetFocus())
|
||||
_drawdata.highcolor=textcol;
|
||||
_drawdata.SetHighColor(textcol);
|
||||
else
|
||||
_drawdata.highcolor=inactive_textcol;
|
||||
_drawdata.SetHighColor(inactive_textcol);
|
||||
|
||||
_drawdata.lowcolor=frame_midcol;
|
||||
_drawdata.SetLowColor(frame_midcol);
|
||||
|
||||
int32 titlecount=_ClipTitle((_zoomrect.left-5)-(_closerect.right+5));
|
||||
BString titlestr=GetTitle();
|
||||
@ -210,7 +211,7 @@ printf("MacDecorator::Draw()\n");
|
||||
|
||||
// Draw the top view's client area - just a hack :)
|
||||
// RGBColor blue(100,100,255);
|
||||
// _drawdata.highcolor=blue;
|
||||
// _drawdata.SetHighColor(blue);
|
||||
|
||||
_driver->FillRect(_borderrect,_colors->document_background);
|
||||
_driver->FillRect(_borderrect,_colors->document_background);
|
||||
@ -229,26 +230,26 @@ void MacDecorator::_DrawZoom(BRect r)
|
||||
BPoint pt(r.LeftTop()),pt2(r.RightTop());
|
||||
|
||||
pt2.x--;
|
||||
_drawdata.highcolor.SetColor(136,136,136);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(136,136,136));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.y--;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt=r.RightBottom();
|
||||
pt2=r.RightTop();
|
||||
pt2.y++;
|
||||
_drawdata.highcolor.SetColor(255,255,255);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(255,255,255));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.x++;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
DrawBlendedRect(rect,down);
|
||||
@ -259,8 +260,8 @@ void MacDecorator::_DrawZoom(BRect r)
|
||||
rect.left--;
|
||||
rect.right++;
|
||||
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.HighColor());
|
||||
}
|
||||
|
||||
void MacDecorator::_DrawClose(BRect r)
|
||||
@ -273,26 +274,26 @@ void MacDecorator::_DrawClose(BRect r)
|
||||
BPoint pt(r.LeftTop()),pt2(r.RightTop());
|
||||
|
||||
pt2.x--;
|
||||
_drawdata.highcolor.SetColor(136,136,136);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(136,136,136));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.y--;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt=r.RightBottom();
|
||||
pt2=r.RightTop();
|
||||
pt2.y++;
|
||||
_drawdata.highcolor.SetColor(255,255,255);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(255,255,255));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.x++;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
DrawBlendedRect(rect,down);
|
||||
@ -303,7 +304,7 @@ void MacDecorator::_DrawClose(BRect r)
|
||||
// rect.left++;
|
||||
// rect.right--;
|
||||
|
||||
// _drawdata.highcolor.SetColor(0,0,0);
|
||||
// _drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
// _driver->StrokeLine(rect.LeftTop(),rect.RightTop(),&_drawdata,pat_solidhigh);
|
||||
}
|
||||
|
||||
@ -317,26 +318,26 @@ void MacDecorator::_DrawMinimize(BRect r)
|
||||
BPoint pt(r.LeftTop()),pt2(r.RightTop());
|
||||
|
||||
pt2.x--;
|
||||
_drawdata.highcolor.SetColor(136,136,136);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(136,136,136));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.y--;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt=r.RightBottom();
|
||||
pt2=r.RightTop();
|
||||
pt2.y++;
|
||||
_drawdata.highcolor.SetColor(255,255,255);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(255,255,255));
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
pt2=r.LeftBottom();
|
||||
pt2.x++;
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
|
||||
rect.InsetBy(1,1);
|
||||
DrawBlendedRect(rect,down);
|
||||
@ -347,8 +348,8 @@ void MacDecorator::_DrawMinimize(BRect r)
|
||||
rect.bottom-=4;
|
||||
rect.InsetBy(-2,0);
|
||||
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
}
|
||||
|
||||
void MacDecorator::_DrawTab(BRect r)
|
||||
@ -358,12 +359,12 @@ void MacDecorator::_DrawTab(BRect r)
|
||||
if(_look==B_NO_BORDER_WINDOW_LOOK)
|
||||
return;
|
||||
|
||||
// _drawdata.highcolor=frame_lowcol;
|
||||
// _driver->StrokeRect(_tabrect,_drawdata.highcolor);
|
||||
// _drawdata.SetHighColor(frame_lowcol);
|
||||
// _driver->StrokeRect(_tabrect,_drawdata.HighColor());
|
||||
|
||||
// UpdateTitle(layer->name->String());
|
||||
BRect rect(_tabrect);
|
||||
_drawdata.highcolor.SetColor(frame_midcol);
|
||||
_drawdata.SetHighColor(RGBColor(frame_midcol));
|
||||
_driver->FillRect(rect,frame_midcol);
|
||||
|
||||
|
||||
@ -387,20 +388,20 @@ void MacDecorator::_DrawTab(BRect r)
|
||||
|
||||
BPoint pt(_closerect.right+5,_closerect.top),
|
||||
pt2(_tabrect.left+textoffset-5,_closerect.top);
|
||||
_drawdata.highcolor.SetColor(frame_highcol);
|
||||
_drawdata.SetHighColor(RGBColor(frame_highcol));
|
||||
for(int32 i=0;i<6;i++)
|
||||
{
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.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);
|
||||
_drawdata.highcolor.SetColor(frame_lowcol);
|
||||
_drawdata.SetHighColor(RGBColor(frame_lowcol));
|
||||
for(int32 i=0;i<6;i++)
|
||||
{
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
pt.y+=2;
|
||||
pt2.y+=2;
|
||||
}
|
||||
@ -411,19 +412,19 @@ void MacDecorator::_DrawTab(BRect r)
|
||||
pt2.Set(_zoomrect.left-6,_zoomrect.top);
|
||||
if(pt.x<pt2.x)
|
||||
{
|
||||
_drawdata.highcolor.SetColor(frame_highcol);
|
||||
_drawdata.SetHighColor(RGBColor(frame_highcol));
|
||||
for(int32 i=0;i<6;i++)
|
||||
{
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.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);
|
||||
_drawdata.highcolor.SetColor(frame_lowcol);
|
||||
_drawdata.SetHighColor(frame_lowcol);
|
||||
for(int32 i=0;i<6;i++)
|
||||
{
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.highcolor);
|
||||
_driver->StrokeLine(pt,pt2,_drawdata.HighColor());
|
||||
pt.y+=2;
|
||||
pt2.y+=2;
|
||||
}
|
||||
@ -477,18 +478,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)));
|
||||
_drawdata.highcolor=tmpcol;
|
||||
_drawdata.SetHighColor(tmpcol);
|
||||
|
||||
_driver->StrokeLine(BPoint(rect.left,rect.top+i),
|
||||
BPoint(rect.left+i,rect.top),_drawdata.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)) );
|
||||
_drawdata.highcolor=tmpcol;
|
||||
_drawdata.SetHighColor(tmpcol);
|
||||
|
||||
_driver->StrokeLine(BPoint(rect.left+steps,rect.top+i),
|
||||
BPoint(rect.left+i,rect.top+steps),_drawdata.highcolor);
|
||||
BPoint(rect.left+i,rect.top+steps),_drawdata.HighColor());
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
#include <Point.h>
|
||||
#include "DisplayDriver.h"
|
||||
#include <View.h>
|
||||
#include "LayerData.h"
|
||||
@ -141,8 +142,8 @@ void WinDecorator::GetFootprint(BRegion *region)
|
||||
|
||||
void WinDecorator::_DrawTitle(BRect r)
|
||||
{
|
||||
_drawdata.highcolor=_colors->window_tab_text;
|
||||
_drawdata.lowcolor=(GetFocus())?_colors->window_tab:_colors->inactive_window_tab;
|
||||
_drawdata.SetHighColor(_colors->window_tab_text);
|
||||
_drawdata.SetLowColor(GetFocus()?_colors->window_tab:_colors->inactive_window_tab);
|
||||
|
||||
int32 titlecount=_ClipTitle((_minimizerect.left-5)-(_tabrect.left+5));
|
||||
BString titlestr=GetTitle();
|
||||
@ -184,7 +185,7 @@ printf("WinDecorator::Draw(): "); update.PrintToStream();
|
||||
#endif
|
||||
// Draw the top view's client area - just a hack :)
|
||||
// RGBColor blue(100,100,255);
|
||||
// _drawdata.highcolor=blue;
|
||||
// _drawdata.SetHighColor(blue);
|
||||
|
||||
_driver->FillRect(_borderrect,_colors->document_background);
|
||||
|
||||
@ -203,7 +204,7 @@ printf("WinDecorator::Draw()\n");
|
||||
|
||||
// Draw the top view's client area - just a hack :)
|
||||
// RGBColor blue(100,100,255);
|
||||
// _drawdata.highcolor=blue;
|
||||
// _drawdata.SetHighColor(blue);
|
||||
|
||||
_driver->FillRect(_borderrect,_colors->document_background);
|
||||
_driver->FillRect(_borderrect,_colors->document_background);
|
||||
@ -227,10 +228,10 @@ void WinDecorator::_DrawZoom(BRect r)
|
||||
if(GetZoom())
|
||||
rect.OffsetBy(1,1);
|
||||
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
rect.InsetBy(1,1);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.highcolor);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),_drawdata.HighColor());
|
||||
|
||||
}
|
||||
|
||||
@ -249,12 +250,12 @@ void WinDecorator::_DrawClose(BRect r)
|
||||
if(GetClose())
|
||||
rect.OffsetBy(1,1);
|
||||
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_drawdata.highcolor);
|
||||
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(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(),_drawdata.highcolor);
|
||||
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_drawdata.highcolor);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightBottom(),_drawdata.HighColor());
|
||||
_driver->StrokeLine(rect.RightTop(),rect.LeftBottom(),_drawdata.HighColor());
|
||||
}
|
||||
|
||||
void WinDecorator::_DrawMinimize(BRect r)
|
||||
@ -262,13 +263,13 @@ void WinDecorator::_DrawMinimize(BRect r)
|
||||
// Just like DrawZoom, but for a Minimize button
|
||||
DrawBeveledRect(r,GetMinimize());
|
||||
|
||||
_drawdata.highcolor=textcol;
|
||||
_drawdata.SetHighColor(textcol);
|
||||
BRect rect(r.left+5,r.bottom-4,r.right-5,r.bottom-3);
|
||||
if(GetMinimize())
|
||||
rect.OffsetBy(1,1);
|
||||
|
||||
_drawdata.highcolor.SetColor(0,0,0);
|
||||
_driver->StrokeRect(rect,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(0,0,0));
|
||||
_driver->StrokeRect(rect,_drawdata.HighColor());
|
||||
}
|
||||
|
||||
void WinDecorator::_DrawTab(BRect r)
|
||||
@ -316,7 +317,7 @@ void WinDecorator::DrawBeveledRect(BRect r, bool down)
|
||||
BPoint pt;
|
||||
|
||||
// Top highlight
|
||||
_drawdata.highcolor=higher;
|
||||
_drawdata.SetHighColor(higher);
|
||||
_driver->StrokeLine(rect.LeftTop(),rect.RightTop(),higher);
|
||||
|
||||
// Left highlight
|
||||
@ -367,8 +368,8 @@ void WinDecorator::_DrawFrame(BRect rect)
|
||||
|
||||
BRect r=_borderrect;
|
||||
|
||||
_drawdata.highcolor.SetColor(255,0,0);
|
||||
_driver->StrokeRect(r,_drawdata.highcolor);
|
||||
_drawdata.SetHighColor(RGBColor(255,0,0));
|
||||
_driver->StrokeRect(r,_drawdata.HighColor());
|
||||
|
||||
BPoint pt;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user