From 637415693af8fe9974b45c355ecfdd0745617ac3 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 05 Apr 2005 14:03:26 +0000
Subject: minor pixel fixes

---
(limited to 'korganizer')

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6d6ae8a..e66ddce 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1654,12 +1654,22 @@ void KOMonthView::computeLayoutWeek()
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
-        if ( i >=  5 ) {
-            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
-            x -= (w/2 );
+        if ( i >=  5 ) { 
+            int wi = width() -  x - weeklabelwid;
+            if ( i == 5 ) { 
+                mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi/2+wi%2,h);
+            } else {
+                mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
+            }
+            x = x - w +  wi - (wi/2 );
+        }
+        else {
+            int wi = w;  
+            if ( !(( i+1) % daysToShow)) {
+                wi = width() -  x - weeklabelwid;
+            }
+            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
         }
-        else
-            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
@@ -1776,7 +1786,11 @@ void KOMonthView::computeLayout()
             ++w;
         if ( combinedSatSun ) {
             if ( i >=  daysToShow-1 ) {
-                mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
+
+                if ( i == 6 )
+                    mDayLabels[i]->setGeometry( x+weeklabelwid,y,width()-x-weeklabelwid,h);
+                else
+                    mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                 x -= w/2 ;
             }
             else
@@ -1801,10 +1815,12 @@ void KOMonthView::computeLayout()
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
+                    w = width()-x-weeklabelwid;
                     max = h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     x -= w ;y += h/2;
                 } else {
+                    w = width()-x-weeklabelwid;
                     max = h-h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     y -= h/2;
--
cgit v0.9.0.2