Browse Source

Revert "qml/ControlLayout: Add the 'contentWidth' property"

This reverts commit 9bea3945b1.
pull/162/head
Fatih Uzunoglu 3 years ago
committed by Jean-Baptiste Kempf
parent
commit
c2803be399
  1. 41
      modules/gui/qt/player/qml/ControlLayout.qml

41
modules/gui/qt/player/qml/ControlLayout.qml

@ -32,8 +32,6 @@ FocusScope {
// Properties
property int contentWidth: 0
readonly property real minimumWidth: {
var count = repeater.count
@ -106,28 +104,6 @@ FocusScope {
altFocusAction()
}
function _updateContentWidth() {
let size = 0
for (let i = 0; i < repeater.count; i++) {
const item = repeater.itemAt(i)
if (item === null || item.isActive === false)
continue
const width = item.width
if (width)
size += width + spacing
}
if (size)
contentWidth = size - spacing
else
contentWidth = size
}
// Children
RowLayout {
@ -145,19 +121,13 @@ FocusScope {
id: repeater
// NOTE: We apply the 'navigation chain' after adding the item.
onItemAdded: {
item.applyNavigation()
controlLayout._updateContentWidth()
}
onItemAdded: item.applyNavigation()
onItemRemoved: {
// NOTE: We update the 'navigation chain' after removing the item.
item.removeNavigation()
item.recoverFocus(index)
controlLayout._updateContentWidth()
}
delegate: Loader {
@ -165,9 +135,6 @@ FocusScope {
// Properties
// NOTE: This is required for contentWidth because the visible property is delayed.
property bool isActive: (x + minimumWidth <= rowLayout.width)
property int minimumWidth: {
if (expandable)
return item.minimumWidth
@ -198,17 +165,13 @@ FocusScope {
delayed: true // this is important
target: loader
property: "visible"
value: isActive
value: (loader.x + minimumWidth <= rowLayout.width)
}
// Events
Component.onCompleted: repeater.countChanged.connect(controlLayout._handleFocus)
onIsActiveChanged: controlLayout._updateContentWidth()
onWidthChanged: controlLayout._updateContentWidth()
onActiveFocusChanged: {
if (activeFocus && (!!item && !item.focus)) {
recoverFocus()

Loading…
Cancel
Save