fixed 'jumping windows' bug

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@859 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 30 insertions, 23 deletions

diff --git a/src/ui/button.cpp b/src/ui/button.cpp
index 463b2352f..b9ee9cf09 100644
--- a/src/ui/button.cpp
+++ b/src/ui/button.cpp
@@ -24,14 +24,14 @@
 #include "button.h"
 #include "skin.h"
 
-Button::Button ( QWidget *parent, uint normal, uint pressed )
-      : PixmapWidget ( parent )
+Button::Button (QWidget *parent, uint normal, uint pressed)
+        : PixmapWidget (parent)
 {
-   name_normal = normal;
-   name_pressed = pressed;
-   skin = Skin::getPointer();
-   setON ( FALSE );
-   connect ( skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
+    name_normal = normal;
+    name_pressed = pressed;
+    skin = Skin::getPointer();
+    setON (FALSE);
+    connect (skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
 }
 
 
@@ -40,23 +40,24 @@ Button::~Button()
 
 void Button::updateSkin()
 {
-   setPixmap ( skin->getButton ( name_normal ) );
+    setPixmap (skin->getButton (name_normal));
 }
 
-void Button::setON ( bool on )
+void Button::setON (bool on)
 {
-   if ( on )
-      setPixmap ( skin->getButton ( name_pressed ) );
-   else
-      setPixmap ( skin->getButton ( name_normal ) );
+    if (on)
+        setPixmap (skin->getButton (name_pressed));
+    else
+        setPixmap (skin->getButton (name_normal));
 }
-void Button::mousePressEvent ( QMouseEvent* )
+void Button::mousePressEvent (QMouseEvent *e)
 {
-   setON ( TRUE );
+    setON (TRUE);
+    QWidget::mousePressEvent(e);
 }
 
-void Button::mouseReleaseEvent ( QMouseEvent* )
+void Button::mouseReleaseEvent (QMouseEvent*)
 {
-   setON ( FALSE );
-   emit clicked();
+    setON (FALSE);
+    emit clicked();
 }
diff --git a/src/ui/eqtitlebar.cpp b/src/ui/eqtitlebar.cpp
index 873cd5dc8..b16a9bd28 100644
--- a/src/ui/eqtitlebar.cpp
+++ b/src/ui/eqtitlebar.cpp
@@ -128,8 +128,11 @@ void EqTitleBar::mousePressEvent(QMouseEvent* event)
 
 void EqTitleBar::mouseMoveEvent(QMouseEvent* event)
 {
-    QPoint npos = (event->globalPos()-m_pos);
-    Dock::getPointer()->move(m_eq, npos);
+    if (m_pos.x() < width() - 30)
+    {
+        QPoint npos = (event->globalPos()-m_pos);
+        Dock::getPointer()->move(m_eq, npos);
+    }
 }
 
 void EqTitleBar::mouseReleaseEvent(QMouseEvent*)
diff --git a/src/ui/playlisttitlebar.cpp b/src/ui/playlisttitlebar.cpp
index 2e3b154ac..45a529dad 100644
--- a/src/ui/playlisttitlebar.cpp
+++ b/src/ui/playlisttitlebar.cpp
@@ -190,7 +190,7 @@ void PlayListTitleBar::mouseMoveEvent(QMouseEvent* event)
         m_pl->resize((event->x() + 25), m_pl->height());
         resize((event->x() + 25), height());
     }
-    else
+    else if (pos.x() < width() - 30)
         Dock::getPointer()->move(m_pl, npos);
 }
 
diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp
index d094a8c49..7eb8d317e 100644
--- a/src/ui/titlebar.cpp
+++ b/src/ui/titlebar.cpp
@@ -95,8 +95,11 @@ void TitleBar::mouseReleaseEvent(QMouseEvent*)
 }
 void TitleBar::mouseMoveEvent(QMouseEvent* event)
 {
-    QPoint npos = (event->globalPos()-m_pos);
-    Dock::getPointer()->move(m_mw, npos);
+    if (m_pos.x() < width() - 37)
+    {
+        QPoint npos = (event->globalPos()-m_pos);
+        Dock::getPointer()->move(m_mw, npos);
+    }
 }
 
 void TitleBar::setActive(bool a)