Do not try to load non-existing skins files

[vlc] / modules / gui / skins2 / src / anchor.cpp

diff --git a/modules/gui/skins2/src/anchor.cpp b/modules/gui/skins2/src/anchor.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 2585782..24e8051
--- a/modules/gui/skins2/src/anchor.cpp
+++ b/modules/gui/skins2/src/anchor.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * anchor.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: anchor.cpp,v 1.1 2004/01/03 23:31:33 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "anchor.hpp"
@@ -27,20 +27,47 @@
 
 bool Anchor::isHanging( const Anchor &rOther ) const
 {
-    return (getXPosAbs() == rOther.getXPosAbs() &&
-            getYPosAbs() == rOther.getYPosAbs() &&
-            m_priority > rOther.m_priority );
+    if( m_priority <= rOther.m_priority )
+        return false;
+
+    // Compute delta coordinates between anchors, since the Bezier class
+    // uses coordinates relative to (0;0)
+    int deltaX = getXPosAbs() - rOther.getXPosAbs();
+    int deltaY = getYPosAbs() - rOther.getYPosAbs();
+
+    // One of the anchors (at least) must be a point, else it has no meaning
+    return (isPoint() && rOther.m_rCurve.getMinDist( deltaX, deltaY ) == 0) ||
+           (rOther.isPoint() && m_rCurve.getMinDist( -deltaX, -deltaY ) == 0);
 }
 
 
 bool Anchor::canHang( const Anchor &rOther, int &xOffset, int &yOffset ) const
 {
-    int xDist = getXPosAbs() - (rOther.getXPosAbs() + xOffset);
-    int yDist = getYPosAbs() - (rOther.getYPosAbs() + yOffset);
-    if( m_range > 0 && xDist*xDist + yDist*yDist <= m_range*m_range )
+    int deltaX = getXPosAbs() - (rOther.getXPosAbs() + xOffset);
+    int deltaY = getYPosAbs() - (rOther.getYPosAbs() + yOffset);
+
+    // One of the anchors (at least) must be a point, else it has no meaning
+    if( (isPoint() && rOther.m_rCurve.getMinDist( deltaX, deltaY ) < m_range) )
     {
-        xOffset = getXPosAbs() - rOther.getXPosAbs();
-        yOffset = getYPosAbs() - rOther.getYPosAbs();
+        // Compute the coordinates of the nearest point of the curve
+        int xx, yy;
+        float p = rOther.m_rCurve.getNearestPercent( deltaX, deltaY );
+        rOther.m_rCurve.getPoint( p, xx, yy );
+
+        xOffset = getXPosAbs() - (rOther.getXPosAbs() + xx);
+        yOffset = getYPosAbs() - (rOther.getYPosAbs() + yy);
+        return true;
+    }
+    else if( (rOther.isPoint() &&
+              m_rCurve.getMinDist( -deltaX, -deltaY ) < m_range) )
+    {
+        // Compute the coordinates of the nearest point of the curve
+        int xx, yy;
+        float p = m_rCurve.getNearestPercent( -deltaX, -deltaY );
+        m_rCurve.getPoint( p, xx, yy );
+
+        xOffset = (getXPosAbs() + xx) - rOther.getXPosAbs();
+        yOffset = (getYPosAbs() + yy) - rOther.getYPosAbs();
         return true;
     }
     else