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

* Improve clarity of some code.

Browse Source 
* Preserve transparency of default color when color
   changes via tag.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38826 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-09-27 09:43:55 +00:00
parent f6d6a61645
commit 4ad39ed76d
1 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/apps/mediaplayer/interface/SubtitleBitmap.cpp
View File

@ -117,9 +117,9 @@ SubtitleBitmap::_GenerateBitmap()
struct ParseState { struct ParseState {
ParseState() ParseState(rgb_color color)
: :
color(rgb_color().set_to(255, 255, 255, 255)), color(color),
bold(false), bold(false),
italic(false), italic(false),
underlined(false), underlined(false),
@ -138,6 +138,7 @@ struct ParseState {
previous(previous) previous(previous)
{ {
} }
rgb_color color; rgb_color color;
bool bold; bool bold;
bool italic; bool italic;
@ -159,7 +160,7 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
}; };
static const int32 kTagCount = sizeof(kTags) / sizeof(const char*); static const int32 kTagCount = sizeof(kTags) / sizeof(const char*);
int32 current = tagPos; int32 startPos = tagPos;
tagPos = string.Length(); tagPos = string.Length();
tagLength = 0; tagLength = 0;
@ -167,14 +168,16 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
// This way of doing it allows broken input with overlapping tags even. // This way of doing it allows broken input with overlapping tags even.
BString tag; BString tag;
for (int32 i = 0; i < kTagCount; i++) { for (int32 i = 0; i < kTagCount; i++) {
int32 nextTag = string.IFindFirst(kTags[i], current); int32 nextTag = string.IFindFirst(kTags[i], startPos);
if (nextTag >= current && nextTag < tagPos) { if (nextTag >= startPos && nextTag < tagPos) {
tagPos = nextTag; tagPos = nextTag;
tag = kTags[i]; tag = kTags[i];
} }
} }
if (tag != "") { if (tag.Length() == 0)
return false;
// Tag found, ParseState will change. // Tag found, ParseState will change.
tagLength = tag.Length(); tagLength = tag.Length();
if (tag == "<b>") { if (tag == "<b>") {
@ -196,6 +199,7 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
state->color.red = (colorInt & 0xff0000) >> 16; state->color.red = (colorInt & 0xff0000) >> 16;
state->color.green = (colorInt & 0x00ff00) >> 8; state->color.green = (colorInt & 0x00ff00) >> 8;
state->color.blue = (colorInt & 0x0000ff); state->color.blue = (colorInt & 0x0000ff);
// skip 'RRGGBB">' part, too
tagLength += 8; tagLength += 8;
} }
} else if (tag == "</b>" || tag == "</i>" || tag == "</u>" } else if (tag == "</b>" || tag == "</i>" || tag == "</u>"
@ -209,8 +213,6 @@ find_next_tag(const BString& string, int32& tagPos, int32& tagLength,
} }
return true; return true;
} }
return false;
}
static void static void
@ -223,6 +225,8 @@ apply_state(BTextView* textView, const ParseState* state, BFont font,
face |= B_BOLD_FACE; face |= B_BOLD_FACE;
if (state->italic) if (state->italic)
face |= B_ITALIC_FACE; face |= B_ITALIC_FACE;
// NOTE: This is probably not supported by the app_server (perhaps
// it is if the font contains a specific underline face).
if (state->underlined) if (state->underlined)
face |= B_UNDERSCORE_FACE; face |= B_UNDERSCORE_FACE;
} else } else
@ -237,9 +241,11 @@ apply_state(BTextView* textView, const ParseState* state, BFont font,
static void static void
parse_text(const BString& string, BTextView* textView, const BFont& font, parse_text(const BString& string, BTextView* textView, const BFont& font,
bool changeColor) const rgb_color& color, bool changeColor)
{ {
ParseState rootState; ParseState rootState(color);
// Colors may change, but alpha channel will be preserved
ParseState* state = &rootState; ParseState* state = &rootState;
int32 pos = 0; int32 pos = 0;
@ -294,14 +300,14 @@ SubtitleBitmap::_InsertText()
fTextView->SetFontAndColor(&font, B_FONT_ALL, &color); fTextView->SetFontAndColor(&font, B_FONT_ALL, &color);
fTextView->Insert(" "); fTextView->Insert(" ");
parse_text(fText, fTextView, font, true); parse_text(fText, fTextView, font, color, true);
font.SetFalseBoldWidth(falseBoldWidth); font.SetFalseBoldWidth(falseBoldWidth);
fShadowTextView->SetText(NULL); fShadowTextView->SetText(NULL);
fShadowTextView->SetFontAndColor(&font, B_FONT_ALL, &shadow); fShadowTextView->SetFontAndColor(&font, B_FONT_ALL, &shadow);
fShadowTextView->Insert(" "); fShadowTextView->Insert(" ");
parse_text(fText, fShadowTextView, font, false); parse_text(fText, fShadowTextView, font, shadow, false);
// This causes the BTextView to calculate the layout of the text // This causes the BTextView to calculate the layout of the text
fTextView->SetTextRect(BRect(0, 0, 0, 0)); fTextView->SetTextRect(BRect(0, 0, 0, 0));