mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the moving around of the InfoPanel on non KDE enviroments.

Browse source 
This patch restores the ability to move the info-overlay panel on the
profile. For some reason the eventFilter wasn't working (and actually,
looking at the code, it really shouldn't, because I didn't see where I set
it to work, maybe someone (me) broke it a long time ago) well, it seems
fixed now at least. :)

Tested on XFCE, Gnome and KDE, with three different window managers.

[Dirk Hohndel: removed debug output]

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-10-15 23:18:09 -03:00 • committed by Dirk Hohndel
parent c59d594e00
commit 22afca58bf
2 changed files with 2 additions and 21 deletions

20
qt-ui/profilegraphics.cpp
View file

@ -1392,8 +1392,7 @@ ToolTipItem::ToolTipItem(QGraphicsItem* parent): QGraphicsPathItem(parent), back
{ {
title = new QGraphicsSimpleTextItem(tr("Information"), this); title = new QGraphicsSimpleTextItem(tr("Information"), this);
separator = new QGraphicsLineItem(this); separator = new QGraphicsLineItem(this);
dragging = false; setFlags(ItemIgnoresTransformations | ItemIsMovable);
setFlag(ItemIgnoresTransformations);
status = COLLAPSED; status = COLLAPSED;
updateTitlePosition(); updateTitlePosition();
setZValue(99); setZValue(99);
@ -1440,12 +1439,7 @@ bool ToolTipItem::isExpanded() {
void ToolTipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) void ToolTipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
{ {
persistPos(); persistPos();
dragging = false; QGraphicsPathItem::mouseReleaseEvent(event);
}
void ToolTipItem::mousePressEvent(QGraphicsSceneMouseEvent* event)
{
dragging = true;
} }
void ToolTipItem::persistPos() void ToolTipItem::persistPos()
@ -1468,16 +1462,6 @@ void ToolTipItem::readPos()
setPos(value); setPos(value);
} }
bool ToolTipItem::eventFilter(QObject* view, QEvent* event)
{
if (event->type() == QEvent::HoverMove && dragging){
QHoverEvent *e = static_cast<QHoverEvent*>(event);
QGraphicsView *v = scene()->views().at(0);
setPos( v->mapToScene(e->pos()));
}
return false;
}
QColor EventItem::getColor(const color_indice_t i) QColor EventItem::getColor(const color_indice_t i)
{ {
return profile_color[i].at((isGrayscale) ? 1 : 0); return profile_color[i].at((isGrayscale) ? 1 : 0);

3
qt-ui/profilegraphics.h
View file

@ -39,9 +39,7 @@ public:
bool isExpanded(); bool isExpanded();
void persistPos(); void persistPos();
void readPos(); void readPos();
void mousePressEvent(QGraphicsSceneMouseEvent* event);
void mouseReleaseEvent(QGraphicsSceneMouseEvent* event); void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
bool eventFilter(QObject* , QEvent* );
public slots: public slots:
void setRect(const QRectF& rect); void setRect(const QRectF& rect);
@ -53,7 +51,6 @@ private:
QGraphicsSimpleTextItem *title; QGraphicsSimpleTextItem *title;
Status status; Status status;
QRectF rectangle; QRectF rectangle;
bool dragging;
QRectF nextRectangle; QRectF nextRectangle;
}; };