From 35401e7ab4c88528c08bbd5a03a997de4d73297c Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 30 Dec 2025 18:48:34 +0100
Subject: [PATCH] Distinguish between isDraggable and isCaption

---
 .../ui/components/menu/LongPressMenuEditor.kt    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenuEditor.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenuEditor.kt
index 5ff418913..bf428a538 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenuEditor.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/LongPressMenuEditor.kt
@@ -204,7 +204,7 @@ fun LongPressMenuEditor(modifier: Modifier = Modifier) {
         } else {
             var i = rawItem.index
             // make sure it is not possible to move items in between a *Caption and a HeaderBox
-            if (!items[i].isDraggable) i += 1
+            if (items[i].isCaption) i += 1
             if (i < items.size && items[i] == ItemInList.HeaderBox) i += 1
             if (rawItem.index in (prevDragMarkerIndex + 1)..<i) i -= 1
             i
@@ -467,18 +467,22 @@ fun autoScrollSpeedFromTouchPos(
     )
 }
 
-sealed class ItemInList(val isDraggable: Boolean, open val columnSpan: Int? = 1) {
+sealed class ItemInList(
+    val isDraggable: Boolean = false,
+    val isCaption: Boolean = false,
+    open val columnSpan: Int? = 1,
+) {
     // decoration items (i.e. text subheaders)
-    object EnabledCaption : ItemInList(isDraggable = false, columnSpan = null /* i.e. all line */)
-    object HiddenCaption : ItemInList(isDraggable = false, columnSpan = null /* i.e. all line */)
+    object EnabledCaption : ItemInList(isCaption = true, columnSpan = null /* i.e. all line */)
+    object HiddenCaption : ItemInList(isCaption = true, columnSpan = null /* i.e. all line */)
 
     // actual draggable actions (+ a header)
     object HeaderBox : ItemInList(isDraggable = true, columnSpan = 2)
     data class Action(val type: LongPressAction.Type) : ItemInList(isDraggable = true)
 
     // markers
-    object NoneMarker : ItemInList(isDraggable = false)
-    data class DragMarker(override val columnSpan: Int?) : ItemInList(isDraggable = false)
+    object NoneMarker : ItemInList()
+    data class DragMarker(override val columnSpan: Int?) : ItemInList()
 
     fun stableUniqueKey(): Int {
         return when (this) {