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

fixed wrong usage of ConstrainClippingRegion() introduced by myself a couple months ago

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15374 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-12-06 16:56:31 +00:00
parent bdac8966fa
commit 0a95bea66d
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BMCPrivate.cpp
+7 -9
View File
@@ -174,32 +174,30 @@ void _BMCMenuBar_::AttachedToWindow()
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void _BMCMenuBar_::Draw(BRect updateRect) void _BMCMenuBar_::Draw(BRect updateRect)
{ {
// TODO: The commented code locks up the
// window thread.
// draw the right and bottom line here in a darker tint // draw the right and bottom line here in a darker tint
BRegion oldClipping;
GetClippingRegion(&oldClipping);
BRect bounds(Bounds()); BRect bounds(Bounds());
bounds.right -= 2.0; bounds.right -= 2.0;
bounds.bottom -= 1.0; bounds.bottom -= 1.0;
bounds = bounds & updateRect;
// prevent the original BMenuBar's Draw from
// drawing in those parts
BRegion clipping(bounds); BRegion clipping(bounds);
ConstrainClippingRegion(&clipping); ConstrainClippingRegion(&clipping);
BMenuBar::Draw(updateRect); BMenuBar::Draw(updateRect);
ConstrainClippingRegion(NULL);
bounds.right += 2.0; bounds.right += 2.0;
bounds.bottom += 1.0; bounds.bottom += 1.0;
ConstrainClippingRegion(&oldClipping);
//BRect bounds(Bounds());
SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_4_TINT)); SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_4_TINT));
StrokeLine(BPoint(bounds.left, bounds.bottom), StrokeLine(BPoint(bounds.left, bounds.bottom),
BPoint(bounds.right, bounds.bottom)); BPoint(bounds.right, bounds.bottom));
StrokeLine(BPoint(bounds.right, bounds.bottom - 1), StrokeLine(BPoint(bounds.right, bounds.bottom - 1),
BPoint(bounds.right, bounds.top)); BPoint(bounds.right, bounds.top));
SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_1_TINT)); SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_1_TINT));
StrokeLine(BPoint(bounds.right - 1, bounds.bottom - 2), StrokeLine(BPoint(bounds.right - 1, bounds.bottom - 1),
BPoint(bounds.right - 1, bounds.top + 1)); BPoint(bounds.right - 1, bounds.top + 1));
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
src/kits/interface/InterfaceDefs.cpp
+1 -1
View File
@@ -777,7 +777,7 @@ load_menu_settings(menu_info &into)
be_plain_font->GetFamilyAndStyle(&into.f_family, &into.f_style); be_plain_font->GetFamilyAndStyle(&into.f_family, &into.f_style);
into.background_color = ui_color(B_MENU_BACKGROUND_COLOR); into.background_color = ui_color(B_MENU_BACKGROUND_COLOR);
into.separator = 0; into.separator = 0;
into.click_to_open = false; into.click_to_open = true;
into.triggers_always_shown = false; into.triggers_always_shown = false;
return B_OK; return B_OK;
src/kits/interface/Window.cpp
+1 -1
View File
@@ -948,7 +948,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target)
} }
} }
} else { } else {
fprintf(stderr, "***PANIC: BW: Can't find view with ID: %ld !***\n", token); fprintf(stderr, "B_VIEW_RESIZED ***PANIC: BW: Can't find view with ID: %ld !***\n", token);
} }
} }
} }