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

patch by Alexandre Deckner (aldeck):

Browse Source 
* improve the placement of text in the shutdown window
* define constants for the width of the "stripe" and icon size

Thanks! Fixes #1697.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23270 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-01-06 19:02:00 +00:00
parent 1c05a4100f
commit 92c779bd11
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/registrar/ShutdownProcess.cpp
+8 -5
View File
@@ -61,6 +61,9 @@ static const bigtime_t kNonAppQuitTimeout = 500000; // 0.5 s
// the shutdown window before closing it automatically. // the shutdown window before closing it automatically.
static const bigtime_t kDisplayAbortingAppTimeout = 3000000; // 3 s static const bigtime_t kDisplayAbortingAppTimeout = 3000000; // 3 s
static const int kStripeWidth = 30;
static const int kIconVSpacing = 6;
static const int kIconSize = 32;
// message what fields (must not clobber the registrar's message namespace) // message what fields (must not clobber the registrar's message namespace)
enum { enum {
@@ -248,7 +251,7 @@ public:
// create the views // create the views
// root view // root view
fRootView = new(nothrow) TAlertView(BRect(0, 0, 100, 15), "app icons", fRootView = new(nothrow) TAlertView(BRect(0, 0, 10, 10), "app icons",
B_FOLLOW_NONE, 0); B_FOLLOW_NONE, 0);
if (!fRootView) if (!fRootView)
return B_NO_MEMORY; return B_NO_MEMORY;
@@ -351,8 +354,7 @@ public:
fTextView->SetText("two\nlines"); fTextView->SetText("two\nlines");
int textHeight = (int)fTextView->TextHeight(0, 1) + 1; int textHeight = (int)fTextView->TextHeight(0, 1) + 1;
int rightPartX = fRootView->Frame().IntegerWidth() int rightPartX = kStripeWidth + kIconSize / 2 + 1;
+ 1;
int textX = rightPartX + kInnerHSpacing; int textX = rightPartX + kInnerHSpacing;
int textY = kVSpacing; int textY = kVSpacing;
int buttonsY = textY + textHeight + kInnerVSpacing; int buttonsY = textY + textHeight + kInnerVSpacing;
@@ -533,7 +535,7 @@ private:
virtual void Draw(BRect updateRect) virtual void Draw(BRect updateRect)
{ {
BRect stripeRect = Bounds(); BRect stripeRect = Bounds();
stripeRect.right = 30; stripeRect.right = kStripeWidth;
SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT)); SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT));
FillRect(stripeRect); FillRect(stripeRect);
@@ -544,7 +546,8 @@ private:
} else } else
SetDrawingMode(B_OP_OVER); SetDrawingMode(B_OP_OVER);
DrawBitmapAsync(fAppInfo->largeIcon, BPoint(18, 6)); DrawBitmapAsync(fAppInfo->largeIcon,
BPoint(kStripeWidth - kIconSize / 2, kIconVSpacing));
} }
} }