summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-04 22:19:14 (UTC)
committer zautrix <zautrix>2005-07-04 22:19:14 (UTC)
commit671d832454c8b68e0bb44e439f28fb1c768e033d (patch) (side-by-side diff)
treea938029d62ba7d54ee5cb3de0c6cc0cc449dba51 /korganizer
parentd7931731fcf0ffeb5b5267f25fce741ebe1ced13 (diff)
downloadkdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.zip
kdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.tar.gz
kdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.tar.bz2
fixix
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.cpp10
-rw-r--r--korganizer/koagendaitem.cpp6
-rw-r--r--korganizer/koagendaitem.h1
3 files changed, 8 insertions, 9 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 9b817bc..01cef35 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1910,18 +1910,22 @@ void KOAgenda::computeSizes()
}
}
int cw = contentsWidth();
int ch = contentsHeight();
if ( mAllDayMode ) {
QPixmap* paintPixAll = KOAgendaItem::paintPixAllday();
- if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 )
+ if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 ) {
+ //qDebug("paintPixAll->resize ");
paintPixAll->resize( cw, ch );
+ }
} else {
QPixmap* paintPix = KOAgendaItem::paintPix();
- if ( paintPix->width() < cw || paintPix->height() < ch )
- KOAgendaItem::resizePixmap( cw , ch );
+ if ( paintPix->width() < cw || paintPix->height() < ch ) {
+ //qDebug("paintPix->resize ");
+ paintPix->resize( cw , ch );
+ }
}
checkScrollBoundaries();
marcus_bains();
drawContentsToPainter();
viewport()->repaint(false);
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index abb29f7..f855b03 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -467,17 +467,13 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
}
}
pa.end();
}
-void KOAgendaItem::resizePixmap( int w , int h )
-{
- paintPix()->resize( w, h );
-}
QPixmap * KOAgendaItem::paintPix()
{
static QPixmap* mPaintPix = 0;
if ( ! mPaintPix ) {
int w = QApplication::desktop()->width();
int h = QApplication::desktop()->height();
@@ -487,13 +483,13 @@ QPixmap * KOAgendaItem::paintPix()
}
QPixmap * KOAgendaItem::paintPixAllday()
{
static QPixmap* mPaintPixA = 0;
if ( ! mPaintPixA ) {
int w = QApplication::desktop()->width();
- int h = QApplication::desktop()->height()/3;
+ int h = QApplication::desktop()->height()/5;
mPaintPixA = new QPixmap(w,h);
}
return mPaintPixA ;
}
void KOAgendaItem::paintEvent ( QPaintEvent *e )
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 7103abe..3ed68b0 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -98,13 +98,12 @@ class KOAgendaItem : public QWidget
QPtrList<KOAgendaItem> conflictItems();
void setConflictItems(QPtrList<KOAgendaItem>);
void addConflictItem(KOAgendaItem *ci);
void paintMe( bool, QPainter* painter = 0 );
void repaintMe();
- static void resizePixmap( int, int );
static QPixmap * paintPix();
static QPixmap * paintPixAllday();
void updateItem();
void computeText();
void recreateIncidence();
bool checkLayout();