Fix Buttons not showing when the Buttongrid is inside a Frame (#3783)

Signed-off-by: Jimmy Tanagra <[email protected]>
openhab · Jul 30, 2024 · 295c2a8 · 295c2a8
1 parent 69ffbcb
commit 295c2a8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/model/WidgetDataSource.kt b/mobile/src/main/java/org/openhab/habdroid/model/WidgetDataSource.kt
@@ -40,8 +40,15 @@ class WidgetDataSource {
             .filter { w -> w.parentId == null }
             .map { w -> w.id }
             .toSet()
-        return allWidgets
-            .filter { w -> w.parentId == null || w.parentId in firstLevelWidgetIds }
+        val secondLevelWidgetIds = allWidgets
+            .filter { w -> w.parentId in firstLevelWidgetIds }
+            .map { w -> w.id }
+            .toSet()
+        return allWidgets.filter { w ->
+            w.parentId == null ||
+                w.parentId in firstLevelWidgetIds ||
+                w.parentId in secondLevelWidgetIds && w.type == Widget.Type.Button
+        }
     }
 
     fun setSourceJson(jsonObject: JSONObject) {