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

Sheesh! No wonder the styling code wasn't fully working, as we were using different constants for font attributes than the ones used by BeOS R5. Now we use those constants directly. Still not ok, but we are on the right track now (I hope :))

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8738 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-08-31 07:08:49 +00:00
parent 7ac08f006f
commit f6cd639a4b
3 changed files with 33 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+5 -5
View File
@@ -1095,7 +1095,7 @@ BTextView::SetText(BFile *inFile, int32 inOffset, int32 inLength,
// apply nullStyle to inserted text
fStyles->SyncNullStyle(inOffset);
fStyles->SetStyleRange(inOffset, inOffset + inLength,
fText->Length(), doAll, NULL, NULL);
fText->Length(), B_FONT_ALL, NULL, NULL);
}
fClickOffset = fSelStart = fSelEnd = 0;
@@ -1605,7 +1605,7 @@ BTextView::SetFontAndColor(const BFont *inFont, uint32 inMode,
fStyles->SetStyleRange(fSelStart, fSelEnd, fText->Length(),
inMode, &newFont, inColor);
if (inMode & doFont || inMode & doSize)
if (inMode & B_FONT_FAMILY_AND_STYLE || inMode & B_FONT_SIZE)
// recalc the line breaks and redraw with new style
Refresh(fSelStart, fSelEnd, fSelStart != fSelEnd, false);
else
@@ -1647,7 +1647,7 @@ BTextView::SetFontAndColor(int32 startOffset, int32 endOffset,
fStyles->SetStyleRange(startOffset, endOffset, fText->Length(),
inMode, &newFont, inColor);
if (inMode & doFont || inMode & doSize)
if (inMode & B_FONT_FAMILY_AND_STYLE || inMode & B_FONT_SIZE)
// recalc the line breaks and redraw with new style
Refresh(startOffset, endOffset, startOffset != endOffset, false);
else
@@ -1712,7 +1712,7 @@ BTextView::SetRunArray(int32 startOffset, int32 endOffset,
}
fStyles->SetStyleRange(fromOffset, toOffset, textLength,
doAll, &theRun->font, &theRun->color);
B_FONT_ALL, &theRun->font, &theRun->color);
theRun++;
}
@@ -2727,7 +2727,7 @@ BTextView::InsertText(const char *inText, int32 inLength, int32 inOffset,
// apply nullStyle to inserted text
fStyles->SyncNullStyle(inOffset);
fStyles->SetStyleRange(inOffset, inOffset + inLength,
fText->Length(), doAll, NULL, NULL);
fText->Length(), B_FONT_ALL, NULL, NULL);
}
}
//------------------------------------------------------------------------------