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

Fix the layouting of notifications again.

Browse Source 
I'm not sure about the ApGroupView being (and looking like) a BBox.
Thoughts about that ?


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43119 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues 2011-11-02 16:25:29 +00:00
parent 3d1f420b23
commit e0890a26f4
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/servers/notification/AppGroupView.cpp
View File

@ -24,7 +24,7 @@
AppGroupView::AppGroupView(NotificationWindow* win, const char* label) AppGroupView::AppGroupView(NotificationWindow* win, const char* label)
: :
BBox(B_FANCY_BORDER, (fView = new BGroupView(B_VERTICAL, 10))), BBox(B_FANCY_BORDER, (fView = new BGroupView(B_VERTICAL, 0))),
fLabel(label), fLabel(label),
fParent(win), fParent(win),
fCollapsed(false) fCollapsed(false)

28
src/servers/notification/NotificationView.cpp
View File

@ -14,6 +14,9 @@
*/ */
#include <ControlLook.h> #include <ControlLook.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <Layout.h>
#include <LayoutUtils.h> #include <LayoutUtils.h>
#include <Messenger.h> #include <Messenger.h>
#include <Path.h> #include <Path.h>
@ -59,6 +62,9 @@ NotificationView::NotificationView(NotificationWindow* win,
if (fTimeout <= 0) if (fTimeout <= 0)
fTimeout = fParent->Timeout() * 1000000; fTimeout = fParent->Timeout() * 1000000;
BGroupLayout* layout = new BGroupLayout(B_VERTICAL);
SetLayout(layout);
SetText(); SetText();
switch (fNotification->Type()) { switch (fNotification->Type()) {
@ -72,9 +78,7 @@ NotificationView::NotificationView(NotificationWindow* win,
break; break;
case B_PROGRESS_NOTIFICATION: case B_PROGRESS_NOTIFICATION:
{ {
BRect frame(kIconStripeWidth + 9, Bounds().bottom - 36, BStatusBar* progress = new BStatusBar("progress");
Bounds().right - 8, Bounds().bottom - 10);
BStatusBar* progress = new BStatusBar(frame, "progress");
progress->SetBarHeight(12.0f); progress->SetBarHeight(12.0f);
progress->SetMaxValue(1.0f); progress->SetMaxValue(1.0f);
progress->Update(fNotification->Progress()); progress->Update(fNotification->Progress());
@ -83,7 +87,9 @@ NotificationView::NotificationView(NotificationWindow* win,
label << (int)(fNotification->Progress() * 100) << " %"; label << (int)(fNotification->Progress() * 100) << " %";
progress->SetTrailingText(label); progress->SetTrailingText(label);
AddChild(progress); BGroupLayoutBuilder b(layout);
b.AddGlue()
.Add(progress);
} }
// fall through // fall through
default: default:
@ -410,8 +416,9 @@ NotificationView::GetSupportedSuites(BMessage* msg)
void void
NotificationView::SetText(float newMaxWidth) NotificationView::SetText(float newMaxWidth)
{ {
if (newMaxWidth < 0) if (newMaxWidth < 0) {
newMaxWidth = Bounds().Width() - (kEdgePadding * 2); newMaxWidth = 200;
}
// Delete old lines // Delete old lines
LineInfoList::iterator lIt; LineInfoList::iterator lIt;
@ -447,7 +454,7 @@ NotificationView::SetText(float newMaxWidth)
+ ceilf(fh.ascent); + ceilf(fh.ascent);
// Split text into chunks between certain characters and compose the lines. // Split text into chunks between certain characters and compose the lines.
const char kSeparatorCharacters[] = " \n-\\/"; const char kSeparatorCharacters[] = " \n-\\";
BString textBuffer = fNotification->Content(); BString textBuffer = fNotification->Content();
textBuffer.ReplaceAll("\t", " "); textBuffer.ReplaceAll("\t", " ");
const char* chunkStart = textBuffer.String(); const char* chunkStart = textBuffer.String();
@ -512,6 +519,11 @@ NotificationView::SetText(float newMaxWidth)
if (fHeight < minHeight) if (fHeight < minHeight)
fHeight = minHeight; fHeight = minHeight;
} }
// Make sure the progress bar is below the text, and the window is big
// enough.
static_cast<BGroupLayout*>(GetLayout())->SetInsets(kIconStripeWidth + 8,
fHeight, 8, 8);
} }
@ -528,7 +540,7 @@ NotificationView::_CalculateSize()
BSize size; BSize size;
// Parent width, minus the edge padding, minus the pensize // Parent width, minus the edge padding, minus the pensize
size.width = fParent->Width() - (kEdgePadding * 2) - (kPenSize * 2); size.width = B_SIZE_UNLIMITED;
size.height = fHeight; size.height = fHeight;
if (fNotification->Type() == B_PROGRESS_NOTIFICATION) { if (fNotification->Type() == B_PROGRESS_NOTIFICATION) {

3
src/servers/notification/NotificationWindow.cpp
View File

@ -62,7 +62,7 @@ NotificationWindow::NotificationWindow()
| B_NOT_RESIZABLE | B_NOT_MOVABLE | B_AUTO_UPDATE_SIZE_LIMITS, | B_NOT_RESIZABLE | B_NOT_MOVABLE | B_AUTO_UPDATE_SIZE_LIMITS,
B_ALL_WORKSPACES) B_ALL_WORKSPACES)
{ {
SetLayout(new BGroupLayout(B_VERTICAL, 10)); SetLayout(new BGroupLayout(B_VERTICAL, 0));
Hide(); Hide();
Show(); Show();
@ -359,7 +359,6 @@ NotificationWindow::SetPosition()
float rightOffset = bounds.right - Frame().right; float rightOffset = bounds.right - Frame().right;
float bottomOffset = bounds.bottom - Frame().bottom; float bottomOffset = bounds.bottom - Frame().bottom;
// Size of the borders around the window // Size of the borders around the window
printf("%f %f %f %f\n",leftOffset, topOffset, rightOffset, bottomOffset);
float x = Frame().left, y = Frame().top; float x = Frame().left, y = Frame().top;
// If we can't guess, don't move... // If we can't guess, don't move...