Update && Fix
This commit is contained in:
parent
4f850f7173
commit
6f8acf2168
28 changed files with 443 additions and 353 deletions
|
@ -50,19 +50,19 @@ end
|
|||
|
||||
-- Get widgets
|
||||
local profile_widget = require("ui.sidebar.profile")
|
||||
local player_widget = require("ui.sidebar.player")
|
||||
local sliders_widget = require("ui.sidebar.sliders")
|
||||
local weather_widget = require("ui.sidebar.weather")
|
||||
local calendar_widget = require("ui.sidebar.calendar")
|
||||
local services_widget = require("ui.sidebar.services")
|
||||
--local player_widget = require("ui.sidebar.player")
|
||||
--local services_widget = require("ui.sidebar.services")
|
||||
|
||||
-- Combine some widgets
|
||||
local profile = box_widget(profile_widget, 380, 150)
|
||||
local sliders = box_widget(sliders_widget, 380, 120)
|
||||
local weather = box_widget(weather_widget, 380, 180)
|
||||
local player = box_widget(player_widget, 380, 150)
|
||||
local calendar = box_widget(calendar_widget, 380, 330)
|
||||
local services = box_widget(services_widget, 380, 200)
|
||||
local calendar = box_widget(calendar_widget, 380, 320)
|
||||
--local player = box_widget(player_widget, 380, 150)
|
||||
--local services = box_widget(services_widget, 380, 200)
|
||||
|
||||
-- Spacing
|
||||
local space = function(height)
|
||||
|
@ -94,9 +94,9 @@ sidebar : setup {
|
|||
profile,
|
||||
sliders,
|
||||
weather,
|
||||
player,
|
||||
--calendar,
|
||||
services,
|
||||
--player,
|
||||
calendar,
|
||||
--services,
|
||||
|
||||
spacing = dpi(20),
|
||||
layout = wibox.layout.fixed.vertical,
|
||||
|
@ -105,14 +105,58 @@ sidebar : setup {
|
|||
widget = wibox.container.margin,
|
||||
}
|
||||
|
||||
-- Left Side :
|
||||
-- Slide animation
|
||||
--local slide = rubato.timed {
|
||||
-- pos = helpers.screen.geometry.height,
|
||||
-- rate = 60,
|
||||
-- intro = 0.2,
|
||||
-- duration = 0.4,
|
||||
-- subscribed = function(pos)
|
||||
-- sidebar.y = helpers.screen.geometry.y + pos
|
||||
-- end
|
||||
--}
|
||||
--
|
||||
---- Timer of sidebar's death
|
||||
--sidebar.timer = gears.timer {
|
||||
-- timeout = 0.5,
|
||||
-- single_shot = true,
|
||||
-- callback = function()
|
||||
-- sidebar.visible = not sidebar.visible
|
||||
-- end
|
||||
--}
|
||||
--
|
||||
---- Toggle function
|
||||
--sidebar.toggle = function()
|
||||
-- if sidebar.visible then
|
||||
-- slide.target = helpers.screen.geometry.y - sidebar.height
|
||||
-- sidebar.timer:start()
|
||||
-- else
|
||||
-- slide.target = helpers.screen.geometry.y + dpi(10)
|
||||
-- sidebar.visible = not sidebar.visible
|
||||
-- end
|
||||
--
|
||||
--end
|
||||
--awful.placement.top_right(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
|
||||
|
||||
|
||||
--awful.mouse.append_global_mousebindings({
|
||||
-- awful.button({ }, 1, function () sidebar.toggle() end)
|
||||
--})
|
||||
--awful.keyboard.append_global_keybindings({
|
||||
-- awful.key({alt}, "c", function() awesome.emit_signal("sidebar::toggle") end), -- Sidebar
|
||||
--})
|
||||
|
||||
|
||||
-- Right Side :
|
||||
-- Slide animation
|
||||
local slide = rubato.timed {
|
||||
pos = helpers.screen.geometry.height,
|
||||
pos = helpers.screen.geometry.x - sidebar.width,
|
||||
rate = 60,
|
||||
intro = 0.2,
|
||||
duration = 0.4,
|
||||
subscribed = function(pos)
|
||||
sidebar.y = helpers.screen.geometry.y + pos
|
||||
sidebar.x = helpers.screen.geometry.x + pos
|
||||
end
|
||||
}
|
||||
|
||||
|
@ -128,23 +172,15 @@ sidebar.timer = gears.timer {
|
|||
-- Toggle function
|
||||
sidebar.toggle = function()
|
||||
if sidebar.visible then
|
||||
slide.target = helpers.screen.geometry.y - sidebar.height
|
||||
slide.target = helpers.screen.geometry.x - sidebar.width
|
||||
sidebar.timer:start()
|
||||
else
|
||||
slide.target = helpers.screen.geometry.y + dpi(10)
|
||||
slide.target = helpers.screen.geometry.x + dpi(10)
|
||||
sidebar.visible = not sidebar.visible
|
||||
end
|
||||
|
||||
end
|
||||
awful.placement.top_right(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
|
||||
|
||||
--awful.mouse.append_global_mousebindings({
|
||||
-- awful.button({ }, 1, function () sidebar.toggle() end)
|
||||
--})
|
||||
--awful.keyboard.append_global_keybindings({
|
||||
-- awful.key({alt}, "c", function() awesome.emit_signal("sidebar::toggle") end), -- Sidebar
|
||||
--})
|
||||
|
||||
awful.placement.top_left(sidebar, {honor_workarea = true, margins = beautiful.useless_gap * 3})
|
||||
-- Get signal to execute the function (if that makes sense)
|
||||
awesome.connect_signal("sidebar::toggle", function(s)
|
||||
sidebar.toggle(s)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue