disabled scrolling when scrollbar is invisible

emotes.h

@@ -1,6 +1,8 @@
 #ifndef EMOTES_H
 #define EMOTES_H
 
+#define GIF_FRAME_LENGTH 33
+
 #include "concurrentmap.h"
 #include "messages/lazyloadedimage.h"
 #include "twitchemotevalue.h"
@@ -89,7 +91,7 @@ public:
         if (!gifUpdateTimerInitiated) {
             gifUpdateTimerInitiated = true;
 
-            gifUpdateTimer.setInterval(33);
+            gifUpdateTimer.setInterval(GIF_FRAME_LENGTH);
             gifUpdateTimer.start();
         }
 

messages/lazyloadedimage.cpp

@@ -22,6 +22,7 @@ LazyLoadedImage::LazyLoadedImage(const QString &url, qreal scale,
     : currentPixmap(NULL)
     , allFrames()
     , currentFrame(0)
+    , currentFrameOffset(0)
     , url(url)
     , name(name)
     , tooltip(tooltip)
@@ -39,6 +40,7 @@ LazyLoadedImage::LazyLoadedImage(QPixmap *image, qreal scale,
     : currentPixmap(image)
     , allFrames()
     , currentFrame(0)
+    , currentFrameOffset(0)
     , url()
     , name(name)
     , tooltip(tooltip)
@@ -103,12 +105,21 @@ LazyLoadedImage::loadImage()
 void
 LazyLoadedImage::gifUpdateTimout()
 {
-    if (this->currentFrame >= this->allFrames.size() - 1) {
+    this->currentFrameOffset += GIF_FRAME_LENGTH;
-        this->currentFrame = 0;
+
-        this->currentPixmap = this->allFrames.at(0).image;
+    while (true) {
+        if (this->currentFrameOffset >
+            this->allFrames.at(this->currentFrame).duration) {
+            this->currentFrameOffset -=
+                this->allFrames.at(this->currentFrame).duration;
+            this->currentFrame =
+                (this->currentFrame + 1) % this->allFrames.size();
         } else {
-        this->currentPixmap = this->allFrames.at(++this->currentFrame).image;
+            break;
         }
+    }
+
+    this->currentPixmap = this->allFrames[this->currentFrame].image;
 }
 }
 }

messages/lazyloadedimage.h

@@ -95,12 +95,13 @@ public:
 private:
     struct FrameData {
         QPixmap *image;
-        float duration;
+        int duration;
     };
 
     QPixmap *currentPixmap;
     std::vector<FrameData> allFrames;
     int currentFrame;
+    int currentFrameOffset;
 
     QString url;
     QString name;

widgets/chatwidgetview.cpp

@@ -49,17 +49,8 @@ ChatWidgetView::layoutMessages()
 
     int start = this->scrollbar.getCurrentValue();
 
-    if (messages.getLength() <= start) {
+    // layout the visible messages in the view
-        // The scrollbar wants to show more values than we can offer
+    if (messages.getLength() > start) {
-
-        // just return for now
-        return false;
-
-
-        // Lower start value to the last message
-        // start = messages.getLength() - 1;
-    }
-
         int y = -(messages[start].get()->getHeight() *
                   (fmod(this->scrollbar.getCurrentValue(), 1)));
 
@@ -75,7 +66,9 @@ ChatWidgetView::layoutMessages()
                 break;
             }
         }
+    }
 
+    // layout the messages at the bottom to determine the scrollbar thumb size
     int h = this->height() - 8;
 
     for (int i = messages.getLength() - 1; i >= 0; i--) {
@@ -236,11 +229,13 @@ ChatWidgetView::paintEvent(QPaintEvent *)
 void
 ChatWidgetView::wheelEvent(QWheelEvent *event)
 {
+    if (this->scrollbar.isVisible()) {
         this->scrollbar.setDesiredValue(
             this->scrollbar.getDesiredValue() -
                 event->delta() / 10.0 *
                     Settings::getInstance().mouseScrollMultiplier.get(),
             true);
+    }
 }
 }
 }