diff --git a/src/main/java/NTNU/IDATT1002/App.java b/src/main/java/NTNU/IDATT1002/App.java
index b837eb4b5eb7cf24936aa8c9aab2b023d82beb9c..fc2db47c98a674244767cf36b0a102172fd05a0d 100644
--- a/src/main/java/NTNU/IDATT1002/App.java
+++ b/src/main/java/NTNU/IDATT1002/App.java
@@ -26,8 +26,8 @@ public class App extends Application {
stage.setScene(scene);
stage.setTitle("Image Application");
stage.getIcons().add(new Image(App.class.getResourceAsStream("/Images/AppIcon.png")));
- stage.setMinWidth(1024);
- stage.setMinHeight(600);
+ stage.setMinWidth(1200);
+ stage.setMinHeight(800);
stage.show();
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/PaginatedContent.java b/src/main/java/NTNU/IDATT1002/controllers/PaginatedContent.java
index b0435a4333dc806dff7cbff31baf841dcdb24455..bce2e81f92710b8efc7967390091792ef5c28dc3 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/PaginatedContent.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/PaginatedContent.java
@@ -20,6 +20,7 @@ import javafx.scene.CacheHint;
import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color;
import javafx.scene.text.Font;
@@ -165,7 +166,9 @@ public abstract class PaginatedContent<T> extends NavBarController implements In
amounts.setOnAction(e -> pageSizeSelectionChanged(amounts));
HBox perPageSelection = new HBox();
- perPageSelection.setAlignment(Pos.TOP_RIGHT);
+ perPageSelection.setAlignment(Pos.TOP_LEFT);
+ HBox.setHgrow(perPageSelection, Priority.ALWAYS);
+ perPageSelection.setMinWidth(1024);
perPageSelection.getChildren().addAll(descriptionLabel, amounts);
showResultsPerPageContainer.getChildren().add(perPageSelection);
@@ -269,6 +272,7 @@ public abstract class PaginatedContent<T> extends NavBarController implements In
List<? extends Node> pageContent = getContentsFrom(currentPage);
pageContentContainer.getChildren().addAll(pageContent);
+ pageContentContainer.setAlignment(Pos.TOP_CENTER);
};
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageColumn.java b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageColumn.java
index 272cacd4b24537295948b8fa70b1b1c98458189b..06fc8034d303f6850ede184e7f287af42aaad455 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageColumn.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageColumn.java
@@ -6,6 +6,7 @@ import NTNU.IDATT1002.service.TagService;
import NTNU.IDATT1002.utils.ImageUtil;
import javafx.geometry.Pos;
import javafx.scene.image.ImageView;
+import javafx.scene.layout.Priority;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.text.Font;
@@ -33,6 +34,8 @@ public class ImageColumn extends VBox {
StackPane stackPane = createStackPane(imageView);
imageView.fitHeightProperty().bind(stackPane.heightProperty());
imageView.fitWidthProperty().bind(stackPane.widthProperty());
+ imageView.getStyleClass().add("exploreImages");
+ imageView.setFocusTraversable(true);
Text title = createTitle();
Text tag = createText();
@@ -60,7 +63,7 @@ public class ImageColumn extends VBox {
String tagsAsString = TagService.getTagsAsString(image.getTags());
Text tagsText = new Text(tagsAsString);
tagsText.setFont(Font.font(App.ex.getDefaultFont(), FontWeight.BOLD, 18));
- tagsText.setWrappingWidth(100);
+ tagsText.setWrappingWidth(330);
return tagsText;
}
@@ -101,8 +104,8 @@ public class ImageColumn extends VBox {
* Style this {@link ImageColumn}.
*/
private void applyStyling() {
- this.setMinSize(360,310);
- this.setPrefSize(520,310);
+ this.setMinSize(330,310);
+ this.setPrefSize(700,700);
this.setAlignment(Pos.TOP_CENTER);
this.setId(String.valueOf(image.getId()));
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
index aa59a811c11c33c45f0b379c7021670e1764d14e..7ae9dac3bc6b63cae9722bb39066f559df46c729 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/explore/ImageRow.java
@@ -31,10 +31,7 @@ public class ImageRow extends HBox {
*/
private void applyStyling() {
this.setAlignment(Pos.CENTER);
- this.setMaxHeight(350.0);
- this.setMaxWidth(1590.0);
- this.setMinHeight(310.0);
- this.setMinWidth(400.0);
+ this.setMinSize(1024,350);
this.setSpacing(10.0);
this.getStylesheets().add("/NTNU/IDATT1002/style.css");
this.paddingProperty().setValue(new Insets(10.0, 10.0, 10.0, 10.0));
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
index c94f8c5a621f96cfe07886176d8b96f15be03798..255f0094948f93882753a52b74635d8e59d49b4e 100644
--- a/src/main/resources/NTNU/IDATT1002/explore.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -91,7 +91,7 @@
<content>
<VBox alignment="TOP_CENTER" prefHeight="2000.0" prefWidth="1920.0" styleClass="bodybg" stylesheets="@style.css">
<padding>
- <Insets bottom="80.0" left="80.0" right="80.0" top="80.0" />
+ <Insets bottom="80.0" left="60.0" right="60.0" top="80.0" />
</padding>
<children>
<Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="EXPLORE IMAGES">
@@ -144,24 +144,20 @@
</HBox>
<!-- PAGINATION MAIN CONTENT CONTAINER -->
- <VBox fx:id="pageContainer" alignment="TOP_CENTER" prefWidth="100.0" spacing="20.0" styleClass="transparentbg" stylesheets="@style.css" VBox.vgrow="ALWAYS">
+ <VBox fx:id="pageContainer" alignment="TOP_CENTER" spacing="20.0" styleClass="transparentbg" stylesheets="@style.css" VBox.vgrow="ALWAYS">
<!-- PAGINATION SHOW RESULTS CHOICE CONTAINER -->
- <VBox fx:id="showResultsPerPageContainer" alignment="TOP_RIGHT">
-
- <!-- PAGINATION PROGRESS INDICATOR CONTAINER -->
- <VBox alignment="CENTER">
- <ProgressIndicator fx:id="pageProgressIndicator" style="-fx-progress-color: #58379A" />
- <padding>
- <Insets top="50.0" />
- </padding>
- </VBox>
+ <VBox fx:id="showResultsPerPageContainer" alignment="TOP_CENTER" VBox.vgrow="ALWAYS">
+ <ProgressIndicator fx:id="pageProgressIndicator" style="-fx-progress-color: #58379A" />
<!-- END PAGINATION PROGRESS INDICATOR CONTAINER -->
<padding>
- <Insets right="20.0" top="20.0" />
+ <Insets bottom="20.0" top="20.0" />
</padding>
</VBox>
+ <padding>
+ <Insets bottom="20.0" left="20.0" right="20.0" />
+ </padding>
<!-- END PAGINATION SHOW RESULTS CHOICE CONTAINER -->
</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
index bf477bc55c0af5a7c1a7208935b83a3f4e68d23a..8c0a44ee16d686dda9bd0cab377772678aa8c062 100644
--- a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import java.lang.String?>
<?import javafx.collections.FXCollections?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ProgressIndicator?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import java.lang.*?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
<VBox fx:id="pageRootContainer" alignment="TOP_CENTER" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbums">
<children>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" styleClass="tbarbg" stylesheets="@style.css">
@@ -143,26 +150,17 @@
<VBox fx:id="pageContainer" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="1500.0" spacing="20.0" styleClass="transparentbg" stylesheets="@style.css" VBox.vgrow="ALWAYS">
<children>
<!-- PAGINATION SHOW RESULTS CHOICE CONTAINER -->
- <VBox fx:id="showResultsPerPageContainer" alignment="TOP_RIGHT">
-
- <!-- PAGINATION PROGRESS INDICATOR CONTAINER -->
- <VBox alignment="CENTER">
- <ProgressIndicator fx:id="pageProgressIndicator" style="-fx-progress-color: #58379A" />
- <padding>
- <Insets top="50.0" />
- </padding>
- </VBox>
- <!-- END PAGINATION PROGRESS INDICATOR CONTAINER -->
-
+ <VBox fx:id="showResultsPerPageContainer" alignment="TOP_CENTER">
+ <ProgressIndicator fx:id="pageProgressIndicator" style="-fx-progress-color: #58379A" />
<padding>
- <Insets right="20.0" top="20.0" />
+ <Insets bottom="20.0" top="20.0" />
</padding>
</VBox>
<!-- END PAGINATION SHOW RESULTS CHOICE CONTAINER -->
</children>
<padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+ <Insets bottom="20.0" left="40.0" right="40.0" />
</padding>
</VBox>
<!-- END MAIN CONTENT CONTAINER -->
diff --git a/src/main/resources/NTNU/IDATT1002/style.css b/src/main/resources/NTNU/IDATT1002/style.css
index 234ce44d880e999971e978ad49d01e37f3e41a7f..1f92e6de99a5294042e87cf49c6c9cb072c4e69f 100644
--- a/src/main/resources/NTNU/IDATT1002/style.css
+++ b/src/main/resources/NTNU/IDATT1002/style.css
@@ -61,8 +61,6 @@
/*RESPONSIVE IMAGES END*/
.exploreImages{
-fx-cursor: hand;
- -fx-fit-to-height: 250px;
- -fx-fit-to-width: 400px;
}
.exploreImages:hover{