Skip to content
Snippets Groups Projects
Commit 5ec7c9cc authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed wrong width of buttonColor in NewCategoryController, added icon to colorpicker

parent 23db68de
Branches
Tags
No related merge requests found
......@@ -12,6 +12,7 @@ import javafx.scene.Node;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.image.Image;
import javafx.scene.layout.GridPane;
import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle;
......@@ -95,6 +96,7 @@ public class ColorView extends GridPane
stage.setResizable(false);
stage.initModality(Modality.APPLICATION_MODAL);
stage.setScene(scene);
stage.getIcons().add(new Image("/de/deadlocker8/budgetmaster/resources/icon.png"));
stage.show();
}
catch(Exception e)
......
......@@ -52,6 +52,8 @@ public class NewCategoryController
buttonSave.setStyle("-fx-background-color: #2E79B9; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;");
buttonColor.setStyle("-fx-border-color: #000000; -fx-border-width: 2; -fx-border-radius: 5; -fx-background-radius: 5;");
buttonColor.prefWidthProperty().bind(textFieldName.widthProperty());
// DEBUG
ArrayList<Color> colors = new ArrayList<>();
colors.add(Color.BLUE);
......
......@@ -37,7 +37,7 @@
<Font name="System Bold" size="14.0" />
</font>
</Label>
<Button fx:id="buttonColor" maxWidth="1.7976931348623157E308" mnemonicParsing="false" prefHeight="30.0" prefWidth="246.0">
<Button fx:id="buttonColor" maxWidth="1.7976931348623157E308" mnemonicParsing="false" prefHeight="30.0">
<font>
<Font name="System Bold" size="14.0" />
</font>
......
......@@ -78,7 +78,7 @@
<Font name="System Bold" size="16.0" />
</font>
</Label>
<TextField fx:id="textFieldHex" prefHeight="30.0" prefWidth="77.0" text="#FFFFFF">
<TextField fx:id="textFieldHex" prefHeight="30.0" prefWidth="89.0" text="#FFFFFF">
<font>
<Font name="System Bold" size="14.0" />
</font>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment