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

Added some reserved fields to BControlLook.

Browse Source 
* This makes future changes less troublesome, although we should also add
  some virtual slots there (probably just dozens of it, though, that's why
  I was being lazy).
* Don't pass messages by value; they are copied twice this way.
* Minor coding style corrections, automatic whitespace cleanup.
This commit is contained in:
Axel Dörfler 2012-02-26 14:58:52 +01:00
parent 8adaa6c544
commit d452ff664c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/os/interface/ControlLook.h
View File

@ -272,7 +272,8 @@ public:
const rgb_color& base, uint32 flags,
const BPoint& where);
void SetBackgroundInfo(BMessage msg);
void SetBackgroundInfo(
const BMessage& backgroundInfo);
protected:
void _DrawButtonFrame(BView* view, BRect& rect,
@ -369,7 +370,8 @@ private:
bool fCachedOutline;
int32 fCachedWorkspace;
BMessage fBackgroundInfo;
uint32 _reserved[20];
};
extern BControlLook* be_control_look;

14
src/kits/interface/ControlLook.cpp
View File

@ -2,6 +2,8 @@
* Copyright 2009, Stephan Aßmus <superstippi@gmx.de>
* Distributed under the terms of the MIT License.
*/
#include <ControlLook.h>
#include "ContainerWindow.h"
@ -1875,7 +1877,7 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
// check if the drawing occurs on the desktop
if (isDesktop) {
if (fCachedWorkspace != current_workspace()) {
int8 indice = 0;
@ -1894,7 +1896,7 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
indice++;
}
}
if (fCachedOutline) {
BFont font;
view->GetFont(&font);
@ -1909,7 +1911,7 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
glowColor.alpha = 30;
view->SetHighColor(glowColor);
view->DrawString(label, where);
font.SetFalseBoldWidth(1.0);
view->SetFont(&font, B_FONT_FALSE_BOLD_WIDTH);
@ -1939,7 +1941,7 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
}
view->SetHighColor(color);
view->SetDrawingMode(B_OP_OVER);
view->DrawString(label, where);
@ -1949,9 +1951,9 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
void
BControlLook::SetBackgroundInfo(BMessage msg)
BControlLook::SetBackgroundInfo(const BMessage& backgroundInfo)
{
fBackgroundInfo = msg;
fBackgroundInfo = backgroundInfo;
fCachedWorkspace = -1;
}