Fixed image loading when not thumb

ara4n · Aug 30, 2017 · d6fed8c · d6fed8c
1 parent 06f63a8
commit d6fed8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/util.rs b/src/util.rs
@@ -448,8 +448,11 @@ pub fn parse_room_message(baseu: &Url, roomid: String, msg: &JsonValue) -> Messa
     match mtype {
         "m.image" => {
             url = String::from(c["url"].as_str().unwrap_or(""));
-            let t = c["info"]["thumbnail_url"].as_str().unwrap_or("");
-            thumb = media!(baseu, t).unwrap_or(String::from(""));
+            let mut t = String::from(c["info"]["thumbnail_url"].as_str().unwrap_or(""));
+            if t.is_empty() && !url.is_empty() {
+                t = url.clone();
+            }
+            thumb = media!(baseu, &t).unwrap_or(String::from(""));
         },
         _ => {},
     };

diff --git a/src/widgets.rs b/src/widgets.rs
@@ -139,8 +139,10 @@ impl<'a> MessageBox<'a> {
         let bx = gtk::Box::new(gtk::Orientation::Horizontal, 0);
         let image = gtk::Image::new();
 
-        if let Ok(pixbuf) = Pixbuf::new_from_file_at_size(&msg.thumb, 200, 200) {
+        if let Ok(pixbuf) = Pixbuf::new_from_file_at_scale(&msg.thumb, 200, 200, true) {
             image.set_from_pixbuf(&pixbuf);
+        } else {
+            image.set_from_file(&msg.thumb);
         }
 
         let viewbtn = gtk::Button::new();