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

* fixed crash in case one tries to print a new composed mail

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24696 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Karsten Heimrich
2008-03-30 21:13:32 +00:00
parent 1f604fd046
commit dca967073f
1 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mail/MailWindow.cpp
+34 -21
View File
@@ -1863,23 +1863,30 @@ TMailWindow::Print()
print.SetSettings(new BMessage(fApp->PrintSettings())); print.SetSettings(new BMessage(fApp->PrintSettings()));
if (print.ConfigJob() == B_NO_ERROR) { if (print.ConfigJob() == B_OK) {
int32 curPage = 1; int32 curPage = 1;
int32 lastLine = 0; int32 lastLine = 0;
BTextView header_view(print.PrintableRect(),"header",print.PrintableRect().OffsetByCopy(BPoint(-print.PrintableRect().left,-print.PrintableRect().top)),B_FOLLOW_ALL_SIDES); BTextView header_view(print.PrintableRect(), "header",
print.PrintableRect().OffsetByCopy(BPoint(-print.PrintableRect().left,
-print.PrintableRect().top)),B_FOLLOW_ALL_SIDES);
//---------Init the header fields //---------Init the header fields
#define add_header_field(field) {/*header_view.SetFontAndColor(be_bold_font);*/ \ #define add_header_field(field) { \
header_view.Insert(fHeaderView->field->Label()); \ /*header_view.SetFontAndColor(be_bold_font);*/ \
header_view.Insert(" ");\ header_view.Insert(fHeaderView->field->Label()); \
/*header_view.SetFontAndColor(be_plain_font);*/ \ header_view.Insert(" "); \
header_view.Insert(fHeaderView->field->Text()); \ /*header_view.SetFontAndColor(be_plain_font);*/ \
header_view.Insert("\n");} header_view.Insert(fHeaderView->field->Text()); \
header_view.Insert("\n"); \
}
add_header_field(fSubject); add_header_field(fSubject);
add_header_field(fTo); add_header_field(fTo);
if ((fHeaderView->fCc != NULL) && (strcmp(fHeaderView->fCc->Text(),"") != 0)) if ((fHeaderView->fCc != NULL) && (strcmp(fHeaderView->fCc->Text(),"") != 0))
add_header_field(fCc); add_header_field(fCc);
header_view.Insert(fHeaderView->fDate->Text());
if (fHeaderView->fDate != NULL)
header_view.Insert(fHeaderView->fDate->Text());
int32 maxLine = fContentView->fTextView->CountLines(); int32 maxLine = fContentView->fTextView->CountLines();
BRect pageRect = print.PrintableRect(); BRect pageRect = print.PrintableRect();
@@ -1887,13 +1894,15 @@ TMailWindow::Print()
print.BeginJob(); print.BeginJob();
float header_height = header_view.TextHeight(0,header_view.CountLines()); float header_height = header_view.TextHeight(0,header_view.CountLines());
BBitmap bmap(BRect(0,0,pageRect.Width(),header_height),B_BITMAP_ACCEPTS_VIEWS,B_RGBA32);
BRect rect(0, 0, pageRect.Width(), header_height);
BBitmap bmap(rect, B_BITMAP_ACCEPTS_VIEWS, B_RGBA32);
bmap.Lock(); bmap.Lock();
bmap.AddChild(&header_view); bmap.AddChild(&header_view);
print.DrawView(&header_view,BRect(0,0,pageRect.Width(),header_height),BPoint(0.0,0.0)); print.DrawView(&header_view, rect, BPoint(0.0, 0.0));
HorizontalLine line(BRect(0,0,pageRect.right,0)); HorizontalLine line(BRect(0, 0, pageRect.right, 0));
bmap.AddChild(&line); bmap.AddChild(&line);
print.DrawView(&line,line.Bounds(),BPoint(0,header_height+1)); print.DrawView(&line, line.Bounds(), BPoint(0, header_height + 1));
bmap.Unlock(); bmap.Unlock();
header_height += 5; header_height += 5;
@@ -1903,18 +1912,22 @@ TMailWindow::Print()
curPageRect.OffsetTo(0, fContentView->fTextView->PointAt(lineOffset).y); curPageRect.OffsetTo(0, fContentView->fTextView->PointAt(lineOffset).y);
int32 fromLine = lastLine; int32 fromLine = lastLine;
lastLine = fContentView->fTextView->LineAt(BPoint(0.0, curPageRect.bottom - ((curPage == 1) ? header_height : 0))); lastLine = fContentView->fTextView->LineAt(
BPoint(0.0, curPageRect.bottom - ((curPage == 1) ? header_height : 0)));
float curPageHeight = fContentView->fTextView->TextHeight(fromLine, lastLine) + ((curPage == 1) ? header_height : 0); float curPageHeight = fContentView->fTextView->
if(curPageHeight > pageRect.Height()) TextHeight(fromLine, lastLine) + ((curPage == 1) ? header_height : 0);
curPageHeight = fContentView->fTextView->TextHeight(fromLine, --lastLine) + ((curPage == 1) ? header_height : 0);
if(curPageHeight > pageRect.Height()) {
curPageHeight = fContentView->fTextView->TextHeight(
fromLine, --lastLine) + ((curPage == 1) ? header_height : 0);
}
curPageRect.bottom = curPageRect.top + curPageHeight - 1.0; curPageRect.bottom = curPageRect.top + curPageHeight - 1.0;
if((curPage >= print.FirstPage()) && if((curPage >= print.FirstPage())
(curPage <= print.LastPage())) && (curPage <= print.LastPage())) {
{ print.DrawView(fContentView->fTextView, curPageRect,
print.DrawView(fContentView->fTextView, curPageRect, BPoint(0.0, (curPage == 1) ? header_height : 0.0)); BPoint(0.0, (curPage == 1) ? header_height : 0.0));
print.SpoolPage(); print.SpoolPage();
} }