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

* implemented icon size and layout to depend on the system plain font size

Browse Source 
(currently, a font size above 16pt will make the icon 64x64, TODO: some
  of the other insets could depend on that value too)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21369 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2007-06-09 11:37:13 +00:00
parent da3addea5f
commit 8812976dce
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/kits/interface/Alert.cpp
View File

@ -16,6 +16,7 @@
#include <Button.h> #include <Button.h>
#include <File.h> #include <File.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <Font.h>
#include <IconUtils.h> #include <IconUtils.h>
#include <Invoker.h> #include <Invoker.h>
#include <Looper.h> #include <Looper.h>
@ -61,9 +62,17 @@ static const int kWindowOffsetMinWidth = 335;
static const int kIconStripeWidth = 30; static const int kIconStripeWidth = 30;
static const int kTextIconOffset = kWindowIconOffset + kIconStripeWidth - 2;
static const int kTextButtonOffset = 10; static const int kTextButtonOffset = 10;
static inline int32
icon_layout_scale()
{
#ifdef __HAIKU__
return max_c(1, ((int32)be_plain_font->Size() + 15) / 16);
#endif
return 1;
}
class TAlertView : public BView { class TAlertView : public BView {
public: public:
@ -498,11 +507,12 @@ BAlert::_InitObject(const char* text, const char* button0, const char* button1,
// Adjust the window's width, if necessary // Adjust the window's width, if necessary
int32 iconLayoutScale = icon_layout_scale();
float totalWidth = kRightOffset + fButtons[buttonCount - 1]->Frame().right float totalWidth = kRightOffset + fButtons[buttonCount - 1]->Frame().right
- defaultButtonFrameWidth - fButtons[0]->Frame().left; - defaultButtonFrameWidth - fButtons[0]->Frame().left;
if (view->Bitmap()) if (view->Bitmap()) {
totalWidth += kIconStripeWidth + kWindowIconOffset; totalWidth += (kIconStripeWidth + kWindowIconOffset) * iconLayoutScale;
else } else
totalWidth += kWindowMinOffset; totalWidth += kWindowMinOffset;
float width = (spacing == B_OFFSET_SPACING float width = (spacing == B_OFFSET_SPACING
@ -516,7 +526,8 @@ BAlert::_InitObject(const char* text, const char* button0, const char* button1,
Bounds().right - kRightOffset, Bounds().right - kRightOffset,
fButtons[0]->Frame().top - kTextButtonOffset); fButtons[0]->Frame().top - kTextButtonOffset);
if (view->Bitmap()) if (view->Bitmap())
textViewRect.left = kTextIconOffset; textViewRect.left = (kWindowIconOffset
+ kIconStripeWidth) * iconLayoutScale - 2;
fTextView = new BTextView(textViewRect, "_tv_", fTextView = new BTextView(textViewRect, "_tv_",
textViewRect.OffsetByCopy(B_ORIGIN), textViewRect.OffsetByCopy(B_ORIGIN),
@ -600,8 +611,7 @@ BAlert::_InitIcon()
return NULL; return NULL;
} }
int32 iconSize = 32; int32 iconSize = 32 * icon_layout_scale();
// Allocate the icon bitmap // Allocate the icon bitmap
icon = new (std::nothrow) BBitmap(BRect(0, 0, iconSize - 1, iconSize - 1), icon = new (std::nothrow) BBitmap(BRect(0, 0, iconSize - 1, iconSize - 1),
0, B_RGBA32); 0, B_RGBA32);
@ -732,17 +742,21 @@ TAlertView::Archive(BMessage* archive, bool deep) const
void void
TAlertView::Draw(BRect updateRect) TAlertView::Draw(BRect updateRect)
{ {
if (!fIconBitmap)
return;
// Here's the fun stuff // Here's the fun stuff
if (fIconBitmap) {
BRect stripeRect = Bounds(); BRect stripeRect = Bounds();
stripeRect.right = kIconStripeWidth; int32 iconLayoutScale = icon_layout_scale();
stripeRect.right = kIconStripeWidth * iconLayoutScale;
SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT)); SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT));
FillRect(stripeRect); FillRect(stripeRect);
SetDrawingMode(B_OP_ALPHA); SetDrawingMode(B_OP_ALPHA);
SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY); SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
DrawBitmapAsync(fIconBitmap, BPoint(18, 6)); DrawBitmapAsync(fIconBitmap, BPoint(18 * iconLayoutScale,
} 6 * iconLayoutScale));
} }