Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

contrib: make layout.py more pythonic

Browse source
This commit is contained in:
Michal Siedlaczek 2021-08-10 18:43:15 +02:00 committed by Isaac Freund
parent 61d6aecb10
commit 30da9e7221
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
contrib/layout.py
View file

@ -33,25 +33,22 @@ def layout_handle_layout_demand(layout, view_count, usable_w, usable_h, tags, se
y = 0 y = 0
w = usable_w w = usable_w
h = usable_h h = usable_h
i = 0 for i in range(0, view_count - 1):
while i < view_count:
if i == view_count - 1:
layout.push_view_dimensions(x, y, w, h, serial)
else:
if i % 2 == 0: if i % 2 == 0:
w = int(w/2) w //= 2
if i % 4 == 2: if i % 4 == 2:
layout.push_view_dimensions(x + w, y, w, h, serial) layout.push_view_dimensions(x + w, y, w, h, serial)
else: else:
layout.push_view_dimensions(x, y, w, h, serial) layout.push_view_dimensions(x, y, w, h, serial)
x += w x += w
else: else:
h = int(h/2) h //= 2
if i % 4 == 3: if i % 4 == 3:
layout.push_view_dimensions(x, y + h, w, h, serial) layout.push_view_dimensions(x, y + h, w, h, serial)
else: else:
layout.push_view_dimensions(x, y, w, h, serial) layout.push_view_dimensions(x, y, w, h, serial)
y += h y += h
layout.push_view_dimensions(x, y, w, h, serial)
# Committing the layout means telling the server that your code is done # Committing the layout means telling the server that your code is done
# laying out windows. Make sure you have pushed exactly the right amount of # laying out windows. Make sure you have pushed exactly the right amount of
@ -61,7 +58,7 @@ def layout_handle_layout_demand(layout, view_count, usable_w, usable_h, tags, se
# the server can forward to status bars. You can use it to tell the user # the server can forward to status bars. You can use it to tell the user
# which layout is currently in use. You could also add some status # which layout is currently in use. You could also add some status
# information status information about your layout, which is what we do here. # information status information about your layout, which is what we do here.
layout.commit(str(view_count) + " windows layout out by python", serial) layout.commit(f"{view_count} windows layed out by python", serial)
def layout_handle_namespace_in_use(layout): def layout_handle_namespace_in_use(layout):
# Oh no, the namespace we choose is already used by another client! All we # Oh no, the namespace we choose is already used by another client! All we
@ -81,14 +78,14 @@ class Output(object):
self.id = None self.id = None
def destroy(self): def destroy(self):
if self.layout != None: if self.layout is not None:
self.layout.destroy() self.layout.destroy()
if self.output != None: if self.output is not None:
self.output.destroy() self.output.destroy()
def configure(self): def configure(self):
global layout_manager global layout_manager
if self.layout == None and layout_manager != None: if self.layout is None and layout_manager is not None:
# We need to set a namespace, which is used to identify our layout. # We need to set a namespace, which is used to identify our layout.
self.layout = layout_manager.get_layout(self.output, "layout.py") self.layout = layout_manager.get_layout(self.output, "layout.py")
self.layout.user_data = self self.layout.user_data = self
@ -123,7 +120,7 @@ registry.dispatcher["global_remove"] = registry_handle_global_remove
display.dispatch(block=True) display.dispatch(block=True)
display.roundtrip() display.roundtrip()
if layout_manager == None: if layout_manager is None:
print("No layout_manager, aborting") print("No layout_manager, aborting")
quit() quit()