Browse Source

implemented basic functions, changed appearance

jacob andersen 6 years ago
parent
commit
c4909bf67f

BIN
.DS_Store View File


+ 4
- 4
src/main/java/rocks/zipcode/calcskin/CalcEngine.java View File

6
     }
6
     }
7
 
7
 
8
     public double add(double v, double v1) {
8
     public double add(double v, double v1) {
9
-        return Double.NaN;
9
+        return v+v1;
10
     }
10
     }
11
 
11
 
12
     public double subtract(double v, double v1) {
12
     public double subtract(double v, double v1) {
13
-        return Double.NaN;
13
+        return v-v1;
14
     }
14
     }
15
 
15
 
16
     public double multiply(double v, double v1) {
16
     public double multiply(double v, double v1) {
17
-        return Double.NaN;
17
+        return v*v1;
18
     }
18
     }
19
 
19
 
20
     public double divide(double v, double v1) {
20
     public double divide(double v, double v1) {
21
-        return Double.NaN;
21
+        return v/v1;
22
     }
22
     }
23
 }
23
 }

+ 2
- 2
src/main/java/rocks/zipcode/calcskin/CalcSkin.java View File

60
     private VBox createLayout(TextField screen, TilePane buttons) {
60
     private VBox createLayout(TextField screen, TilePane buttons) {
61
         final VBox layout = new VBox(20);
61
         final VBox layout = new VBox(20);
62
         layout.setAlignment(Pos.CENTER);
62
         layout.setAlignment(Pos.CENTER);
63
-        layout.setStyle("-fx-background-color: silver; -fx-padding: 20; -fx-font-size: 20;");
63
+        layout.setStyle("-fx-background-color: gold; -fx-padding: 20; -fx-font-size: 20;");
64
         layout.getChildren().setAll(screen, buttons);
64
         layout.getChildren().setAll(screen, buttons);
65
         handleAccelerators(layout);
65
         handleAccelerators(layout);
66
         screen.prefWidthProperty().bind(buttons.widthProperty());
66
         screen.prefWidthProperty().bind(buttons.widthProperty());
81
 
81
 
82
     private TextField createScreen() {
82
     private TextField createScreen() {
83
         final TextField screen = new TextField();
83
         final TextField screen = new TextField();
84
-        screen.setStyle("-fx-background-color: aquamarine;");
84
+        screen.setStyle("-fx-background-color: green;");
85
         screen.setAlignment(Pos.CENTER_RIGHT);
85
         screen.setAlignment(Pos.CENTER_RIGHT);
86
         screen.setEditable(false);
86
         screen.setEditable(false);
87
         screen.textProperty().bind(Bindings.format("%.0f", currentValue));
87
         screen.textProperty().bind(Bindings.format("%.0f", currentValue));