layout fixes

6 files changed, 36 insertions, 9 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 548c364..d1caff3 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -45,16 +45,18 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
   mNavigatorView = new KDateNavigator( this, name );
 
   connectNavigatorView( mNavigatorView );
   //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
   mLastDisplayedDN = 0;
   mUpdateTimer; 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
+  mFirstSelectedDate = QDate::currentDate();
+  mSelectedDateCount = 1;
 }
 
 DateNavigatorContainer::~DateNavigatorContainer()
 {
 }
 
 void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v )
 {
@@ -135,25 +137,25 @@ void DateNavigatorContainer::setCalendar( Calendar *cal )
   mNavigatorView->setCalendar( cal );
   for( uint i = 0; i < mLastDisplayedDN; ++i ) {
       KDateNavigator *n = mExtraViews.at( i );
       n->setCalendar( cal );
   }
 }
 void DateNavigatorContainer::checkUpdateDayMatrixDates()
 { 
-    qDebug("wid %d  hei %d ", width(), height());
+    //qDebug("KODNC: wid %d  hei %d ", width(), height());
     mUpdateTimer->stop();
     //return;
     if ( width() < 3 || height() < 3 )
         return;
     static int lastWid = 0;
     static int lastHei = 0;
     if ( lastWid == width() && height() == lastHei ) {
-        qDebug("no layout computing needed. ");
+        qDebug("KODNC: No layout computing needed. ");
     } else {
         lastWid = width();
         lastHei = height();
 
         QSize minSize = mNavigatorView->yourSizeHint();
 
         int verticalCount = size().height() / minSize.height();
         int horizontalCount = size().width() / minSize.width();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7e6fa48..82d1eab 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -499,25 +499,25 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
             paintFrom =  paintPix();
     }
     xx += rx;
 
     if ( xx < 0 ) {
         rw = rw + xx;
         rx -= xx;
         xx = 0;
-        if ( rw < 0 ) {
-            qDebug("KOAgendaItem::Width1 < 0. Returning ");
+        if ( rw <= 1  ) {
+            qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
             return;
         }
     }
     if ( paintFrom->width() <   xx+rw ) {
         rw =  paintFrom->width() - xx;
-        if ( rw < 0 ) {
-            qDebug("KOAgendaItem::Width2 < 0. Returning ");
+        if ( rw <= 1 ) {
+            qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
             return;
         }
     }
     //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
     bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
 }
 void KOAgendaItem::computeText()
 {
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index eb3a6cd..5508210 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -262,16 +262,17 @@ EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
     mTopBox = 0;
     mLocation = loc;
     mTopLayout = 0;
     mPaintWidget = 0;
     mXOffset = 0;
     if (mLocation == Top) mPixmap = SmallIcon("1uparrow");
     else mPixmap = SmallIcon("1downarrow");
     mEnabled.resize(mColumns);
+    mEnabled.fill( false );
     setMinimumHeight(mPixmap.height());
 }
 
 EventIndicator::~EventIndicator()
 {
 }
 
 void EventIndicator::drawContents(QPainter *p)
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9fd1f68..8ee5bc3 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -989,16 +989,21 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 #if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 #endif
 
     emit incidenceSelected( 0 );
+
+    mComputeLayoutTimer = new QTimer( this );
+    connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
+
+
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
     updatePossible = true;
 #endif
     computeLayout();
 
@@ -1346,23 +1351,35 @@ void KOMonthView::updateView()
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
-    //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+    qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+    if ( isVisible() ) {
+        qDebug("KOMonthView::isVisible ");
+        slotComputeLayout();
+    } else
+        mComputeLayoutTimer->start( 100 );
+}
+
+void KOMonthView::slotComputeLayout()
+{
+    mComputeLayoutTimer->stop();
+  qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
         mCellsW[0]->setFocus();
     else
         mCells[0]->setFocus();
+
 }
 void KOMonthView::computeLayoutWeek()
 {
     static int lastWid = 0;
     static int lastHei = 0;
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
@@ -1373,18 +1390,20 @@ void KOMonthView::computeLayoutWeek()
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
      
-    if ( lastWid == width() && lastHei == height() )
+    if ( lastWid == width() && lastHei == height() ) {
+        qDebug("KOListWeekView::No compute layout needed ");
         return;
+    }
     lastWid = width();
     lastHei = height();
 
 
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
@@ -1500,22 +1519,23 @@ void KOMonthView::computeLayout()
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
         return;  
     }
     if ( lastWid == width() && lastHei == height() ){
+        qDebug("KOMonthview::No compute layout needed ");
         return;
     }
 
     lastWid = width();
     lastHei =  height();
-    //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
+    qDebug("KOMonthView::computeLayout() MMM ------------------- ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index a92421b..89912e0 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -22,16 +22,17 @@
 
 #include <qlabel.h>
 #include <qframe.h>
 #include <qdatetime.h>
 #include <qlistbox.h>
 #include <qpoint.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
+#include <qtimer.h>
 #include <qintdict.h>
 #include <qpushbutton.h>
 #include <qvaluelist.h>
 #include <qptrvector.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
@@ -246,30 +247,32 @@ class KOMonthView: public KOEventView
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
     void switchView();
 
   protected slots:
+    void slotComputeLayout();
     void selectInternalWeekNum ( int );
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
+    QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index cc0ce9b..94d74f1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -236,16 +236,17 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
     if ( fullScreen ) {
         mMainView->leftFrame()->hide();
     } else {
         mMainView->leftFrame()->show();
     }
+    //if ( mCurrentView == mMonthView )  qApp->processEvents();
     emit signalFullScreen( !fullScreen );
     if ( callUpdateView )
         mMainView->updateView();
         
     if ( globalFlagBlockAgenda ==  5 ) {
         globalFlagBlockAgenda =  4;
         globalFlagBlockAgendaItemPaint = 1;
     }