Re #11: Fix thumb width calculation

peterlevi · Jun 25, 2018 · 78df52f · 78df52f
1 parent 059c007
commit 78df52f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/data/browse.html b/data/browse.html
@@ -23,9 +23,6 @@
 </head>
 
 <body>
-<div id="spinner">
-    <img src="img/spinner.gif" class="spinner">
-</div>
 <div id="main">
     <div class="search">
         <input type="search" id="search-field">

diff --git a/data/browse.js b/data/browse.js
@@ -147,7 +147,7 @@ function add_image(file, thumb) {
     var item = $(".item[file='" + encode_path(file) + "']");
     if (item.length) {
         item.html(
-            "<div style='display: table-cell; vertical-align: middle; text-align: center; width:60px; height:" + thumb_height + "px;'>" +
+            "<div style='display: table-cell; vertical-align: middle; text-align: center; width:10px; height:" + thumb_height + "px;'>" +
             "<div style='display: inline-block'>" +
             "<img style='max-height: " + thumb_height + "px;' src='" + encode_path(thumb) + "'/>" +
             "</div>" +

diff --git a/ojo/ojo.py b/ojo/ojo.py
@@ -690,7 +690,7 @@ def _prepare_thread():
                     util.path2url(img),
                     os.path.basename(img),
                     'true' if img == self.selected else 'false',
-                    180))
+                    options['thumb_height'] * 3/2))
                 time.sleep(0.001)
                 cached = self.thumbs.get_cached_thumbnail_path(img)
                 if os.path.exists(cached):
@@ -700,7 +700,7 @@ def _prepare_thread():
                         meta = metadata.get_full(img)
                         w, h = meta.dimensions
                         rok = not needs_rotation(meta)
-                        thumb_width = round(w * thumbh / h) if rok else round(h * thumbh / w)
+                        thumb_width = int(float(w) * thumbh / h) if rok else int(float(h) * thumbh / w)
                         if w and h:
                             self.js("set_dimensions('%s', '%s', '%d x %d', %d)" % (
                                 util.path2url(img),