vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect mouse position calculation in Aurorae 

svn path=/trunk/KDE/kdebase/workspace/; revision=1118270
icc-effect-5.14.5
Martin Gräßlin 2010-04-24 07:45:42 +00:00
parent 352ccf4018
commit 6fe0694930
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/aurorae/src/aurorae.cpp
View File

@ -256,7 +256,7 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
borders(borderLeft, borderRight, borderTop, borderBottom); borders(borderLeft, borderRight, borderTop, borderBottom);
int paddingLeft, paddingTop, paddingRight, paddingBottom; int paddingLeft, paddingTop, paddingRight, paddingBottom;
padding(paddingLeft, paddingRight, paddingTop, paddingBottom); padding(paddingLeft, paddingRight, paddingTop, paddingBottom);
if (point.x() >= (width() - borderRight)) { if (point.x() >= (m_view->width() - borderRight - paddingRight)) {
pos |= PositionRight; pos |= PositionRight;
} else if (point.x() <= borderLeft + paddingLeft) { } else if (point.x() <= borderLeft + paddingLeft) {
pos |= PositionLeft; pos |= PositionLeft;
@ -265,7 +265,7 @@ KDecorationDefines::Position AuroraeClient::mousePosition(const QPoint &point) c
const bool maximized = maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows(); const bool maximized = maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows();
int titleEdgeLeft, titleEdgeRight, titleEdgeTop, titleEdgeBottom; int titleEdgeLeft, titleEdgeRight, titleEdgeTop, titleEdgeBottom;
AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, maximized); AuroraeFactory::instance()->theme()->titleEdges(titleEdgeLeft, titleEdgeTop, titleEdgeRight, titleEdgeBottom, maximized);
if (point.y() >= height() - borderBottom) { if (point.y() >= m_view->height() - borderBottom - paddingBottom) {
pos |= PositionBottom; pos |= PositionBottom;
} else if (point.y() <= titleEdgeTop + paddingTop ) { } else if (point.y() <= titleEdgeTop + paddingTop ) {
pos |= PositionTop; pos |= PositionTop;

4
clients/aurorae/src/lib/auroraescene.cpp
View File

@ -637,9 +637,7 @@ void AuroraeScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event)
void AuroraeScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event) void AuroraeScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
{ {
QGraphicsScene::mouseMoveEvent(event); QGraphicsScene::mouseMoveEvent(event);
if (!event->isAccepted()) { emit titleMouseMoved(event->button(), event->buttons());
emit titleMouseMoved(event->button(), event->buttons());
}
} }
void AuroraeScene::wheelEvent(QGraphicsSceneWheelEvent* event) void AuroraeScene::wheelEvent(QGraphicsSceneWheelEvent* event)