X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtopia%2Ftopicbar.cpp;h=5fd5cb05d67d9d898459b5413fc00c998ee0fe5b;hp=8ad87fa0622f6d17de6228faedfeddc9b88e42d2;hb=7f26b02f2ffbf9a6ccfb6d50b4cb327f1141ec4a;hpb=4e9a619ab2a22ce3c933fbb36122632debfd415a

diff --git a/src/qtopia/topicbar.cpp b/src/qtopia/topicbar.cpp
index 8ad87fa0..5fd5cb05 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-07 by the Quassel IRC Team                         *
  *   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        *
@@ -34,11 +34,13 @@ TopicBar::TopicBar(QWidget *parent) : QPushButton(parent) {
   frameWidth = 3; // so we hardcode a more reasonable framewidth than 7
   setFixedHeight(QFontMetrics(topicFont).height() + 2*frameWidth);
 
+  textWidth = 0;
   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()));
 }
 
 TopicBar::~TopicBar() {
@@ -46,38 +48,61 @@ TopicBar::~TopicBar() {
 
 }
 
-void TopicBar::setContents(QString t, bool _oneshot) {
-  text = t; oneshot = _oneshot;
+void TopicBar::resizeEvent(QResizeEvent *event) {
+  QPushButton::resizeEvent(event);
+  calcTextMetrics();
+}
+
+void TopicBar::calcTextMetrics() {
   int w = width() - 2*frameWidth;
   QRect boundingRect = QFontMetrics(topicFont).boundingRect(text);
-  if(boundingRect.width() <= w) {
+  textWidth = boundingRect.width();
+  if(textWidth <= w) {
     offset = 0; fillTextStart = -1; secondTextStart = -1;
+    displayText = text;
     timer->stop();
   } else {
-    fillTextStart = boundingRect.width();
+    fillTextStart = textWidth;
     boundingRect = QFontMetrics(topicFont).boundingRect(fillText);
     secondTextStart = fillTextStart + boundingRect.width();
-    text = QString("%1%2%1").arg(text).arg(fillText);
+    displayText = QString("%1%2%1").arg(text).arg(fillText);
     offset = 0;
-    timer->start();
+    //timer->start();  // uncomment this to get autoscroll rather than on-demand
   }
 }
 
+// TODO catch resizeEvent for scroll settings
+void TopicBar::setContents(QString t, bool _oneshot) {
+  text = t; oneshot = _oneshot;
+  calcTextMetrics();
+}
+
 void TopicBar::paintEvent(QPaintEvent *event) {
   QPushButton::paintEvent(event);
 
   QPainter painter(this);
   painter.setFont(topicFont);
   painter.setClipRect(frameWidth, frameWidth, rect().width() - 2*frameWidth, rect().height() - 2*frameWidth);
-  painter.drawText(QPoint(-offset + frameWidth, QFontMetrics(topicFont).ascent() + frameWidth), text);
+  painter.drawText(QPoint(-offset + frameWidth, QFontMetrics(topicFont).ascent() + frameWidth), displayText);
 
 }
 
 void TopicBar::updateOffset() {
-  offset++;
+  offset+=1;
   if(offset >= secondTextStart) {
     offset = 0;
     if(oneshot) timer->stop(); // only scroll once!
   }
   update();
 }
+
+void TopicBar::startScrolling() {
+  if(displayText.length() > text.length()) {
+    //oneshot = false;
+    timer->start();
+  }
+}
+
+void TopicBar::stopScrolling() {
+  oneshot = true;
+}