projects
/
situare
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finished zoom panel drag feature fixes
[situare]
/
src
/
ui
/
zoombutton.cpp
diff --git
a/src/ui/zoombutton.cpp
b/src/ui/zoombutton.cpp
index
dbfc6b3
..
f1d8439
100644
(file)
--- a/
src/ui/zoombutton.cpp
+++ b/
src/ui/zoombutton.cpp
@@
-34,16
+34,11
@@
ZoomButton::ZoomButton(QWidget *parent, QString normalIconPictureFileName,
void ZoomButton::mouseMoveEvent(QMouseEvent *event)
{
qDebug() << __PRETTY_FUNCTION__;
void ZoomButton::mouseMoveEvent(QMouseEvent *event)
{
qDebug() << __PRETTY_FUNCTION__;
- //qWarning() << "ZB release";
- if(this->rect().contains(event->pos())) {
+ if(rect().contains(event->pos())) {
m_eventPosition = mapToParent(event->pos());
m_eventPosition = mapToParent(event->pos());
- emit eventPosition(m_eventPosition);
- }
- else {
- ImageButton::mouseReleaseEvent(event);
- emit releaseEvent();
}
}
+ ImageButton::mouseMoveEvent(event);
}
void ZoomButton::mousePressEvent(QMouseEvent *event)
}
void ZoomButton::mousePressEvent(QMouseEvent *event)
@@
-53,17
+48,11
@@
void ZoomButton::mousePressEvent(QMouseEvent *event)
ImageButton::mousePressEvent(event);
m_eventPosition = mapToParent(event->pos());
ImageButton::mousePressEvent(event);
m_eventPosition = mapToParent(event->pos());
-
- emit pressEvent();
- emit eventPosition(m_eventPosition);
}
}
-void ZoomButton::mouseReleaseEvent(QMouseEvent *event)
+const QPoint& ZoomButton::eventPosition()
{
qDebug() << __PRETTY_FUNCTION__;
{
qDebug() << __PRETTY_FUNCTION__;
- ImageButton::mouseReleaseEvent(event);
-
- emit releaseEvent();
-
+ return m_eventPosition;
}
}