X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Ftopicbar.cpp;h=cd809b267dc80e943bb3fd0643233ccb6e39d571;hp=d8d9f45ad5464dbb096c6a94f29e3e21a3e4285a;hb=f3e117c216aaaf7c684326270e96876a608862ef;hpb=6c6daea183c3a013a91fb8e9f250f6dece3023f8

diff --git a/src/qtopia/topicbar.cpp b/src/qtopia/topicbar.cpp
index d8d9f45a..cd809b26 100644
--- a/src/qtopia/topicbar.cpp
+++ b/src/qtopia/topicbar.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -38,7 +38,7 @@ TopicBar::TopicBar(QWidget *parent) : QPushButton(parent) {
   fillText = " *** ";
   oneshot = true;
   timer = new QTimer(this);
-  timer->setInterval(20);
+  timer->setInterval(25);
   connect(timer, SIGNAL(timeout()), this, SLOT(updateOffset()));
   connect(this, SIGNAL(clicked()), this, SLOT(startScrolling()));
 }
@@ -67,7 +67,7 @@ void TopicBar::calcTextMetrics() {
     secondTextStart = fillTextStart + boundingRect.width();
     displayText = QString("%1%2%1").arg(text).arg(fillText);
     offset = 0;
-    timer->start();
+    //timer->start();  // uncomment this to get autoscroll rather than on-demand
   }
 }
 
@@ -88,7 +88,7 @@ void TopicBar::paintEvent(QPaintEvent *event) {
 }
 
 void TopicBar::updateOffset() {
-  offset++;
+  offset+=1;
   if(offset >= secondTextStart) {
     offset = 0;
     if(oneshot) timer->stop(); // only scroll once!
@@ -98,7 +98,7 @@ void TopicBar::updateOffset() {
 
 void TopicBar::startScrolling() {
   if(displayText.length() > text.length()) {
-    oneshot = false;
+    //oneshot = false;
     timer->start();
   }
 }