Ticket #2154: mythgalleryAR.diff

glsingleview.cpp

@@ -35 +35 @@
 
 #include "glsingleview.h"
 #include "galleryutil.h"
+#include <X11/Xlib.h>
 
 GLSDialog::GLSDialog(const ThumbList& itemList, int pos, int slideShow,
                      MythMainWindow *parent, const char *name)
@@ -574 +575 @@
 
     QImage image(item->path);
     if (!image.isNull()) {
+        // get screen aspect
+        Display  *display;
+        display = XOpenDisplay(NULL);
 
+        int scr = DefaultScreen(display);
+        int s_height_mm = DisplayHeightMM(display,scr);
+        int s_width_mm = DisplayWidthMM(display,scr);
+        int s_height_px = DisplayHeight(display,scr);
+        int s_width_px = DisplayWidth(display,scr);
+
+        double aspect_h = (double)s_height_px/(double)s_height_mm;
+        double aspect_w = (double)s_width_px/(double)s_width_mm;
+
+        double scale_factor_w = 1;
+
+        scale_factor_w = aspect_w / aspect_h;
+
         int a  = m_tex1First ? 0 : 1;
         TexItem& t = m_texItem[a];
 
@@ -582 +599 @@
         t.angle    = 0;
 
         t.angle = item->GetRotationAngle();
+
+       t.width  = (int)round(image.width() * scale_factor_w);
+        t.height = (int)round(image.height());
 
-        t.width  = image.width();
-        t.height = image.height();
-
         if (t.angle%180 != 0) {
+           t.width = image.width();
             int tmp  = t.width;
-            t.width  = t.height;
+            t.width  = t.height * scale_factor_w;
             t.height = tmp;
         }
 

glsingleview.h

@@ -85 +85 @@
     int           screenwidth, screenheight;
     float         wmult, hmult;
     int           m_w, m_h;
+    double        scale_factor_w;
 
     TexItem       m_texItem[2];
     int           m_curr;