author | zautrix <zautrix> | 2005-07-04 22:19:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-04 22:19:14 (UTC) |
commit | 671d832454c8b68e0bb44e439f28fb1c768e033d (patch) (unidiff) | |
tree | a938029d62ba7d54ee5cb3de0c6cc0cc449dba51 /korganizer | |
parent | d7931731fcf0ffeb5b5267f25fce741ebe1ced13 (diff) | |
download | kdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.zip kdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.tar.gz kdepimpi-671d832454c8b68e0bb44e439f28fb1c768e033d.tar.bz2 |
fixix
-rw-r--r-- | korganizer/koagenda.cpp | 10 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 6 | ||||
-rw-r--r-- | korganizer/koagendaitem.h | 1 |
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 | |||
@@ -1912,14 +1912,18 @@ void KOAgenda::computeSizes() | |||
1912 | int cw = contentsWidth(); | 1912 | int cw = contentsWidth(); |
1913 | int ch = contentsHeight(); | 1913 | int ch = contentsHeight(); |
1914 | if ( mAllDayMode ) { | 1914 | if ( mAllDayMode ) { |
1915 | QPixmap* paintPixAll = KOAgendaItem::paintPixAllday(); | 1915 | QPixmap* paintPixAll = KOAgendaItem::paintPixAllday(); |
1916 | if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 ) | 1916 | if ( (paintPixAll->width() < cw || paintPixAll->height() < ch) && cw > 0 && ch > 0 ) { |
1917 | //qDebug("paintPixAll->resize "); | ||
1917 | paintPixAll->resize( cw, ch ); | 1918 | paintPixAll->resize( cw, ch ); |
1919 | } | ||
1918 | } else { | 1920 | } else { |
1919 | QPixmap* paintPix = KOAgendaItem::paintPix(); | 1921 | QPixmap* paintPix = KOAgendaItem::paintPix(); |
1920 | if ( paintPix->width() < cw || paintPix->height() < ch ) | 1922 | if ( paintPix->width() < cw || paintPix->height() < ch ) { |
1921 | KOAgendaItem::resizePixmap( cw , ch ); | 1923 | //qDebug("paintPix->resize "); |
1924 | paintPix->resize( cw , ch ); | ||
1925 | } | ||
1922 | } | 1926 | } |
1923 | 1927 | ||
1924 | checkScrollBoundaries(); | 1928 | checkScrollBoundaries(); |
1925 | marcus_bains(); | 1929 | marcus_bains(); |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index abb29f7..f855b03 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -469,13 +469,9 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint ) | |||
469 | } | 469 | } |
470 | pa.end(); | 470 | pa.end(); |
471 | 471 | ||
472 | } | 472 | } |
473 | void KOAgendaItem::resizePixmap( int w , int h ) | ||
474 | { | ||
475 | paintPix()->resize( w, h ); | ||
476 | 473 | ||
477 | } | ||
478 | QPixmap * KOAgendaItem::paintPix() | 474 | QPixmap * KOAgendaItem::paintPix() |
479 | { | 475 | { |
480 | static QPixmap* mPaintPix = 0; | 476 | static QPixmap* mPaintPix = 0; |
481 | if ( ! mPaintPix ) { | 477 | if ( ! mPaintPix ) { |
@@ -489,9 +485,9 @@ QPixmap * KOAgendaItem::paintPixAllday() | |||
489 | { | 485 | { |
490 | static QPixmap* mPaintPixA = 0; | 486 | static QPixmap* mPaintPixA = 0; |
491 | if ( ! mPaintPixA ) { | 487 | if ( ! mPaintPixA ) { |
492 | int w = QApplication::desktop()->width(); | 488 | int w = QApplication::desktop()->width(); |
493 | int h = QApplication::desktop()->height()/3; | 489 | int h = QApplication::desktop()->height()/5; |
494 | mPaintPixA = new QPixmap(w,h); | 490 | mPaintPixA = new QPixmap(w,h); |
495 | } | 491 | } |
496 | return mPaintPixA ; | 492 | return mPaintPixA ; |
497 | } | 493 | } |
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index 7103abe..3ed68b0 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h | |||
@@ -100,9 +100,8 @@ class KOAgendaItem : public QWidget | |||
100 | void setConflictItems(QPtrList<KOAgendaItem>); | 100 | void setConflictItems(QPtrList<KOAgendaItem>); |
101 | void addConflictItem(KOAgendaItem *ci); | 101 | void addConflictItem(KOAgendaItem *ci); |
102 | void paintMe( bool, QPainter* painter = 0 ); | 102 | void paintMe( bool, QPainter* painter = 0 ); |
103 | void repaintMe(); | 103 | void repaintMe(); |
104 | static void resizePixmap( int, int ); | ||
105 | static QPixmap * paintPix(); | 104 | static QPixmap * paintPix(); |
106 | static QPixmap * paintPixAllday(); | 105 | static QPixmap * paintPixAllday(); |
107 | void updateItem(); | 106 | void updateItem(); |
108 | void computeText(); | 107 | void computeText(); |