philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Fix flaky handling of tabs

Browse Source 
The flickable of TabBar from QtQuickControls has a bogus contentX
when removing and readding tabs. Instead implement tabAt() via
iteration and checking which tab contains the point
This commit is contained in:
Sergio Martins
2022-06-07 23:34:54 +01:00
parent 060fe44e71
commit 81007f629f
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/qtquick/views/TabBar_qtquick.cpp
View File

@@ -32,22 +32,31 @@ TabBar_qtquick::TabBar_qtquick(Controllers::TabBar *controller, QQuickItem *pare
{
}
int TabBar_qtquick::tabAt(QPoint p) const
int TabBar_qtquick::tabAt(QPoint localPt) const
{
// QtQuick's TabBar doesn't provide any API for this.
// So ask its *internal* ListView instead.
// Also note that the ListView's flickable has bogus contentX, so instead just iterate through the tabs
if (!m_tabBarQmlItem) {
qWarning() << Q_FUNC_INFO << "No visual tab bar item yet";
return -1;
}
if (QQuickItem *internalListView = listView()) {
int index = -1;
QMetaObject::invokeMethod(internalListView, "indexAt", Q_RETURN_ARG(int, index),
Q_ARG(double, p.x()), Q_ARG(double, p.y()));
const QPointF globalPos = m_tabBarQmlItem->mapToGlobal(localPt);
return index;
if (QQuickItem *internalListView = listView()) {
const auto childItems = internalListView->childItems();
if (!childItems.isEmpty()) {
for (QQuickItem *item : childItems.first()->childItems()) {
bool ok = false;
const int index = item->property("tabIndex").toInt(&ok);
if (ok && item->contains(item->mapFromGlobal(globalPos))) {
return index;
}
}
}
return -1;
} else {
qWarning() << Q_FUNC_INFO << "Couldn't find the internal ListView";
}