Changeset View
Changeset View
Standalone View
Standalone View
tabbox/tabboxhandler.cpp
| Show First 20 Lines • Show All 86 Lines • ▼ Show 20 Line(s) | 58 | public: | |||
|---|---|---|---|---|---|
| 87 | ClientModel* m_clientModel; | 87 | ClientModel* m_clientModel; | ||
| 88 | DesktopModel* m_desktopModel; | 88 | DesktopModel* m_desktopModel; | ||
| 89 | QModelIndex index; | 89 | QModelIndex index; | ||
| 90 | /** | 90 | /** | ||
| 91 | * Indicates if the tabbox is shown. | 91 | * Indicates if the tabbox is shown. | ||
| 92 | */ | 92 | */ | ||
| 93 | bool isShown; | 93 | bool isShown; | ||
| 94 | TabBoxClient *lastRaisedClient, *lastRaisedClientSucc; | 94 | TabBoxClient *lastRaisedClient, *lastRaisedClientSucc; | ||
| 95 | int wheelAngleDelta = 0; | ||||
| 95 | 96 | | |||
| 96 | private: | 97 | private: | ||
| 97 | QObject *createSwitcherItem(bool desktopMode); | 98 | QObject *createSwitcherItem(bool desktopMode); | ||
| 98 | }; | 99 | }; | ||
| 99 | 100 | | |||
| 100 | TabBoxHandlerPrivate::TabBoxHandlerPrivate(TabBoxHandler *q) | 101 | TabBoxHandlerPrivate::TabBoxHandlerPrivate(TabBoxHandler *q) | ||
| 101 | : m_qmlContext() | 102 | : m_qmlContext() | ||
| 102 | , m_qmlComponent() | 103 | , m_qmlComponent() | ||
| ▲ Show 20 Lines • Show All 228 Lines • ▼ Show 20 Line(s) | 326 | if (!item->model()) { | |||
| 331 | } | 332 | } | ||
| 332 | item->setModel(model); | 333 | item->setModel(model); | ||
| 333 | } | 334 | } | ||
| 334 | item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients); | 335 | item->setAllDesktops(config.clientDesktopMode() == TabBoxConfig::AllDesktopsClients); | ||
| 335 | item->setCurrentIndex(index.row()); | 336 | item->setCurrentIndex(index.row()); | ||
| 336 | // everything is prepared, so let's make the whole thing visible | 337 | // everything is prepared, so let's make the whole thing visible | ||
| 337 | item->setVisible(true); | 338 | item->setVisible(true); | ||
| 338 | } | 339 | } | ||
| 340 | if (QWindow *w = window()) { | ||||
| 341 | wheelAngleDelta = 0; | ||||
| 342 | w->installEventFilter(q); | ||||
| 343 | } | ||||
| 339 | #endif | 344 | #endif | ||
| 340 | } | 345 | } | ||
| 341 | 346 | | |||
| 342 | /*********************************************** | 347 | /*********************************************** | ||
| 343 | * TabBoxHandler | 348 | * TabBoxHandler | ||
| 344 | ***********************************************/ | 349 | ***********************************************/ | ||
| 345 | 350 | | |||
| 346 | TabBoxHandler::TabBoxHandler(QObject *parent) | 351 | TabBoxHandler::TabBoxHandler(QObject *parent) | ||
| ▲ Show 20 Lines • Show All 255 Lines • ▼ Show 20 Line(s) | 606 | case TabBoxConfig::DesktopTabBox: | |||
| 602 | model = d->desktopModel(); | 607 | model = d->desktopModel(); | ||
| 603 | break; | 608 | break; | ||
| 604 | default: | 609 | default: | ||
| 605 | return QModelIndex(); | 610 | return QModelIndex(); | ||
| 606 | } | 611 | } | ||
| 607 | return model->index(0, 0); | 612 | return model->index(0, 0); | ||
| 608 | } | 613 | } | ||
| 609 | 614 | | |||
| 615 | bool TabBoxHandler::eventFilter(QObject *watched, QEvent *e) | ||||
| 616 | { | ||||
| 617 | if (watched == d->window()) { | ||||
| 618 | if (e->type() == QEvent::Wheel) { | ||||
luebking: test type first - you'll get many paint events etc. but the filter is installed to only one… | |||||
| 619 | QWheelEvent *event = static_cast<QWheelEvent*>(e); | ||||
| 620 | // On x11 the delta for vertical scrolling might also be on X for whatever reason | ||||
| 621 | const int delta = event->angleDelta().y() != 0 ? event->angleDelta().y() : event->angleDelta().x(); | ||||
luebking: x + y? | |||||
dangerous. If there is a scrolling in both horizontal and vertical (could happen on touchpad) it could result in no scrolling if one is negative and the other is positive. graesslin: dangerous. If there is a scrolling in both horizontal and vertical (could happen on touchpad)… | |||||
One might call that unsoecific user behavior :-P -> pick the only with the bigger absolute? luebking: One might call that unsoecific user behavior :-P
But on that touchpad the present… | |||||
| 622 | d->wheelAngleDelta += delta; | ||||
| 623 | while (d->wheelAngleDelta <= -120) { | ||||
| 624 | d->wheelAngleDelta += 120; | ||||
| 625 | const QModelIndex index = nextPrev(true); | ||||
| 626 | if (index.isValid()) { | ||||
draw the indev var out, find the last one and if it's in the end valid, set it only once? luebking: draw the indev var out, find the last one and if it's in the end valid, set it only once? | |||||
just checked - doesn't work as nextPrev doesn't update the reference, but just returns the index for the next one. Without setting the index, the next call would return the same index. graesslin: just checked - doesn't work as nextPrev doesn't update the reference, but just returns the… | |||||
| 627 | setCurrentIndex(index); | ||||
| 628 | } | ||||
| 629 | } | ||||
| 630 | while (d->wheelAngleDelta >= 120) { | ||||
| 631 | d->wheelAngleDelta -= 120; | ||||
| 632 | const QModelIndex index = nextPrev(false); | ||||
| 633 | if (index.isValid()) { | ||||
| 634 | setCurrentIndex(index); | ||||
| 635 | } | ||||
| 636 | } | ||||
| 637 | return true; | ||||
| 638 | } | ||||
| 639 | } | ||||
| 640 | // pass on | ||||
| 641 | return QObject::eventFilter(watched, e); | ||||
| 642 | } | ||||
| 643 | | ||||
| 610 | TabBoxHandler* tabBox = nullptr; | 644 | TabBoxHandler* tabBox = nullptr; | ||
| 611 | 645 | | |||
| 612 | TabBoxClient::TabBoxClient() | 646 | TabBoxClient::TabBoxClient() | ||
| 613 | { | 647 | { | ||
| 614 | } | 648 | } | ||
| 615 | 649 | | |||
| 616 | TabBoxClient::~TabBoxClient() | 650 | TabBoxClient::~TabBoxClient() | ||
| 617 | { | 651 | { | ||
| 618 | } | 652 | } | ||
| 619 | 653 | | |||
| 620 | } // namespace TabBox | 654 | } // namespace TabBox | ||
| 621 | } // namespace KWin | 655 | } // namespace KWin | ||
test type first - you'll get many paint events etc. but the filter is installed to only one object, ie. first check will currently always hit and second very few times only