From e68e39426b0461f371f148095c2308490c71bd16 Mon Sep 17 00:00:00 2001
From: Harkamal Randhawa <harkamalsr@gmail.com>
Date: Thu, 9 Apr 2026 21:12:04 -0600
Subject: [PATCH] Restore Table Layout

---
 .../controllers/PetController.java             |  2 --
 .../controllers/ServiceController.java         |  1 -
 .../petshopdesktop/modelviews/pet-view.fxml    | 18 +++++++++---------
 .../modelviews/service-view.fxml               | 10 +++++-----
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/PetController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/PetController.java
index d0e01fa9..fb72feaa 100644
--- a/desktop/src/main/java/org/example/petshopdesktop/controllers/PetController.java
+++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/PetController.java
@@ -174,8 +174,6 @@ public class PetController {
         btnDelete.setDisable(true);
         //Enable multiple selection
         tvPets.getSelectionModel().setSelectionMode(javafx.scene.control.SelectionMode.MULTIPLE);
-        tvPets.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
-        tvPets.setFixedCellSize(30);
 
         colPetId.setCellValueFactory(new PropertyValueFactory<Pet,Integer>("petId"));
         colPetImage.setCellValueFactory(new PropertyValueFactory<Pet, String>("imageUrl"));
diff --git a/desktop/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java b/desktop/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java
index 55030756..10acb9ed 100644
--- a/desktop/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java
+++ b/desktop/src/main/java/org/example/petshopdesktop/controllers/ServiceController.java
@@ -50,7 +50,6 @@ public class ServiceController {
         btnEdit.setDisable(true);
         btnDelete.setDisable(true);
         tvServices.getSelectionModel().setSelectionMode(javafx.scene.control.SelectionMode.MULTIPLE);
-        tvServices.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
 
         colServiceId.setCellValueFactory(new PropertyValueFactory<>("serviceId"));
         colServiceName.setCellValueFactory(new PropertyValueFactory<>("serviceName"));
diff --git a/desktop/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml b/desktop/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml
index 74588fe5..042a36f9 100644
--- a/desktop/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml
+++ b/desktop/src/main/resources/org/example/petshopdesktop/modelviews/pet-view.fxml
@@ -83,18 +83,18 @@
           </font>
        </Label>
 
-       <TableView fx:id="tvPets" prefHeight="362.0" prefWidth="980.0" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS">
+       <TableView fx:id="tvPets" prefHeight="362.0" prefWidth="752.0" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS">
          <columns>
             <TableColumn fx:id="colPetId" prefWidth="55.0" text="ID" />
-              <TableColumn fx:id="colPetImage" prefWidth="60.0" text="Image" />
-            <TableColumn fx:id="colPetName" prefWidth="140.0" text="Name" />
-              <TableColumn fx:id="colPetSpecies" prefWidth="100.0" text="Species" />
-              <TableColumn fx:id="colPetBreed" prefWidth="170.0" text="Breed" />
+              <TableColumn fx:id="colPetImage" prefWidth="80.0" text="Image" />
+            <TableColumn fx:id="colPetName" prefWidth="110.0" text="Name" />
+              <TableColumn fx:id="colPetSpecies" prefWidth="105.0" text="Species" />
+              <TableColumn fx:id="colPetBreed" prefWidth="145.0" text="Breed" />
               <TableColumn fx:id="colPetAge" prefWidth="60.0" text="Age" />
-              <TableColumn fx:id="colPetStatus" prefWidth="100.0" text="Status" />
-              <TableColumn fx:id="colPetPrice" prefWidth="100.0" text="Price" />
-              <TableColumn fx:id="colCustomerName" prefWidth="160.0" text="Owner" />
-              <TableColumn fx:id="colStoreName" prefWidth="160.0" text="Store" />
+              <TableColumn fx:id="colPetStatus" prefWidth="110.0" text="Status" />
+              <TableColumn fx:id="colPetPrice" prefWidth="80.0" text="Price" />
+              <TableColumn fx:id="colCustomerName" prefWidth="130.0" text="Owner" />
+              <TableColumn fx:id="colStoreName" prefWidth="130.0" text="Store" />
           </columns>
        </TableView>
    </children>
diff --git a/desktop/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml b/desktop/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml
index 5182efc6..bf3fc6a0 100644
--- a/desktop/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml
+++ b/desktop/src/main/resources/org/example/petshopdesktop/modelviews/service-view.fxml
@@ -79,13 +79,13 @@
           </font>
        </Label>
 
-       <TableView fx:id="tvServices" prefHeight="362.0" prefWidth="980.0" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS">
+       <TableView fx:id="tvServices" prefHeight="362.0" prefWidth="752.0" style="-fx-background-color: white; -fx-background-radius: 12;" VBox.vgrow="ALWAYS">
           <columns>
              <TableColumn fx:id="colServiceId" prefWidth="60.0" text="ID" />
-             <TableColumn fx:id="colServiceName" prefWidth="210.0" text="Name" />
-             <TableColumn fx:id="colServiceDesc" prefWidth="420.0" text="Description" />
-             <TableColumn fx:id="colServiceDuration" prefWidth="150.0" text="Duration (min)" />
-             <TableColumn fx:id="colServicePrice" prefWidth="120.0" text="Price" />
+             <TableColumn fx:id="colServiceName" prefWidth="169.71432495117188" text="Name" />
+             <TableColumn fx:id="colServiceDesc" prefWidth="206.85711669921875" text="Description" />
+             <TableColumn fx:id="colServiceDuration" prefWidth="185.71429443359375" text="Duration (min)" />
+             <TableColumn fx:id="colServicePrice" prefWidth="129.14288330078125" text="Price" />
           </columns>
        </TableView>
    </children>