summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-02-16 20:23:42 (UTC)
committer llornkcor <llornkcor>2003-02-16 20:23:42 (UTC)
commitb24a37c7e412cdf49f5d93c8ab51786b6cda24fb (patch) (side-by-side diff)
tree3a4240d95dd2d2055a963e7a70703b69b19eb604
parent0a64464dc16e6167402590ea8c30d9d56d9e5c3f (diff)
downloadopie-b24a37c7e412cdf49f5d93c8ab51786b6cda24fb.zip
opie-b24a37c7e412cdf49f5d93c8ab51786b6cda24fb.tar.gz
opie-b24a37c7e412cdf49f5d93c8ab51786b6cda24fb.tar.bz2
attempt to fix bug. please test
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/oticker.cpp25
1 files changed, 20 insertions, 5 deletions
diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index 6cd0dc8..9a7044d 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -1,124 +1,139 @@
/*
                This file is part of the Opie Project
Copyright (c) 2002 L. Potter <ljp@llornkcor.com>
=.
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU General Public
.="- .-=="i,     .._ License as published by the Free Software
 - .   .-<_>     .<> Foundation; either version 2 of the License,
     ._= =}       : or (at your option) any later version.
    .%`+i>       _;_.
    .i_,=:_.      -<s. This program is distributed in the hope that
     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
    : ..    .:,     . . . without even the implied warranty of
    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
..}^=.=       =       ; Library General Public License for more
++=   -.     .`     .: details.
 :     =  ...= . :.=-
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-=` this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qwidget.h>
#include <qpixmap.h>
#include <qbutton.h>
#include <qpainter.h>
#include <qframe.h>
#include <qlayout.h>
#include <qdir.h>
#include <stdlib.h>
#include <stdio.h>
#include "oticker.h"
OTicker::OTicker( QWidget* parent )
: QLabel( parent ) {
// : QFrame( parent ) {
setTextFormat(Qt::RichText);
Config cfg("qpe");
cfg.setGroup("Appearance");
backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
foregroundcolor= Qt::black;
updateTimerTime = 50;
scrollLength = 1;
}
OTicker::~OTicker() {
}
void OTicker::setBackgroundColor(QColor backcolor) {
backgroundcolor = backcolor;
update();
}
void OTicker::setForegroundColor(QColor backcolor) {
foregroundcolor = backcolor;
update();
}
void OTicker::setFrame(int frameStyle) {
setFrameStyle( frameStyle/*WinPanel | Sunken */);
update();
}
void OTicker::setText( const QString& text ) {
pos = 0; // reset it everytime the text is changed
scrollText = text;
-
- int pixelLen = fontMetrics().width( text );
- QPixmap pm( pixelLen, contentsRect().height() );
+qDebug(scrollText);
+
+ int pixelLen = 0;
+ bool bigger = false;
+ int contWidth = contentsRect().width();
+ int contHeight = contentsRect().height();
+ int pixelTextLen = fontMetrics().width( text );
+ printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length());
+ if( pixelTextLen < contWidth)
+ {
+ pixelLen = contWidth;
+ }
+ else
+ {
+ bigger = true;
+ pixelLen = pixelTextLen;
+ }
+ QPixmap pm( pixelLen, contHeight);
// pm.fill( QColor( 167, 212, 167 ));
pm.fill(backgroundcolor);
QPainter pmp( &pm );
pmp.setPen(foregroundcolor );
- pmp.drawText( 0, 0, pixelLen, contentsRect().height(), AlignVCenter, scrollText );
+ pmp.drawText( 0, 0, pixelTextLen, contHeight, AlignVCenter, scrollText );
pmp.end();
scrollTextPixmap = pm;
killTimers();
// qDebug("Scrollupdate %d", updateTimerTime);
- if ( pixelLen > contentsRect().width() )
+ if ( bigger /*pixelTextLen > contWidth*/ )
startTimer( updateTimerTime);
update();
}
void OTicker::timerEvent( QTimerEvent * ) {
pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1;
repaint( FALSE );
}
void OTicker::drawContents( QPainter *p ) {
int pixelLen = scrollTextPixmap.width();
p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap );
if ( pixelLen > contentsRect().width() ) // Scrolling
p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap );
}
void OTicker::mouseReleaseEvent( QMouseEvent * ) {
// qDebug("<<<<<<<>>>>>>>>>");
emit mousePressed();
}
void OTicker::setUpdateTime(int time) {
updateTimerTime=time;
}
void OTicker::setScrollLength(int len) {
scrollLength=len;
}