alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support drag in vertical tabbars

Browse Source 
BUG:239020

svn path=/trunk/KDE/kdelibs/; revision=1131253
This commit is contained in:
Marco Martin 2010-05-27 20:30:05 +00:00
parent b8893a8044
commit f99d57fdc1
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
private/nativetabbar.cpp
View File

@ -64,8 +64,7 @@ public:
backgroundSvg(0), backgroundSvg(0),
buttonSvg(0), buttonSvg(0),
closeIcon("window-close"), closeIcon("window-close"),
animationId(-1), animationId(-1)
mousePressOffset(0)
{ {
} }
@ -91,7 +90,7 @@ public:
QRect currentAnimRect; QRect currentAnimRect;
QRect startAnimRect; QRect startAnimRect;
int mousePressOffset; QPoint mousePressOffset;
int lastIndex[2]; int lastIndex[2];
qreal animProgress; qreal animProgress;
}; };
@ -509,7 +508,7 @@ void NativeTabBar::mousePressEvent(QMouseEvent *event)
QRect rect = tabRect(currentIndex()); QRect rect = tabRect(currentIndex());
if (rect.contains(event->pos())) { if (rect.contains(event->pos())) {
d->mousePressOffset = event->pos().x(); d->mousePressOffset = event->pos();
event->accept(); event->accept();
return; return;
} }
@ -520,12 +519,18 @@ void NativeTabBar::mousePressEvent(QMouseEvent *event)
void NativeTabBar::mouseMoveEvent(QMouseEvent *event) void NativeTabBar::mouseMoveEvent(QMouseEvent *event)
{ {
if (d->mousePressOffset) { if (d->mousePressOffset != QPoint()) {
d->currentAnimRect = tabRect(currentIndex()); d->currentAnimRect = tabRect(currentIndex());
int pos = qBound(0, d->currentAnimRect.left() + (event->pos().x() - d->mousePressOffset), if (isVertical()) {
width() - d->currentAnimRect.width()); int pos = qBound(0, d->currentAnimRect.top() + (event->pos().y() - d->mousePressOffset.y()),
d->currentAnimRect.moveLeft(pos); height() - d->currentAnimRect.height());
d->currentAnimRect.moveTop(pos);
} else {
int pos = qBound(0, d->currentAnimRect.left() + (event->pos().x() - d->mousePressOffset.x()),
width() - d->currentAnimRect.width());
d->currentAnimRect.moveLeft(pos);
}
update(); update();
} else { } else {
KTabBar::mouseMoveEvent(event); KTabBar::mouseMoveEvent(event);
@ -534,10 +539,18 @@ void NativeTabBar::mouseMoveEvent(QMouseEvent *event)
void NativeTabBar::mouseReleaseEvent(QMouseEvent *event) void NativeTabBar::mouseReleaseEvent(QMouseEvent *event)
{ {
if (d->mousePressOffset) { if (d->mousePressOffset != QPoint()) {
bool left = event->pos().x() - d->mousePressOffset < 0; int index = -1;
int index = tabAt(QPoint(left ? d->currentAnimRect.left() : d->currentAnimRect.right(), 1));
d->mousePressOffset = 0; if (isVertical()) {
bool top = event->pos().y() - d->mousePressOffset.y() < 0;
index = tabAt(QPoint(1, top ? d->currentAnimRect.top() : d->currentAnimRect.bottom()));
} else {
bool left = event->pos().x() - d->mousePressOffset.x() < 0;
index = tabAt(QPoint(left ? d->currentAnimRect.left() : d->currentAnimRect.right(), 1));
}
d->mousePressOffset = QPoint();
if (index != currentIndex() && isTabEnabled(index)) { if (index != currentIndex() && isTabEnabled(index)) {
d->startAnimRect = d->currentAnimRect; d->startAnimRect = d->currentAnimRect;