X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6c3d9acbc22ea9463ba40ef84c9e8c8419dfacf3..e9bd295b:/src/kitemviews/private/kitemlistrubberband.cpp diff --git a/src/kitemviews/private/kitemlistrubberband.cpp b/src/kitemviews/private/kitemlistrubberband.cpp index ae023d2aa..646139a33 100644 --- a/src/kitemviews/private/kitemlistrubberband.cpp +++ b/src/kitemviews/private/kitemlistrubberband.cpp @@ -1,21 +1,8 @@ -/*************************************************************************** - * Copyright (C) 2011 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2011 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "kitemlistrubberband.h" @@ -36,7 +23,7 @@ void KItemListRubberBand::setStartPosition(const QPointF& pos) if (m_startPos != pos) { const QPointF previous = m_startPos; m_startPos = pos; - emit startPositionChanged(m_startPos, previous); + Q_EMIT startPositionChanged(m_startPos, previous); } } @@ -50,7 +37,23 @@ void KItemListRubberBand::setEndPosition(const QPointF& pos) if (m_endPos != pos) { const QPointF previous = m_endPos; m_endPos = pos; - emit endPositionChanged(m_endPos, previous); + + if (m_startPos.x() == m_endPos.x()) { + if (previous.x() < m_startPos.x()) { + m_endPos.rx() = m_startPos.x() - 1.0; + } else { + m_endPos.rx() = m_startPos.x() + 1.0; + } + } + if (m_startPos.y() == m_endPos.y()) { + if (previous.y() < m_startPos.y()) { + m_endPos.ry() = m_startPos.y() - 1.0; + } else { + m_endPos.ry() = m_startPos.y() + 1.0; + } + } + + Q_EMIT endPositionChanged(m_endPos, previous); } } @@ -63,7 +66,7 @@ void KItemListRubberBand::setActive(bool active) { if (m_active != active) { m_active = active; - emit activationChanged(active); + Q_EMIT activationChanged(active); } } @@ -72,4 +75,3 @@ bool KItemListRubberBand::isActive() const return m_active; } -#include "kitemlistrubberband.moc"