refactor (#33)

Author: not-nef

FluentCalculator.py

@@ -4,34 +4,34 @@
 import sv_ttk
 import ntkutils
 
-def btnClick(numbers, event=None):
+def btnClick(numbers):
     global operator
-    tex_input2.set('')
+    content2.set('')
     operator=operator+str(numbers)
-    tex_input.set(operator)
+    content.set(operator)
 
 def btnClearDisplay():
     global operator
-    tex_input2.set("")
-    tex_input.set("0")
+    content2.set("")
+    content.set("0")
     operator=""
 
-def btnEqualsInput(event=None):
+def btnEqualsInput():
     try:
         global operator
         sumup=str(eval(operator))
-        tex_input2.set(operator)
-        tex_input.set(sumup)
+        content2.set(operator)
+        content.set(sumup)
         operator=""
     except:
-        tex_input.set("Error")
+        content.set("Error")
         operator=""
 
-def backspace(event=None):
+def backspace():
         global operator
         operator = operator[:-1]
-        tex_input2.set("")
-        tex_input.set(operator)
+        content2.set("")
+        content.set(operator)
 
 def aot():
     if always_on_top.get() == 1:
@@ -42,14 +42,15 @@ def aot():
 def square():
     try:
         global operator
-        tex_input2.set(operator + '²')
+        content2.set(operator + '²')
         ans = float(operator)
         squr = ans*ans
-        tex_input.set(str(squr))
         operator =""
+        if str(squr).endswith(".0"): squr = str(squr).rstrip(".0")
+        content.set(str(squr))
     except:
-        tex_input2.set("")
-        tex_input.set("Error")
+        content2.set("")
+        content.set("Error")
         operator=""
 
 root=tk.Tk()
@@ -68,37 +69,37 @@ def square():
     ntkutils.blur_window_background(root)    
 
 operator=""
-tex_input= StringVar()
-tex_input2 = StringVar()
-tex_input.set("0")
-txtDisplay = Label(root, textvariable=tex_input, font=('Segoe UI Variable Display Semibold','35'),anchor="e",width=11).place(x=0, y=60)
-txtDisplay2 =Label(root,textvariable=tex_input2, font=('Segoe UI Variable Display Semibold','15'),anchor="e",width=11, fg='#707476').place(x=162,y=30)
-
 always_on_top = BooleanVar()
-alwaysontop=ttk.Checkbutton(root, text="", variable = always_on_top,onvalue=1, offvalue=0, style="Toggle.TButton",command=lambda:aot()).place(x=4, y=148, height=53, width=76)
-btnsquare=ttk.Button(root, text="x²", command=lambda:square()).place(x=4, y=203, height=53, width=76)
-btn7=ttk.Button(root, text="7", command=lambda:btnClick(7)).place(x=4, y=258, height=53, width=76)
-btn4=ttk.Button(root, text="4", command=lambda:btnClick(4)).place(x=4, y=313, height=53, width=76)
-btn1=ttk.Button(root, text="1", command=lambda:btnClick(1)).place(x=4, y=368, height=53, width=76)
+content= StringVar()
+content2 = StringVar()
+content.set("0")
 
-openbtn=ttk.Button(root, text="(", command=lambda:btnClick('(')).place(x=82, y=148, height=53, width=76)
-btnClear=ttk.Button(root, text="C", command=btnClearDisplay).place(x=82, y= 203, height=53, width=76)
-btn8=ttk.Button(root, text="8", command=lambda:btnClick(8)).place(x=82, y=258, height=53, width=76)
-btn5=ttk.Button(root, text="5", command=lambda:btnClick(5)).place(x=82, y=313, height=53, width=76)
+Display = Label(root, textvariable=content, font=('Segoe UI Variable Display Semibold','35'),anchor="e",width=11).place(x=0, y=60)
+Display2 =Label(root,textvariable=content2, font=('Segoe UI Variable Display Semibold','15'),anchor="e",width=11, fg='#707476').place(x=162,y=30)
+
+btn1=ttk.Button(root, text="1", command=lambda:btnClick(1)).place(x=4, y=368, height=53, width=76)
 btn2=ttk.Button(root, text="2", command=lambda:btnClick(2)).place(x=82, y=368, height=53, width=76)
+btn3=ttk.Button(root, text="3", command=lambda:btnClick(3)).place(x=160, y=368, height=53, width=76)
+btn4=ttk.Button(root, text="4", command=lambda:btnClick(4)).place(x=4, y=313, height=53, width=76)
+btn5=ttk.Button(root, text="5", command=lambda:btnClick(5)).place(x=82, y=313, height=53, width=76)
+btn6=ttk.Button(root, text="6", command=lambda:btnClick(6)).place(x=160, y=313, height=53, width=76)
+btn7=ttk.Button(root, text="7", command=lambda:btnClick(7)).place(x=4, y=258, height=53, width=76)
+btn8=ttk.Button(root, text="8", command=lambda:btnClick(8)).place(x=82, y=258, height=53, width=76)
+btn9=ttk.Button(root, text="9", command=lambda:btnClick(9)).place(x=160, y=258, height=53, width=76)
 btn0=ttk.Button(root, text="0", command=lambda:btnClick(0)).place(x=4, y=423, height=53, width=154)
 
+alwaysontop=ttk.Checkbutton(root, text="", variable = always_on_top,onvalue=1, offvalue=0, style="Toggle.TButton",command=lambda:aot()).place(x=4, y=148, height=53, width=76)
+openbtn=ttk.Button(root, text="(", command=lambda:btnClick('(')).place(x=82, y=148, height=53, width=76)
 closebtn=ttk.Button(root, text=")", command=lambda:btnClick(')')).place(x=160, y=148, height=53, width=76)
+btnClear=ttk.Button(root, text="C", command=btnClearDisplay).place(x=82, y= 203, height=53, width=76)
 Backspace = ttk.Button(root, text='', command=backspace).place(x=160, y=203, height=53, width=76)
-btn9=ttk.Button(root, text="9", command=lambda:btnClick(9)).place(x=160, y=258, height=53, width=76)
-btn6=ttk.Button(root, text="6", command=lambda:btnClick(6)).place(x=160, y=313, height=53, width=76)
-btn3=ttk.Button(root, text="3", command=lambda:btnClick(3)).place(x=160, y=368, height=53, width=76)
 btndot=ttk.Button(root, text=".", command=lambda:btnClick('.')).place(x=160, y=423, height=53, width=76)
 
 Divsion=ttk.Button(root, text="", command=lambda:btnClick("/")).place(x=238, y=148, height=53, width=76)
 Multiple=ttk.Button(root, text="", command=lambda:btnClick("*")).place(x=238, y=203, height=53, width=76)
 Subtraction=ttk.Button(root, text="", command=lambda:btnClick("-")).place(x=238, y=258, height=53, width=76)
 Addition=ttk.Button(root, text="",  command=lambda:btnClick("+")).place(x=238, y=313, height=53, width=76)
+btnsquare=ttk.Button(root, text="x²", command=lambda:square()).place(x=4, y=203, height=53, width=76)
 equal=ttk.Button(root, text="", command=btnEqualsInput).place(x=238, y=368, height=108, width=76)
 
 root.bind('<Return>', btnEqualsInput)