mirror/vincentbernat.i3wm-configuration
1
0
Fork 0
mirror of https://github.com/vincentbernat/i3wm-configuration.git synced 2025-07-18 01:44:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3-companion: fix logic for container layout

Browse source 
Only empty workspaces are special. They follow `workspace_layout`
value, except if `default`, in this case `layout`.
This commit is contained in:
Vincent Bernat 2021-07-09 20:35:17 +02:00
parent 8490fed7bc
commit a2588342ff
1 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
bin/i3-companion
View file

@ -275,30 +275,27 @@ async def workspace_info(i3, event):
if w.num == workspace.num]
def format(container):
if container.type == "workspace":
if container.nodes:
root = ""
else:
if container.ipc_data['workspace_layout'] != "default":
layout = container.ipc_data['workspace_layout']
else:
layout = container.layout
root = f"Empty workspace, with {layout} layout"
if container.focused:
style = 'foreground="#ffaf00"'
elif not container.window:
style = 'foreground="#6c98ee"'
else:
if container.focused:
style = 'foreground="#ffaf00"'
elif not container.window:
style = 'foreground="#6c98ee"'
else:
style = ''
if container.window:
content = (f"{(container.window_class or '???').lower()}: "
f"{(container.window_title or '???')}")
else:
content = f"({container.layout})"
root = (f"<span {style}>"
f"{content.lower()}"
"</span>")
style = ''
if container.window:
content = (f"{(container.window_class or '???').lower()}: "
f"{(container.window_title or '???')}")
elif container.type == 'workspace' and not container.nodes:
# Empty workspaces use workspace_layout, but when default,
# this is layout...
layout = container.ipc_data['workspace_layout']
if layout == "default":
layout = container.layout
content = f"({layout})"
else:
content = f"({container.layout})"
root = (f"<span {style}>"
f"{content.lower()}"
"</span>")
children = []
for child in container.nodes:
if child == container.nodes[-1]: