X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/258b2ca6819988c73a953bb8c2760b91c78d520c..032bc940fcde34cc649eaa111cd6aff1cda66104:/src/generic/hyperlink.cpp

diff --git a/src/generic/hyperlink.cpp b/src/generic/hyperlink.cpp
index 4288e4c303..21f80fc131 100644
--- a/src/generic/hyperlink.cpp
+++ b/src/generic/hyperlink.cpp
@@ -37,10 +37,10 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/log.h"
+    #include "wx/dataobj.h"
 #endif
 
 #include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 
 // ============================================================================
 // implementation
@@ -53,6 +53,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_HYPERLINK)
 // reserved for internal use only
 #define wxHYPERLINKCTRL_POPUP_COPY_ID           16384
 
+const wxChar wxHyperlinkCtrlNameStr[] = wxT("hyperlink");
+
 // ----------------------------------------------------------------------------
 // wxHyperlinkCtrl
 // ----------------------------------------------------------------------------
@@ -62,8 +64,9 @@ BEGIN_EVENT_TABLE(wxHyperlinkCtrl, wxControl)
     EVT_LEFT_DOWN(wxHyperlinkCtrl::OnLeftDown)
     EVT_LEFT_UP(wxHyperlinkCtrl::OnLeftUp)
     EVT_RIGHT_UP(wxHyperlinkCtrl::OnRightUp)
-    EVT_ENTER_WINDOW(wxHyperlinkCtrl::OnEnterWindow)
+    EVT_MOTION(wxHyperlinkCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxHyperlinkCtrl::OnLeaveWindow)
+    EVT_SIZE(wxHyperlinkCtrl::OnSize)
 
     // for the context menu
     EVT_MENU(wxHYPERLINKCTRL_POPUP_COPY_ID, wxHyperlinkCtrl::OnPopUpCopy)
@@ -76,6 +79,14 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     wxASSERT_MSG(!url.empty() || !label.empty(),
                  wxT("Both URL and label are empty ?"));
 
+#ifdef __WXDEBUG__
+    int alignment = (int)((style & wxHL_ALIGN_LEFT) != 0) +
+                    (int)((style & wxHL_ALIGN_CENTRE) != 0) +
+                    (int)((style & wxHL_ALIGN_RIGHT) != 0);
+    wxASSERT_MSG(alignment == 1, 
+        wxT("Specify exactly one align flag!")); 
+#endif
+
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
@@ -90,9 +101,6 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     else
         SetLabel(label);
 
-    // by default the cursor to use in this window is wxCURSOR_HAND
-    SetCursor(wxCursor(wxCURSOR_HAND));
-
     m_rollover = false;
     m_clicking = false;
     m_visited = false;
@@ -107,10 +115,8 @@ bool wxHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
     f.SetUnderlined(true);
     SetFont(f);
 
-    CacheBestSize(DoGetBestSize());
-    SetMinSize(GetBestSize());
-    SetSize (DoGetBestSize());
-
+    SetInitialSize(size);
+    
     return true;
 }
 
@@ -122,14 +128,11 @@ wxSize wxHyperlinkCtrl::DoGetBestSize() const
     dc.SetFont(GetFont());
     dc.GetTextExtent(GetLabel(), &w, &h);
 
-    return wxSize(w, h);
+    wxSize best(w, h);
+    CacheBestSize(best);
+    return best;
 }
 
-void wxHyperlinkCtrl::DoGetSize(int *width, int *height) const
-{
-    if (width) *width = GetBestSize().GetWidth();
-    if (height) *height = GetBestSize().GetHeight();
-}
 
 void wxHyperlinkCtrl::SetNormalColour(const wxColour &colour)
 {
@@ -159,6 +162,24 @@ void wxHyperlinkCtrl::DoContextMenu(const wxPoint &pos)
     delete menuPopUp;
 }
 
+wxRect wxHyperlinkCtrl::GetLabelRect() const
+{
+    // our best size is always the size of the label without borders
+    wxSize c(GetClientSize()), b(GetBestSize());
+    wxPoint offset;
+
+    // the label is always centered vertically
+    offset.y = (c.GetHeight()-b.GetHeight())/2;
+
+    if (HasFlag(wxHL_ALIGN_CENTRE))
+        offset.x = (c.GetWidth()-b.GetWidth())/2;
+    else if (HasFlag(wxHL_ALIGN_RIGHT))
+        offset.x = c.GetWidth()-b.GetWidth();
+    else if (HasFlag(wxHL_ALIGN_LEFT))
+        offset.x = 0;
+    return wxRect(offset, b);
+}
+
 
 
 // ----------------------------------------------------------------------------
@@ -171,17 +192,21 @@ void wxHyperlinkCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.SetFont(GetFont());
     dc.SetTextForeground(GetForegroundColour());
     dc.SetTextBackground(GetBackgroundColour());
-    dc.DrawText(GetLabel(), 0, 0);
+
+    dc.DrawText(GetLabel(), GetLabelRect().GetTopLeft());
 }
 
-void wxHyperlinkCtrl::OnLeftDown(wxMouseEvent& WXUNUSED(event))
+void wxHyperlinkCtrl::OnLeftDown(wxMouseEvent& event)
 {
-    m_clicking = true;
+    // the left click must start from the hyperlink rect
+    m_clicking = GetLabelRect().Contains(event.GetPosition());
 }
 
-void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& WXUNUSED(event))
+void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& event)
 {
-    if (!m_clicking) return;
+    // the click must be started and ended in the hyperlink rect
+    if (!m_clicking || !GetLabelRect().Contains(event.GetPosition())) 
+        return;
 
     SetForegroundColour(m_visitedColour);
     m_visited = true;
@@ -197,20 +222,40 @@ void wxHyperlinkCtrl::OnLeftUp(wxMouseEvent& WXUNUSED(event))
 void wxHyperlinkCtrl::OnRightUp(wxMouseEvent& event)
 {
     if( GetWindowStyle() & wxHL_CONTEXTMENU )
-        DoContextMenu(wxPoint(event.m_x, event.m_y));
+        if ( GetLabelRect().Contains(event.GetPosition()) )
+            DoContextMenu(wxPoint(event.m_x, event.m_y));
 }
 
-void wxHyperlinkCtrl::OnEnterWindow(wxMouseEvent& WXUNUSED(event))
+void wxHyperlinkCtrl::OnMotion(wxMouseEvent& event)
 {
-    SetForegroundColour(m_hoverColour);
-    m_rollover = true;
-    Refresh();
+    wxRect textrc = GetLabelRect();
+
+    if (textrc.Contains(event.GetPosition()))
+    {
+        SetCursor(wxCursor(wxCURSOR_HAND));
+        SetForegroundColour(m_hoverColour);
+        m_rollover = true;
+        Refresh();
+    }
+    else if (m_rollover)
+    {
+        SetCursor(*wxSTANDARD_CURSOR);
+        SetForegroundColour(!m_visited ? m_normalColour : m_visitedColour);
+        m_rollover = false;
+        Refresh();
+    }
 }
 
-void wxHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event))
+void wxHyperlinkCtrl::OnLeaveWindow(wxMouseEvent& WXUNUSED(event) )
 {
+    // NB: when the label rect and the client size rect have the same
+    //     height this function is indispensable to remove the "rollover"
+    //     effect as the OnMotion() event handler could not be called
+    //     in that case moving the mouse out of the label vertically...
+
     if (m_rollover)
     {
+        SetCursor(*wxSTANDARD_CURSOR);
         SetForegroundColour(!m_visited ? m_normalColour : m_visitedColour);
         m_rollover = false;
         Refresh();
@@ -229,4 +274,11 @@ void wxHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) )
 #endif // wxUSE_CLIPBOARD
 }
 
+void wxHyperlinkCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    // update the position of the label in the screen respecting
+    // the selected align flag
+    Refresh();
+}
+
 #endif // wxUSE_HYPERLINKCTRL