Skip to content

Fix BasicTableView compatibility issue with Qt 6.10.3 #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RiccardoCampo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix BasicTableView compatibility issue with Qt 6.10.3 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions framework/uicomponents/qml/Muse/UiComponents/LegacyTreeView/BasicTableView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ FocusScope {
function resizeColumnsToContents () {
for (var i = 0; i < __columns.length; ++i) {
var col = getColumn(i)
var header = __listView.headerItem.headerRepeater.itemAt(i)
var header = listView.headerItem.headerRepeater.itemAt(i)
if (col) {
col.resizeToContents()
if (col.width < header.implicitWidth)
Expand Down Expand Up @@ -395,17 +395,6 @@ FocusScope {
/*! \internal */
default property alias __columns: root.data

/*! \internal */
property alias __currentRowItem: listView.currentItem

/*! \internal
This property is forwarded to TableView::currentRow, but not to any TreeView property.
*/
property alias __currentRow: listView.currentIndex

/*! \internal */
readonly property alias __listView: listView

/*! \internal */
property Component __itemDelegateLoader: null

Expand Down Expand Up @@ -528,7 +517,7 @@ FocusScope {
height: rowfiller.rowHeight
sourceComponent: root.rowDelegate
property QtObject styleData: QtObject {
readonly property bool alternate: (index + __listView.count) % 2 === 1
readonly property bool alternate: (index + listView.count) % 2 === 1
readonly property bool selected: false
readonly property bool hasActiveFocus: false
readonly property bool pressed: false
Expand Down
3 changes: 1 addition & 2 deletions framework/uicomponents/qml/Muse/UiComponents/LegacyTreeView/LegacyTreeView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ BasicTableView {
property var pressedIndex: undefined
property bool selectOnRelease: false
property int pressedColumn: -1
readonly property alias currentRow: root.__currentRow
readonly property alias currentIndex: root.currentIndex

// Handle vertical scrolling whem dragging mouse outside boundaries
Expand Down Expand Up @@ -223,7 +222,7 @@ BasicTableView {
}
}

return row === currentRow
return row === root.listView.currentIndex
&& (selectionMode === L.SelectionMode.SingleSelection
|| (selectionMode > L.SelectionMode.SingleSelection && !selection))
}
Expand Down