added keys to calculatorm, press methid to Button, primary button style

This commit is contained in:
Will McGugan
2022-08-31 09:30:41 +01:00
parent 78fb85b725
commit 10ede76b9b
3 changed files with 68 additions and 14 deletions

View File

@@ -1,6 +1,7 @@
from decimal import Decimal
from textual.app import App, ComposeResult
from textual import events
from textual.layout import Container
from textual.reactive import Reactive
from textual.widgets import Button, Static
@@ -16,6 +17,17 @@ class CalculatorApp(App):
value = Reactive.var("")
operator = Reactive.var("plus")
KEY_MAP = {
"+": "plus",
"-": "minus",
".": "point",
"*": "multiply",
"/": "divide",
"_": "plus-minus",
"%": "percent",
"=": "equals",
}
def watch_numbers(self, value: str) -> None:
"""Called when numbers is updated."""
# Update the Numbers widget
@@ -34,10 +46,10 @@ class CalculatorApp(App):
"""Add our buttons."""
yield Container(
Static(id="numbers"),
Button("AC", id="ac"),
Button("C", id="c"),
Button("+/-", id="plus-minus"),
Button("%", id="percent"),
Button("AC", id="ac", variant="primary"),
Button("C", id="c", variant="primary"),
Button("+/-", id="plus-minus", variant="primary"),
Button("%", id="percent", variant="primary"),
Button("÷", id="divide", variant="warning"),
Button("7", id="number-7"),
Button("8", id="number-8"),
@@ -57,6 +69,22 @@ class CalculatorApp(App):
id="calculator",
)
def on_key(self, event: events.Key) -> None:
"""Called when the user presses a key."""
def press(button_id: str) -> None:
self.query_one(f"#{button_id}", Button).press()
self.set_focus(None)
key = event.key
if key.isdecimal():
press(f"number-{key}")
elif key == "c":
press("c")
press("ac")
elif key in self.KEY_MAP:
press(self.KEY_MAP[key])
def on_button_pressed(self, event: Button.Pressed) -> None:
"""Called when a button is pressed."""