author | zautrix <zautrix> | 2005-04-05 14:03:26 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 14:03:26 (UTC) |
commit | 637415693af8fe9974b45c355ecfdd0745617ac3 (patch) (unidiff) | |
tree | f7d83828754e82b0eeb001a2837f7c3f6865d647 /korganizer/komonthview.cpp | |
parent | e1fd021493c30106d2a31449d620ab6eaf96f18f (diff) | |
download | kdepimpi-637415693af8fe9974b45c355ecfdd0745617ac3.zip kdepimpi-637415693af8fe9974b45c355ecfdd0745617ac3.tar.gz kdepimpi-637415693af8fe9974b45c355ecfdd0745617ac3.tar.bz2 |
minor pixel fixes
-rw-r--r-- | korganizer/komonthview.cpp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 6d6ae8a..e66ddce 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -1654,13 +1654,23 @@ void KOMonthView::computeLayoutWeek() | |||
1654 | if ( ((i) % daysToShow) >= daysToShow-colModulo ) { | 1654 | if ( ((i) % daysToShow) >= daysToShow-colModulo ) { |
1655 | ++w; | 1655 | ++w; |
1656 | } | 1656 | } |
1657 | if ( i >= 5 ) { | 1657 | if ( i >= 5 ) { |
1658 | mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h); | 1658 | int wi = width() - x - weeklabelwid; |
1659 | x -= (w/2 ); | 1659 | if ( i == 5 ) { |
1660 | mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi/2+wi%2,h); | ||
1661 | } else { | ||
1662 | mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h); | ||
1663 | } | ||
1664 | x = x - w + wi - (wi/2 ); | ||
1665 | } | ||
1666 | else { | ||
1667 | int wi = w; | ||
1668 | if ( !(( i+1) % daysToShow)) { | ||
1669 | wi = width() - x - weeklabelwid; | ||
1670 | } | ||
1671 | mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h); | ||
1660 | } | 1672 | } |
1661 | else | ||
1662 | mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h); | ||
1663 | x += w; | 1673 | x += w; |
1664 | } | 1674 | } |
1665 | x= 0; | 1675 | x= 0; |
1666 | y= dayLabelHei; | 1676 | y= dayLabelHei; |
@@ -1775,8 +1785,12 @@ void KOMonthView::computeLayout() | |||
1775 | if ( i == daysToShow-colModulo ) | 1785 | if ( i == daysToShow-colModulo ) |
1776 | ++w; | 1786 | ++w; |
1777 | if ( combinedSatSun ) { | 1787 | if ( combinedSatSun ) { |
1778 | if ( i >= daysToShow-1 ) { | 1788 | if ( i >= daysToShow-1 ) { |
1789 | |||
1790 | if ( i == 6 ) | ||
1791 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,width()-x-weeklabelwid,h); | ||
1792 | else | ||
1779 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h); | 1793 | mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h); |
1780 | x -= w/2 ; | 1794 | x -= w/2 ; |
1781 | } | 1795 | } |
1782 | else | 1796 | else |
@@ -1800,12 +1814,14 @@ void KOMonthView::computeLayout() | |||
1800 | ++h; | 1814 | ++h; |
1801 | if ( combinedSatSun ) { | 1815 | if ( combinedSatSun ) { |
1802 | if ( (i)%7 >= daysToShow-1 ) { | 1816 | if ( (i)%7 >= daysToShow-1 ) { |
1803 | if ( (i)%7 == daysToShow-1 ) { | 1817 | if ( (i)%7 == daysToShow-1 ) { |
1818 | w = width()-x-weeklabelwid; | ||
1804 | max = h/2; | 1819 | max = h/2; |
1805 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); | 1820 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); |
1806 | x -= w ;y += h/2; | 1821 | x -= w ;y += h/2; |
1807 | } else { | 1822 | } else { |
1823 | w = width()-x-weeklabelwid; | ||
1808 | max = h-h/2; | 1824 | max = h-h/2; |
1809 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); | 1825 | mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); |
1810 | y -= h/2; | 1826 | y -= h/2; |
1811 | } | 1827 | } |