Ticket #8555: 0001-Ticket-8555-Underline-links-on-mouse-over.-B_UNDERSC.patch

src/apps/aboutsystem/HyperTextView.cpp

@@ -27 +27 @@
 
 
 void
-HyperTextAction::MouseOver(HyperTextView* view, BPoint where, BMessage* message)
+HyperTextAction::MouseOver(HyperTextView* view, BPoint where, int32 startOffset,
+        int32 endOffset, BMessage* message)
 {
     BCursor linkCursor(B_CURSOR_ID_FOLLOW_LINK);
     view->SetViewCursor(&linkCursor);
+
+    BFont font;
+    view->GetFont(&font);
+    font.SetFace(B_ITALIC_FACE);
+    view->SetFontAndColor(startOffset, endOffset, &font);
+}
+
+
+void
+HyperTextAction::MouseAway(HyperTextView* view, BPoint where, int32 startOffset,
+        int32 endOffset, BMessage* message)
+{
+    BFont font(be_plain_font);
+    view->SetFontAndColor(startOffset, endOffset, &font);
 }
 
 
@@ -92 +107 @@
     BTextView(name, flags),
     fActionInfos(new ActionInfoList(100, true))
 {
+    this->fLastActionInfo = NULL;
 }
 
 
@@ -101 +117 @@
     BTextView(frame, name, textRect, resizeMask, flags),
     fActionInfos(new ActionInfoList(100, true))
 {
+    this->fLastActionInfo = NULL;
 }
 
 
@@ -140 +157 @@
 
     uint32 buttons;
     HyperTextAction* action;
+    const ActionInfo* actionInfo;
+    if ((actionInfo = this->fLastActionInfo) != NULL
+        && (action = actionInfo->action) != NULL) {
+        action->MouseAway(this, where, actionInfo->startOffset,
+                actionInfo->endOffset, message);
+        this->fLastActionInfo = NULL;
+    }
+
     if (message->FindInt32("buttons", (int32*)&buttons) == B_OK
-        && buttons == 0 && (action = _ActionAt(where)) != NULL) {
-        action->MouseOver(this, where, message);
+        && buttons == 0 && (action = _ActionAt(where)) != NULL
+        && (actionInfo = _ActionInfoAt(where)) != NULL) {
+        this->fLastActionInfo = actionInfo;
+        action->MouseOver(this, where, actionInfo->startOffset,
+                actionInfo->endOffset, message);
         return;
     }
 
@@ -193 +221 @@
 HyperTextAction*
 HyperTextView::_ActionAt(const BPoint& where) const
 {
-    int32 offset = OffsetAt(where);
-
-    ActionInfo pointer(offset, offset + 1, NULL);
+    const ActionInfo* action = _ActionInfoAt(where);
 
-    const ActionInfo* action = fActionInfos->BinarySearch(pointer,
-            ActionInfo::CompareEqualIfIntersecting);
     if (action != NULL) {
         // verify that the text region was hit
         BRegion textRegion;
@@ -210 +234 @@
     return NULL;
 }
 
+
+const HyperTextView::ActionInfo*
+HyperTextView::_ActionInfoAt(const BPoint& where) const
+{
+    int32 offset = OffsetAt(where);
+
+    ActionInfo pointer(offset, offset + 1, NULL);
+
+    const ActionInfo* action = fActionInfos->BinarySearch(pointer,
+            ActionInfo::CompareEqualIfIntersecting);
+    return action;
+}

src/apps/aboutsystem/HyperTextView.h

@@ -21 +21 @@
     virtual                     ~HyperTextAction();
 
     virtual void                MouseOver(HyperTextView* view, BPoint where,
+                                    int32 startOffset, int32 endOffset,
+                                    BMessage* message);
+    void                    MouseAway(HyperTextView* view, BPoint where,
+                                    int32 startOffset, int32 endOffset,
                                     BMessage* message);
     virtual void                Clicked(HyperTextView* view, BPoint where,
                                     BMessage* message);
@@ -59 +63 @@
             class ActionInfoList;
 
             ActionInfoList*     fActionInfos;
+            const ActionInfo*   _ActionInfoAt(const BPoint& where) const;
+            const ActionInfo*   fLastActionInfo;
 };