[haiku-webkit-commits] r479 - webkit/trunk/WebKit/haiku/WebPositive
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Mon, 03 May 2010 18:01:38 +0000
Author: stippi
Date: Mon May 3 18:01:38 2010
New Revision: 479
URL: http://mmlr.dyndns.org/changeset/479
Log:
Make sure never to draw the favicon too big, in case we only got a big one from
the page, and use the proper drawing mode and filtering.
Modified:
webkit/trunk/WebKit/haiku/WebPositive/URLInputGroup.cpp
Modified: webkit/trunk/WebKit/haiku/WebPositive/URLInputGroup.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/URLInputGroup.cpp Mon May 3
16:56:54 2010 (r478)
+++ webkit/trunk/WebKit/haiku/WebPositive/URLInputGroup.cpp Mon May 3
18:01:38 2010 (r479)
@@ -532,7 +532,8 @@
BView("page icon view", B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
fIcon(NULL)
{
- SetDrawingMode(B_OP_OVER);
+ SetDrawingMode(B_OP_ALPHA);
+ SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
}
~PageIconView()
@@ -546,21 +547,20 @@
return;
BRect bounds(Bounds());
- BRect iconBounds(fIcon->Bounds());
- BPoint iconPos(
+ BRect iconBounds(0, 0, 15, 15);
+ iconBounds.OffsetTo(
floorf((bounds.left + bounds.right
- (iconBounds.left + iconBounds.right)) / 2 +
0.5f),
floorf((bounds.top + bounds.bottom
- (iconBounds.top + iconBounds.bottom)) / 2 +
0.5f));
- DrawBitmap(fIcon, iconPos);
+ DrawBitmap(fIcon, fIcon->Bounds(), iconBounds,
+ B_FILTER_BITMAP_BILINEAR);
}
virtual BSize MinSize()
{
- if (fIcon != NULL) {
- return BSize(fIcon->Bounds().Width() + 3,
- fIcon->Bounds().Height() + 3);
- }
+ if (fIcon != NULL)
+ return BSize(18, 18);
return BSize(0, 0);
}
Other related posts:
- » [haiku-webkit-commits] r479 - webkit/trunk/WebKit/haiku/WebPositive - webkit
