imageviewer: screenresolution to bound window

Author: hvdwolf

src/main/java/org/hvdw/jexiftoolgui/Utils.java

@@ -178,6 +178,17 @@ public static int[] getResolution() {
         return res;
     }
 
+    /*
+    / Base function to get screen bounds (resolution minus taskbar and/or menu bar
+     */
+    public static Rectangle getScreenBounds() {
+        GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        Rectangle bounds = env.getMaximumWindowBounds();
+        logger.debug("MyVariables.getScreenWidth {} MyVariables.getScreenHeight {} Screen Bounds {}", MyVariables.getScreenWidth(), MyVariables.getScreenHeight(), bounds);
+
+        return bounds;
+    }
+
     /*
      * Opens the default browser of the Operating System
      * and displays the specified URL

src/main/java/org/hvdw/jexiftoolgui/controllers/ImageFunctions.java

@@ -192,7 +192,7 @@ public Void doInBackground() {
             public void done() {
                 logger.debug("Finished reading all the metadata in the background");
                 progressBar.setVisible(false);
-                mainScreenLabels[0].setText(ResourceBundle.getBundle("translations/program_strings").getString("pt.finishedreadingmetadatabackground"));
+                mainScreenLabels[0].setText(ResourceBundle.getBundle("translations/program_strings").getString("pt.finishedreadingmetadabackground"));
                 buttonSearchMetadata.setEnabled(true);
             }
         };
@@ -413,7 +413,8 @@ public static ImageIcon analyzeImageAndCreateIcon (File file) {
                 icon = new ImageIcon(resizedImg);
                 // Save our created icon
                 if ( (filenameExt.toLowerCase().equals("jpg")) || (filenameExt.toLowerCase().equals("jpeg")) ) {
-                    StandardFileIO.saveIconToCache(filename, resizedImg);
+                    BufferedImage thumbImg = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(),BufferedImage.TYPE_INT_RGB);
+                    StandardFileIO.saveIconToCache(filename, thumbImg);
                 } else { //tiff
                     //BufferedImage thumbImg = new BufferedImage(icon);
                     BufferedImage thumbImg = new BufferedImage(resizedImg.getWidth(), resizedImg.getHeight(), BufferedImage.OPAQUE);

src/main/java/org/hvdw/jexiftoolgui/view/JavaImageViewer.java

@@ -32,14 +32,15 @@ public class JavaImageViewer {
     private BufferedImage ResizeImage(File image, int orientation) {
 
         int scrwidth = MyVariables.getScreenWidth();
-        int scrheight = MyVariables.getScreenHeight();
+        int scrheight = MyVariables.getScreenHeight()-50;
+        Rectangle screenBounds = Utils.getScreenBounds();
         try {
             BufferedImage img = ImageIO.read(new File(image.getPath().replace("\\", "/")));
             if (orientation > 1) {
                 resizedImg = ImageFunctions.rotate(img, orientation);
-                resizedImg = ImageFunctions.scaleImageToContainer(resizedImg, scrwidth, scrheight);
+                resizedImg = ImageFunctions.scaleImageToContainer(resizedImg, screenBounds.width, screenBounds.height);
             } else { // No rotation necessary
-                resizedImg = ImageFunctions.scaleImageToContainer(img, scrwidth, scrheight);
+                resizedImg = ImageFunctions.scaleImageToContainer(img, screenBounds.width, screenBounds.height);
             }
         } catch (IOException iex) {
             logger.error("error in resizing the image {}", iex);
@@ -283,21 +284,19 @@ public void actionPerformed(ActionEvent actionEvent) {
 
 
 
+        Rectangle screenBounds = Utils.getScreenBounds();
 
         thePanel.add(InfoPanel, BorderLayout.PAGE_START);
         ImageIcon icon = new ImageIcon(resizedImg);
         ImgLabel.setIcon(icon);
         thePanel.add(ImgLabel, BorderLayout.CENTER);
         thePanel.add(buttonPanel, BorderLayout.PAGE_END);
         //thePanel.setPreferredSize(new Dimension(panelWidth, panelHeight));
-        thePanel.setPreferredSize(new Dimension(MyVariables.getScreenWidth(), MyVariables.getScreenHeight() - 30));
+        thePanel.setPreferredSize(new Dimension(screenBounds.width, screenBounds.height - 30));
         frame.add(thePanel);
 
-        //if (!frameborder) {
-        frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
-        //frame.setUndecorated(true) will create a borderless window. Only use in slideshow where we have buttons anyway.
-        frame.setUndecorated(true);
-        //}
+
+        frame.setLocation(0,0);
         frame.pack();
         frame.setVisible(true);