From 7955d3dffb6f1e727ccd50627a1cb06d016b0602 Mon Sep 17 00:00:00 2001
From: neil <neil@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Fri, 17 Apr 2015 00:46:13 +0000
Subject: [PATCH] Removed the unnecessary inner group: the list and scrollbar
 are now added to the Listview directly (Listview is a subclass of Group).

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50408 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/libs/muimaster/classes/listview.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/workbench/libs/muimaster/classes/listview.c b/workbench/libs/muimaster/classes/listview.c
index c1a141d7f2..b77c4662e8 100644
--- a/workbench/libs/muimaster/classes/listview.c
+++ b/workbench/libs/muimaster/classes/listview.c
@@ -26,7 +26,7 @@ extern struct Library *MUIMasterBase;
 
 struct MUI_ListviewData
 {
-    Object *list, *group, *vert;
+    Object *list, *vert;
     struct Hook hook;
     struct Hook selfnotify_hook;
     BOOL noforward;
@@ -112,7 +112,7 @@ IPTR Listview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg)
 {
     struct MUI_ListviewData *data;
     struct TagItem *tag, *tags;
-    Object *group, *vert;
+    Object *vert;
     Object *list =
         (Object *) GetTagData(MUIA_Listview_List, (IPTR) NULL,
         msg->ops_AttrList);
@@ -124,14 +124,10 @@ IPTR Listview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg)
     vert = ScrollbarObject, MUIA_Group_Horiz, FALSE, End;
 
     obj = (Object *) DoSuperNewTags(cl, obj, NULL,
-        MUIA_Group_Horiz, FALSE,
+        MUIA_Group_Horiz, TRUE,
         MUIA_InnerLeft, 0,
         MUIA_InnerRight, 0,
-        Child, (IPTR) (group = HGroup,
-            MUIA_InnerLeft, 0,
-            MUIA_InnerRight, 0,
-            MUIA_Group_Spacing, 0,
-            End),
+        MUIA_Group_Spacing, 0,
         TAG_MORE, msg->ops_AttrList);
 
     if (!obj)
@@ -140,7 +136,6 @@ IPTR Listview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg)
     data = INST_DATA(cl, obj);
     data->list = list;
     data->vert = vert;
-    data->group = group;
 
     data->hook.h_Entry = HookEntry;
     data->hook.h_SubEntry = (HOOKFUNC) Listview_Function;
@@ -183,15 +178,15 @@ IPTR Listview__OM_NEW(struct IClass *cl, Object *obj, struct opSet *msg)
     switch (data->scroller_pos)
     {
     case MUIV_Listview_ScrollerPos_None:
-        DoMethod(group, OM_ADDMEMBER, list);
+        DoMethod(obj, OM_ADDMEMBER, list);
         break;
     case MUIV_Listview_ScrollerPos_Left:
-        DoMethod(group, OM_ADDMEMBER, vert);
-        DoMethod(group, OM_ADDMEMBER, list);
+        DoMethod(obj, OM_ADDMEMBER, vert);
+        DoMethod(obj, OM_ADDMEMBER, list);
         break;
     default:
-        DoMethod(group, OM_ADDMEMBER, list);
-        DoMethod(group, OM_ADDMEMBER, vert);
+        DoMethod(obj, OM_ADDMEMBER, list);
+        DoMethod(obj, OM_ADDMEMBER, vert);
         break;
     }
 
-- 
2.11.4.GIT