alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

calculator fixes

Browse Source
This commit is contained in:
Will McGugan
2022-08-30 17:43:28 +01:00
parent 9f0fc196b2
commit 282a3df4c7
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/calculator.css
View File

@@ -23,13 +23,13 @@ Button {
content-align: right middle; content-align: right middle;
padding: 0 1; padding: 0 1;
height: 100%; height: 100%;
background: $panel-darken-2; background: $panel-darken-1;
} }
.special { #ac,#c,#plus_minus,#percent {
tint: $text-panel 20%; tint: $primary 20%;
} }
.zero { #number-0 {
column-span: 2; column-span: 2;
} }

37
examples/calculator.py
View File

@@ -1,6 +1,6 @@
from decimal import Decimal from decimal import Decimal
from textual.app import App from textual.app import App, ComposeResult
from textual.layout import Container from textual.layout import Container
from textual.reactive import Reactive from textual.reactive import Reactive
from textual.widgets import Button, Static from textual.widgets import Button, Static
@@ -9,8 +9,8 @@ from textual.widgets import Button, Static
class CalculatorApp(App): class CalculatorApp(App):
"""A working 'desktop' calculator.""" """A working 'desktop' calculator."""
numbers = Reactive.init("0") numbers = Reactive.var("0")
show_ac = Reactive(True) show_ac = Reactive.var(True)
left = Reactive.var(Decimal("0")) left = Reactive.var(Decimal("0"))
right = Reactive.var(Decimal("0")) right = Reactive.var(Decimal("0"))
value = Reactive.var("") value = Reactive.var("")
@@ -30,7 +30,7 @@ class CalculatorApp(App):
self.query_one("#c").display = not show_ac self.query_one("#c").display = not show_ac
self.query_one("#ac").display = show_ac self.query_one("#ac").display = show_ac
def compose(self): def compose(self) -> ComposeResult:
"""Add our buttons.""" """Add our buttons."""
yield Container( yield Container(
Static(id="numbers"), Static(id="numbers"),
@@ -38,20 +38,20 @@ class CalculatorApp(App):
Button("C", id="c"), Button("C", id="c"),
Button("+/-", id="plus_minus"), Button("+/-", id="plus_minus"),
Button("%", id="percent"), Button("%", id="percent"),
Button("÷", id="divide"), Button("÷", id="divide", variant="warning"),
Button("7", id="7"), Button("7", id="number-7"),
Button("8", id="8"), Button("8", id="number-8"),
Button("9", id="9"), Button("9", id="number-9"),
Button("×", id="multiply", variant="warning"), Button("×", id="multiply", variant="warning"),
Button("4", id="4"), Button("4", id="number-4"),
Button("5", id="5"), Button("5", id="number-5"),
Button("6", id="6"), Button("6", id="number-6"),
Button("-", id="minus", variant="warning"), Button("-", id="minus", variant="warning"),
Button("1", id="1"), Button("1", id="number-1"),
Button("2", id="2"), Button("2", id="number-2"),
Button("3", id="3"), Button("3", id="number-3"),
Button("+", id="plus", variant="warning"), Button("+", id="plus", variant="warning"),
Button("0", id="0", classes="operator zero"), Button("0", id="number-0"),
Button(".", id="point"), Button(".", id="point"),
Button("=", id="equals", variant="warning"), Button("=", id="equals", variant="warning"),
id="calculator", id="calculator",
@@ -79,10 +79,11 @@ class CalculatorApp(App):
self.numbers = str(self.left) self.numbers = str(self.left)
self.value = "" self.value = ""
except Exception: except Exception:
self.display = "Error" self.numbers = "Error"
if button_id.isdecimal(): if button_id.startswith("number-"):
self.numbers = self.value = self.value.lstrip("0") + button_id number = button_id.partition("-")[-1]
self.numbers = self.value = self.value.lstrip("0") + number
elif button_id == "plus_minus": elif button_id == "plus_minus":
self.numbers = self.value = str(Decimal(self.value or "0") * -1) self.numbers = self.value = str(Decimal(self.value or "0") * -1)
elif button_id == "percent": elif button_id == "percent":