refactor: Port radical.item.layout.horizontal to the declarative syntax

item/layout/horizontal.lua

@@ -209,29 +209,9 @@ end
 
 -- Create the actual widget
 local function create_item(item,data,args)
-  -- Background
-  local bg = wibox.widget.background()
-
-  -- Margins
-  local m = wibox.layout.margin(la)
---   print("LA",data.default_item_margins.TOP)
-  local mrgns = margins2(m,util.table.join((item.item_style or data.item_style).margins,data.default_item_margins))
-  item.get_margins = function()
-    return mrgns
-  end
-
-  -- Layout (left)
-  local layout = wibox.layout.fixed.horizontal()
-  bg:set_widget(m)
-
-  -- Layout (right)
-  local right = wibox.layout.fixed.horizontal()
 
   -- F keys
   module:setup_fkey(item,data)
-  if data.fkeys_prefix == true then
-    layout:add(fkey(data,item))
-  end
 
   -- Icon
   local icon = module:setup_icon(item,data)
@@ -239,7 +219,7 @@ local function create_item(item,data,args)
     local w,h = wibox.widget.imagebox.fit(...)
     return w+3,h
   end
-  layout:add(icon)
+
   if data.icon_per_state == true then
     item:connect_signal("state::changed",function(i,d,st)
       if item._original_icon and data.icon_transformation then
@@ -248,11 +228,6 @@ local function create_item(item,data,args)
     end)
   end
 
-  -- Prefix
-  if args.prefix_widget then
-    layout:add(args.prefix_widget)
-  end
-
   -- Text
   local tb = wibox.widget.textbox()
   tb.fit = data._internal.text_fit or textbox_fit
@@ -272,78 +247,105 @@ local function create_item(item,data,args)
     item._private_data.text = value
   end
 
-  -- Checkbox
-  local ck = module:setup_checked(item,data)
-  if ck then
-    right:add(ck)
-  end
-
   -- Hover
   module:setup_hover(item,data)
 
-  -- Sub_arrow
-  local ar = module:setup_sub_menu_arrow(item,data)
-  if ar then
-    right:add(ar)
-  end
-
-  -- Suffix
-  if args.suffix_widget then
-    right:add(args.suffix_widget)
-  end
-
-  -- Layout (align)
-  local align = wibox.layout.align.horizontal()
-  align:set_middle( tb     )
-  align:set_left  ( layout )
-  align:set_right ( right  )
-  m:set_widget    ( align  )
-  align._item = item
-  align._data = data
-  align.fit   = data._internal.align_fit or align_fit
-  item._internal.align = align
-
-  -- Set widget
-  item.widget = bg
-  bg._item    = item
-  bg._data    = data
-
-  -- Tooltip
-  item.widget:set_tooltip(item.tooltip)
-
   -- Overlay
   item.set_overlay = function(_,value)
     item._private_data.overlay = value
     item.widget:emit_signal("widget::updated")
   end
 
+    -- Define the item layout
+    item.widget = wibox.widget.base.make_widget_declarative {
+        -- Widgets
+        {
+            -- Widget
+            {
+                -- This is where the content is placed
+
+                -- Widgets
+                {
+                    -- The prefixes
+
+                    -- Widget
+                    data.fkeys_prefix and fkey(data,item) or nil,
+                    icon                                        ,
+                    args.prefix_widget                          ,
+
+                    -- Attributes
+                    layout = wibox.layout.fixed.horizontal
+                },
+                tb,
+                {
+                    -- Suffixes
+
+                    -- Widget
+                    module:setup_checked(item,data)       ,
+                    module:setup_sub_menu_arrow(item,data),
+                    args.suffix_widget                    ,
+
+                    -- Attributes
+                    layout = wibox.layout.fixed.horizontal
+                },
+
+                -- Attributes
+                _item  = item                         ,
+                _data  = data                         ,
+                id     = "main_align"                 ,
+                layout = wibox.layout.align.horizontal,
+            },
+
+            -- Attributes
+            id     = "main_margin"      ,
+            layout = wibox.layout.margin,
+        },
+
+        -- Attributes
+        fg      = item._private_data.fg  ,
+        tooltip = item.tooltip           ,
+        _item   = item                   ,
+        _data   = data                   ,
+        widget  = wibox.widget.background,
+    }
+
+    -- Make some widgets easier to access
+    item._internal.margin_w = item.widget:get_children_by_id("main_margin")[1]
+    item._internal.align    = item.widget:get_children_by_id("main_align" )[1]
+
+    -- Override some methods
+    item.widget._after_draw_children = item.widget.after_draw_children
+    item.widget.after_draw_children  = module.after_draw_children
+    item._internal.align.fit         = data._internal.align_fit or align_fit
     item._internal.text_w            = tb
     item._internal.icon_w            = icon
-  item._internal.margin_w = m
+
+    -- Export the margin
+    local mrgns = margins2(
+        item._internal.margin_w,
+        util.table.join(
+            (item.item_style or data.item_style).margins,data.default_item_margins
+        )
+    )
+
+    function item:get_margins()
+        return mrgns
+    end
 
     -- Draw
     local item_style = item.style or data.item_style
     item_style(item,{})
-  item.widget:set_fg(item._private_data.fg)
+
+    -- Setup dynamic underlay
+    item:connect_signal("underlay::changed",function(_,udl)
+        item.widget:emit_signal("widget::updated")
+    end)
 
     -- Setup events
     module.setup_event(data,item)
 
-  -- Setup dynamic underlay
+    return item.widget
-    -- Setup dynamic underlay
-  item:connect_signal("underlay::changed",function(_,udl)
-    bg:emit_signal("widget::updated")
-  end)
-
---   if item.buttons then
---     bg:buttons(item.buttons)
---   end
-
-  bg._after_draw_children = bg.after_draw_children
-  bg.after_draw_children  = module.after_draw_children
-
-  return bg
 end
 
 return setmetatable(module, { __call = function(_, ...) return create_item(...) end })
--- kate: space-indent on; indent-width 2; replace-tabs on;
+-- kate: space-indent on; indent-width 4; replace-tabs on;

layout/vertical.lua

@@ -193,8 +193,6 @@ end
 local function new(data)
     base = base or require( "radical.base" )
 
-    local real_l = wibox.layout.fixed.vertical()
-
     local function real_fit(self,context,o_w,o_h,force_values)
         if not data.visible then return 1,1 end
         local w,h = compute_geo(data,o_w,o_h,force_values)
@@ -211,7 +209,8 @@ local function new(data)
         data._internal.scroll_w = scroll(data)
     end
 
-    real_l : setup {
+    -- Define the item layout
+    local real_l = wibox.widget.base.make_widget_declarative {
         -- Widgets
         {
             -- The prefix section, used for the scroll widgets and custom prefixes
@@ -247,7 +246,6 @@ local function new(data)
         },
 
         -- Attributes
-        id              = "real_l"                   ,
         layout          = wibox.layout.fixed.vertical,
 
         -- Methods
@@ -263,8 +261,8 @@ local function new(data)
     data._internal.filter_tb      = real_l:get_children_by_id( "filter_widget"  )[1]
 
     -- Set the overloaded methods
-    real_l.real_l.fit = real_fit
+    real_l.fit = real_fit
-    real_l.real_l.add = real_add
+    real_l.add = real_add
 
     local l = data._internal.content_layout
 
@@ -304,7 +302,7 @@ local function new(data)
         return width,height
     end
 
-    return real_l.real_l
+    return real_l
 end
 
 return setmetatable(module, { __call = function(_, ...) return new(...) end })