jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

(libinterface) Use default textruns if none selected, fix multi-URL lines

This commit is contained in:
Jaidyn Ann 2021-08-11 17:14:08 -05:00
parent 08292bdeda
commit b576311552
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/libinterface/UrlTextView.cpp
View File

@ -39,6 +39,15 @@ UrlTextView::UrlTextView(const char* name, const BFont* initialFont,
AdoptSystemColors(); AdoptSystemColors();
SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); SetViewCursor(B_CURSOR_SYSTEM_DEFAULT);
BFont font;
if (initialFont != NULL)
font = BFont(initialFont);
rgb_color color = ui_color(B_PANEL_TEXT_COLOR);
if (initialColor != NULL)
color = *initialColor;
text_run normalRun = { 0, font, color };
fNormalRun = { 1, {normalRun} };
BFont urlFont; BFont urlFont;
urlFont.SetFace(B_REGULAR_FACE | B_UNDERSCORE_FACE); urlFont.SetFace(B_REGULAR_FACE | B_UNDERSCORE_FACE);
text_run urlRun = { 0, urlFont, ui_color(B_LINK_TEXT_COLOR) }; text_run urlRun = { 0, urlFont, ui_color(B_LINK_TEXT_COLOR) };
@ -159,6 +168,9 @@ UrlTextView::Insert(const char* text, const text_run_array* runs)
int32 lastEnd = 0; int32 lastEnd = 0;
int32 length = buf.CountChars(); int32 length = buf.CountChars();
if (runs == NULL)
runs = &fNormalRun;
while (_FindUrlString(buf, &specStart, &specEnd, lastEnd) == true) { while (_FindUrlString(buf, &specStart, &specEnd, lastEnd) == true) {
if (lastEnd < specStart) { if (lastEnd < specStart) {
BString normie; BString normie;
@ -244,12 +256,18 @@ UrlTextView::GetLine(int32 line)
BUrl BUrl
UrlTextView::UrlAt(BPoint where) UrlTextView::UrlAt(BPoint where)
{ {
BString urlStr, line = GetLine(LineAt(where)); int32 lineNo = LineAt(where);
BString urlStr, line = GetLine(lineNo);
BUrl url; BUrl url;
int32 clickedOffset = OffsetAt(where) - OffsetAt(lineNo);
int32 offset = line.FindLast(" ", clickedOffset);
if (offset == B_ERROR)
offset = 0;
int32 start; int32 start;
int32 end; int32 end;
if (_FindUrlString(line, &start, &end, 0) == true) { if (_FindUrlString(line, &start, &end, offset) == true) {
line.CopyCharsInto(urlStr, start, end - start); line.CopyCharsInto(urlStr, start, end - start);
url.SetUrlString(urlStr); url.SetUrlString(urlStr);
} }