Remove noDrag madness.
This commit is contained in:
parent
56dd4cf3ee
commit
f58f03f19e
9 changed files with 3 additions and 51 deletions
19
Button.cpp
19
Button.cpp
|
@ -14,7 +14,6 @@ Button::Button (QWidget *parent, uint normal, uint pressed, bool pls) : PixWidge
|
||||||
m_name_pressed = pressed;
|
m_name_pressed = pressed;
|
||||||
m_diffx = 0;
|
m_diffx = 0;
|
||||||
m_diffy = 0;
|
m_diffy = 0;
|
||||||
m_nodrag = false;
|
|
||||||
m_pls = pls;
|
m_pls = pls;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,36 +53,18 @@ Button::setPixmaps(Skin *skin)
|
||||||
void
|
void
|
||||||
Button::mousePressEvent (QMouseEvent *event)
|
Button::mousePressEvent (QMouseEvent *event)
|
||||||
{
|
{
|
||||||
MainWindow *mw = dynamic_cast<MainWindow *>(window ());
|
|
||||||
if (mw) {
|
|
||||||
mw->setNoDrag (true);
|
|
||||||
} else {
|
|
||||||
PlaylistWindow *pw = dynamic_cast<PlaylistWindow *>(window ());
|
|
||||||
pw->setNoDrag (true);
|
|
||||||
}
|
|
||||||
|
|
||||||
m_pixmap = m_pixmap_pressed;
|
m_pixmap = m_pixmap_pressed;
|
||||||
|
|
||||||
m_diffx = event->pos().x();
|
m_diffx = event->pos().x();
|
||||||
m_diffy = event->pos().y();
|
m_diffy = event->pos().y();
|
||||||
|
|
||||||
m_nodrag = true;
|
|
||||||
|
|
||||||
update ();
|
update ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
Button::mouseReleaseEvent (QMouseEvent *event)
|
Button::mouseReleaseEvent (QMouseEvent *event)
|
||||||
{
|
{
|
||||||
MainWindow *mw = dynamic_cast<MainWindow *>(window ());
|
|
||||||
if (mw) {
|
|
||||||
mw->setNoDrag (true);
|
|
||||||
} else {
|
|
||||||
PlaylistWindow *pw = dynamic_cast<PlaylistWindow *>(window ());
|
|
||||||
pw->setNoDrag (true);
|
|
||||||
}
|
|
||||||
m_pixmap = m_pixmap_normal;
|
m_pixmap = m_pixmap_normal;
|
||||||
m_nodrag = false;
|
|
||||||
update();
|
update();
|
||||||
emit clicked();
|
emit clicked();
|
||||||
}
|
}
|
||||||
|
|
2
Button.h
2
Button.h
|
@ -12,7 +12,6 @@ class Button : public PixWidget
|
||||||
Button (QWidget *parent, uint btn1, uint btn2, bool pls=false);
|
Button (QWidget *parent, uint btn1, uint btn2, bool pls=false);
|
||||||
Button (QWidget *parent);
|
Button (QWidget *parent);
|
||||||
~Button ();
|
~Button ();
|
||||||
bool noDrag (void) { return m_nodrag; }
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void setPixmaps (Skin *skin);
|
void setPixmaps (Skin *skin);
|
||||||
|
@ -23,6 +22,7 @@ class Button : public PixWidget
|
||||||
protected:
|
protected:
|
||||||
void mousePressEvent (QMouseEvent *event);
|
void mousePressEvent (QMouseEvent *event);
|
||||||
void mouseReleaseEvent (QMouseEvent *event);
|
void mouseReleaseEvent (QMouseEvent *event);
|
||||||
|
void mouseMoveEvent (QMouseEvent *event) {}
|
||||||
|
|
||||||
uint m_name_normal;
|
uint m_name_normal;
|
||||||
uint m_name_pressed;
|
uint m_name_pressed;
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
SkinDisplay::SkinDisplay (QWidget *parent) : QWidget(parent)
|
SkinDisplay::SkinDisplay (QWidget *parent) : QWidget(parent)
|
||||||
{
|
{
|
||||||
m_noDrag = false;
|
|
||||||
m_mw = parent;
|
m_mw = parent;
|
||||||
|
|
||||||
connect (dynamic_cast<MainWindow *>(parent)->getSkin (),
|
connect (dynamic_cast<MainWindow *>(parent)->getSkin (),
|
||||||
|
@ -27,10 +26,8 @@ SkinDisplay::mousePressEvent (QMouseEvent *event)
|
||||||
void
|
void
|
||||||
SkinDisplay::mouseMoveEvent (QMouseEvent *event)
|
SkinDisplay::mouseMoveEvent (QMouseEvent *event)
|
||||||
{
|
{
|
||||||
if (!m_noDrag) {
|
m_mw->move(event->globalPos().x() - m_diffX,
|
||||||
m_mw->move(event->globalPos().x() - m_diffX,
|
event->globalPos().y() - m_diffY);
|
||||||
event->globalPos().y() - m_diffY);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -17,10 +17,6 @@ class SkinDisplay : public QWidget
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
SkinDisplay (QWidget *parent);
|
SkinDisplay (QWidget *parent);
|
||||||
|
|
||||||
bool getNoDrag () const { return m_noDrag; }
|
|
||||||
void setNoDrag (bool d) { m_noDrag = d; }
|
|
||||||
|
|
||||||
QWidget *getMW () const { return m_mw; }
|
QWidget *getMW () const { return m_mw; }
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
@ -37,7 +33,6 @@ class SkinDisplay : public QWidget
|
||||||
QWidget *m_tbar;
|
QWidget *m_tbar;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_noDrag;
|
|
||||||
int m_diffX;
|
int m_diffX;
|
||||||
int m_diffY;
|
int m_diffY;
|
||||||
};
|
};
|
||||||
|
|
|
@ -44,16 +44,6 @@ MainWindow::~MainWindow ()
|
||||||
delete skin;
|
delete skin;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
MainWindow::setNoDrag (bool b)
|
|
||||||
{
|
|
||||||
if (m_isshaded) {
|
|
||||||
m_shaded->setNoDrag (b);
|
|
||||||
} else {
|
|
||||||
m_display->setNoDrag (b);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
MainWindow::switchDisplay ()
|
MainWindow::switchDisplay ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,7 +29,6 @@ class MainWindow : public QMainWindow
|
||||||
~MainWindow (void);
|
~MainWindow (void);
|
||||||
|
|
||||||
Skin *getSkin (void);
|
Skin *getSkin (void);
|
||||||
void setNoDrag (bool b);
|
|
||||||
|
|
||||||
XMMSHandler *getHandler () { return m_handler; }
|
XMMSHandler *getHandler () { return m_handler; }
|
||||||
MainDisplay *getMD () { return m_display; }
|
MainDisplay *getMD () { return m_display; }
|
||||||
|
|
|
@ -73,7 +73,6 @@ PlaylistScroller::paintEvent (QPaintEvent *event)
|
||||||
PlaylistWindow::PlaylistWindow (QWidget *parent, Skin *skin) : QMainWindow (parent)
|
PlaylistWindow::PlaylistWindow (QWidget *parent, Skin *skin) : QMainWindow (parent)
|
||||||
{
|
{
|
||||||
m_skin = skin;
|
m_skin = skin;
|
||||||
m_noDrag = false;
|
|
||||||
|
|
||||||
setWindowFlags (Qt::FramelessWindowHint);
|
setWindowFlags (Qt::FramelessWindowHint);
|
||||||
connect (m_skin, SIGNAL (skinChanged (Skin *)), this, SLOT (setPixmaps(Skin *)));
|
connect (m_skin, SIGNAL (skinChanged (Skin *)), this, SLOT (setPixmaps(Skin *)));
|
||||||
|
@ -120,9 +119,6 @@ PlaylistWindow::mousePressEvent (QMouseEvent *event)
|
||||||
void
|
void
|
||||||
PlaylistWindow::mouseMoveEvent (QMouseEvent *event)
|
PlaylistWindow::mouseMoveEvent (QMouseEvent *event)
|
||||||
{
|
{
|
||||||
if (m_noDrag)
|
|
||||||
return;
|
|
||||||
|
|
||||||
move (event->globalPos().x() - m_diffx,
|
move (event->globalPos().x() - m_diffx,
|
||||||
event->globalPos().y() - m_diffy);
|
event->globalPos().y() - m_diffy);
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,6 @@ class PlaylistWindow : public QMainWindow {
|
||||||
|
|
||||||
void setActive (bool);
|
void setActive (bool);
|
||||||
Skin *getSkin (void) { return m_skin; }
|
Skin *getSkin (void) { return m_skin; }
|
||||||
void setNoDrag (bool b) { m_noDrag = b; }
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void setPixmaps (Skin *skin);
|
void setPixmaps (Skin *skin);
|
||||||
|
@ -92,7 +91,6 @@ class PlaylistWindow : public QMainWindow {
|
||||||
QPixmap m_rfill3;
|
QPixmap m_rfill3;
|
||||||
|
|
||||||
bool m_active;
|
bool m_active;
|
||||||
bool m_noDrag;
|
|
||||||
|
|
||||||
Skin *m_skin;
|
Skin *m_skin;
|
||||||
|
|
||||||
|
|
|
@ -114,10 +114,6 @@ Slider::setPos (uint p)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_button->noDrag()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint x = m_pix * p / m_max;
|
uint x = m_pix * p / m_max;
|
||||||
if (x < m_pix - m_button->rect().width() && x != m_pos) {
|
if (x < m_pix - m_button->rect().width() && x != m_pos) {
|
||||||
m_button->move (x , 0);
|
m_button->move (x , 0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue