Jelajahi Sumber

icons show up, but they aren't square and don't crop to fit.:

tsdedhar 6 tahun lalu
induk
melakukan
6d6e5a2758

TEMPAT SAMPAH
assignments/a3/.gradle/4.7/fileHashes/fileHashes.bin


TEMPAT SAMPAH
assignments/a3/.gradle/4.7/fileHashes/fileHashes.lock


TEMPAT SAMPAH
assignments/a3/.gradle/4.7/taskHistory/taskHistory.bin


TEMPAT SAMPAH
assignments/a3/.gradle/4.7/taskHistory/taskHistory.lock


TEMPAT SAMPAH
assignments/a3/.gradle/buildOutputCleanup/buildOutputCleanup.lock


TEMPAT SAMPAH
assignments/a3/.gradle/buildOutputCleanup/outputFiles.bin


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/Controls$1.class


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/Controls$2.class


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/Controls$3.class


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/Controls.class


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/Model.class


TEMPAT SAMPAH
assignments/a3/build/classes/java/main/PicData.class


TEMPAT SAMPAH
assignments/a3/build/libs/a2-1.0-SNAPSHOT.jar


TEMPAT SAMPAH
assignments/a3/build/resources/main/grid.png


TEMPAT SAMPAH
assignments/a3/build/resources/main/list.png


TEMPAT SAMPAH
assignments/a3/build/resources/main/star.png


+ 18 - 3
assignments/a3/src/main/java/Controls.java

@@ -5,6 +5,8 @@ import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
 import javax.swing.ImageIcon;
+import java.awt.image.BufferedImage;
+import javax.imageio.ImageIO;
 
 public class Controls extends JPanel implements Observer
 {
@@ -29,9 +31,22 @@ public class Controls extends JPanel implements Observer
     this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
     this.setPreferredSize(new Dimension(1280,75));
     this.setMinimumSize(new Dimension(320, 75));
-    this.starImg = ImageIO.read(new File("star.png"));
-    this.gridImg = ImageIO.read(new File("grid.png"));
-    this.listImg = ImageIO.read(new File("list.png"));
+    
+    try
+    {
+      this.starImg = ImageIO.read(new File("src/main/resources/star.png"));
+    } catch(IOException e) {}
+
+    try
+    {
+      this.gridImg = ImageIO.read(new File("src/main/resources/grid.png"));
+    } catch(IOException e) {}
+
+    try
+    {
+      this.listImg = ImageIO.read(new File("src/main/resources/list.png"));
+    } catch(IOException e) {}
+    
     this.starIcon = new ImageIcon(starImg);
     this.gridIcon = new ImageIcon(gridImg);
     this.listIcon = new ImageIcon(listImg);

+ 1 - 1
assignments/a3/src/main/java/Model.java

@@ -10,7 +10,7 @@ public class Model extends Observable
   private ArrayList<Observer> observers;
   private ArrayList<PicData> pics;
   private int filter;
-  private bool grid;
+  private boolean grid;
 
   // Constructor
   public Model()