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

diff --git a/src/qtopia/topicbar.cpp b/src/qtopia/topicbar.cpp
index 8ad87fa0..d8d9f45a 100644
--- a/src/qtopia/topicbar.cpp
+++ b/src/qtopia/topicbar.cpp
@@ -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);
   connect(timer, SIGNAL(timeout()), this, SLOT(updateOffset()));
+  connect(this, SIGNAL(clicked()), this, SLOT(startScrolling()));
 }
 
 TopicBar::~TopicBar() {
@@ -46,30 +48,42 @@ 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();
   }
 }
 
+// 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);
 
 }
 
@@ -81,3 +95,14 @@ void TopicBar::updateOffset() {
   }
   update();
 }
+
+void TopicBar::startScrolling() {
+  if(displayText.length() > text.length()) {
+    oneshot = false;
+    timer->start();
+  }
+}
+
+void TopicBar::stopScrolling() {
+  oneshot = true;
+}