modules/gui/qt/widgets/qml/KeyNavigableTableView.qml

@@ -66,7 +66,6 @@ FocusScope {
 
     property Util.SelectableDelegateModel selectionDelegateModel
     property real rowHeight: VLCStyle.tableRow_height
-    property int horizontalSpacing: VLCStyle.column_spacing
 
     property real availableRowWidth: 0
     property real _availabeRowWidthLastUpdateTime: Date.now()
@@ -309,7 +308,7 @@ FocusScope {
                     topPadding: root.headerTopPadding
                     bottomPadding: VLCStyle.margin_xsmall
 
-                    spacing: root.horizontalSpacing
+                    spacing: VLCStyle.column_spacing
 
                     Repeater {
                         model: sortModel
@@ -372,8 +371,6 @@ FocusScope {
             width: view.width
             height: root.rowHeight
 
-            horizontalSpacing: root.horizontalSpacing
-
             leftPadding: root.contentLeftMargin
             rightPadding: root.contentRightMargin
 

modules/gui/qt/widgets/qml/TableViewDelegate.qml

@@ -39,8 +39,6 @@ T.Control {
 
     readonly property bool dragActive: hoverArea.drag.active
 
-    property int horizontalSpacing: 0
-
     property var dragItem
 
     property bool acceptDrop: false
@@ -165,7 +163,7 @@ T.Control {
     contentItem: Row {
         id: content
 
-        spacing: delegate.horizontalSpacing
+        spacing: VLCStyle.column_spacing
 
         Repeater {
             model: delegate.sortModel
@@ -200,6 +198,12 @@ T.Control {
             Widgets.IconToolButton {
                 id: contextButton
 
+                anchors.left: parent.left
+
+                // NOTE: We want the contextButton to be contained inside the trailing
+                //       column_spacing.
+                anchors.leftMargin: -width
+
                 anchors.verticalCenter: parent.verticalCenter
 
                 iconText: VLCIcons.ellipsis