ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style

Browse source 
- Use match statement where possible.
This commit is contained in:
Andrew Hamilton 2022-05-31 16:41:09 +10:00
parent 0ab831e48b
commit f0159eb6ff
2 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
eris/eris/__main__.py
View file

@ -616,12 +616,13 @@ class Help:
def on_mouse_input(self, term_code): def on_mouse_input(self, term_code):
event = terminal.decode_mouse_input(term_code) event = terminal.decode_mouse_input(term_code)
if event[1] == terminal.MOUSE_WHEEL_UP: match event[1]:
self.view.portal.scroll_up() case terminal.MOUSE_WHEEL_UP:
fill3.APPEARANCE_CHANGED_EVENT.set() self.view.portal.scroll_up()
elif event[1] == terminal.MOUSE_WHEEL_DOWN: fill3.APPEARANCE_CHANGED_EVENT.set()
self.view.portal.scroll_down() case terminal.MOUSE_WHEEL_DOWN:
fill3.APPEARANCE_CHANGED_EVENT.set() self.view.portal.scroll_down()
fill3.APPEARANCE_CHANGED_EVENT.set()
def on_keyboard_input(self, term_code): def on_keyboard_input(self, term_code):
action = self.key_map.get(term_code) or self.key_map.get(term_code.lower()) action = self.key_map.get(term_code) or self.key_map.get(term_code.lower())

34
fill3/fill3/__init__.py
View file

@ -236,27 +236,29 @@ class Portal:
widget_width, widget_height = appearance_dimensions widget_width, widget_height = appearance_dimensions
x, y = self.position x, y = self.position
if widget_width <= portal_width: if widget_width <= portal_width:
if self.x_alignment == Alignment.left: match self.x_alignment:
x = 0 case Alignment.left:
elif self.x_alignment == Alignment.center: x = 0
x = (widget_width - portal_width) // 2 case Alignment.center:
elif self.x_alignment == Alignment.right: x = (widget_width - portal_width) // 2
x = widget_width - portal_width case Alignment.right:
else: x = widget_width - portal_width
raise NotImplementedError case _:
raise NotImplementedError
elif x < 0: elif x < 0:
x = 0 x = 0
elif x > (widget_width - portal_width): elif x > (widget_width - portal_width):
x = widget_width - portal_width x = widget_width - portal_width
if widget_height <= portal_height: if widget_height <= portal_height:
if self.y_alignment == Alignment.top: match self.y_alignment:
y = 0 case Alignment.top:
elif self.y_alignment == Alignment.center: y = 0
y = (widget_height - portal_height) // 2 case Alignment.center:
elif self.y_alignment == Alignment.bottom: y = (widget_height - portal_height) // 2
y = widget_height - portal_height case Alignment.bottom:
else: y = widget_height - portal_height
raise NotImplementedError case _:
raise NotImplementedError
elif y < 0: elif y < 0:
y = 0 y = 0
elif y > (widget_height - portal_height): elif y > (widget_height - portal_height):