diff options
Diffstat (limited to '.config/awesome/ui/statusbar/init.lua')
| -rw-r--r-- | .config/awesome/ui/statusbar/init.lua | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/.config/awesome/ui/statusbar/init.lua b/.config/awesome/ui/statusbar/init.lua index e923473..7400a76 100644 --- a/.config/awesome/ui/statusbar/init.lua +++ b/.config/awesome/ui/statusbar/init.lua @@ -14,6 +14,7 @@ local brightness = require "ui.statusbar.widgets.brightness" local clock = require "ui.statusbar.widgets.clock" local keyboardlayout = require "ui.statusbar.widgets.keyboardlayout" local taglist = require "ui.statusbar.widgets.taglist" +local volume = require "ui.statusbar.widgets.volume" local wifi = require "ui.statusbar.widgets.wifi" screen.connect_signal("request::desktop_decoration", function(s) @@ -24,8 +25,8 @@ screen.connect_signal("request::desktop_decoration", function(s) { widget = wibox.widget.imagebox, image = gcolor.recolor_image(phosphor.caret_right_fill, qvars.colors.fg), - forced_width = qvars.icon_size, - forced_height = qvars.icon_size + forced_width = qvars.char_height, + forced_height = qvars.char_height }, _expanded = false } @@ -51,14 +52,15 @@ screen.connect_signal("request::desktop_decoration", function(s) widget = wibox.container.place, valign = "bottom", { + brightness, + volume, + battery, + wifi, { widget = wibox.container.place, keyboardlayout }, clock, - wifi, - brightness, - battery, layout = wibox.layout.fixed.vertical, spacing = qvars.padding * 2 }, @@ -69,7 +71,7 @@ screen.connect_signal("request::desktop_decoration", function(s) nil, nil, layout = wibox.layout.align.horizontal, - } + }, } local bar_width = bar.width + qvars.border_width * 2 @@ -78,6 +80,8 @@ screen.connect_signal("request::desktop_decoration", function(s) left = bar_width + beautiful.useless_gap * 4 } + local panel_width + local timed = rubato.timed { duration = qvars.anim_duration, intro = qvars.anim_intro, @@ -85,6 +89,9 @@ screen.connect_signal("request::desktop_decoration", function(s) subscribed = function(pos) if pos ~= bar_width and expand_button._expanded then bar.widget.widget.third = panel + if panel_width == nil then + panel_width = bar.widget.widget.third.width + end bar.ontop = true elseif pos == bar_width and not expand_button._expanded then bar.widget.widget.third = nil @@ -104,12 +111,15 @@ screen.connect_signal("request::desktop_decoration", function(s) if expand_button._expanded then timed.target = bar_width else - timed.target = bar_width + qvars.bar_size * 6 + timed.target = bar_width + qvars.expanded_bar_size + -- timed.target = bar_width + qvars.big_padding + (qvars.big_padding * 2 + qvars.element_size * 4) * 3 + qvars.padding * 2 end + -- q.debug(tostring(panel_width)) expand_button._expanded = not expand_button._expanded end, hidden = true } } + end) |