summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-23 17:08:17 (UTC)
committer zautrix <zautrix>2005-08-23 17:08:17 (UTC)
commit789aec1acdf798aea32ab16219a8f19c6155250e (patch) (unidiff)
treefad1651a18ef60d9a4640fd83fc2afad5bdd006c
parente6d678229580cd712ff82ea989e7b151be546dbd (diff)
downloadkdepimpi-789aec1acdf798aea32ab16219a8f19c6155250e.zip
kdepimpi-789aec1acdf798aea32ab16219a8f19c6155250e.tar.gz
kdepimpi-789aec1acdf798aea32ab16219a8f19c6155250e.tar.bz2
layout fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index d8a2134..c1b149f 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -688,64 +688,66 @@ KOAgendaButton* KOAgendaView::getNewDaylabel()
688 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); 688 connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
689 mDayLabelsList.append( dayLabel ); 689 mDayLabelsList.append( dayLabel );
690 mLayoutDayLabels->addWidget(dayLabel); 690 mLayoutDayLabels->addWidget(dayLabel);
691 return dayLabel ; 691 return dayLabel ;
692} 692}
693 693
694void KOAgendaView::createDayLabels() 694void KOAgendaView::createDayLabels()
695{ 695{
696 696
697 if ( mBlockUpdating || globalFlagBlockLabel == 1) { 697 if ( mBlockUpdating || globalFlagBlockLabel == 1) {
698 // qDebug(" KOAgendaView::createDayLabels() blocked "); 698 // qDebug(" KOAgendaView::createDayLabels() blocked ");
699 return; 699 return;
700 700
701 } 701 }
702 int newHight; 702 int newHight;
703 if ( !mSelectedDates.count()) 703 if ( !mSelectedDates.count())
704 return; 704 return;
705 705
706 // ### Before deleting and recreating we could check if mSelectedDates changed... 706 // ### Before deleting and recreating we could check if mSelectedDates changed...
707 // It would remove some flickering and gain speed (since this is called by 707 // It would remove some flickering and gain speed (since this is called by
708 // each updateView() call) 708 // each updateView() call)
709 709
710 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; 710 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2;
711 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); 711 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
712 if ( maxWid < 20 ) 712 if ( maxWid < 20 )
713 maxWid = 20; 713 maxWid = 20;
714 714
715 QFont dlf = KOPrefs::instance()->mTimeLabelsFont; 715 QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
716 QFontMetrics fm ( dlf ); 716 QFontMetrics fm ( dlf );
717 dlf.setBold( true ); 717 dlf.setBold( true );
718 int selCount = mSelectedDates.count(); 718 int selCount = mSelectedDates.count();
719 int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; 719 int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1;
720 if ( widModulo < 0 || widModulo > selCount )
721 widModulo = 0;
720 QString dayTest = "Mon 20"; 722 QString dayTest = "Mon 20";
721 //QString dayTest = "Mon 20"; 723 //QString dayTest = "Mon 20";
722 int wid = fm.width( dayTest ); 724 int wid = fm.width( dayTest );
723 //maxWid -= ( selCount * 3 ); //working for QLabels 725 //maxWid -= ( selCount * 3 ); //working for QLabels
724 if ( QApplication::desktop()->width() <= 320 ) 726 if ( QApplication::desktop()->width() <= 320 )
725 maxWid -= ( selCount * 3 ); //working for QPushButton 727 maxWid -= ( selCount * 3 ); //working for QPushButton
726 else 728 else
727 maxWid -= ( selCount * 4 ); //working for QPushButton 729 maxWid -= ( selCount * 4 ); //working for QPushButton
728 if ( maxWid < 0 ) 730 if ( maxWid < 0 )
729 maxWid = 20; 731 maxWid = 20;
730 int needWid = wid * selCount; 732 int needWid = wid * selCount;
731 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); 733 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid );
732 //if ( needWid > maxWid ) 734 //if ( needWid > maxWid )
733 // qDebug("DAYLABELS TOOOOOOO BIG "); 735 // qDebug("DAYLABELS TOOOOOOO BIG ");
734 while ( needWid > maxWid ) { 736 while ( needWid > maxWid ) {
735 dayTest = dayTest.left( dayTest.length() - 1 ); 737 dayTest = dayTest.left( dayTest.length() - 1 );
736 wid = fm.width( dayTest ); 738 wid = fm.width( dayTest );
737 needWid = wid * selCount; 739 needWid = wid * selCount;
738 } 740 }
739 int maxLen = dayTest.length(); 741 int maxLen = dayTest.length();
740 int fontPoint = dlf.pointSize(); 742 int fontPoint = dlf.pointSize();
741 if ( maxLen < 2 ) { 743 if ( maxLen < 2 ) {
742 int fontPoint = dlf.pointSize(); 744 int fontPoint = dlf.pointSize();
743 while ( fontPoint > 4 ) { 745 while ( fontPoint > 4 ) {
744 --fontPoint; 746 --fontPoint;
745 dlf.setPointSize( fontPoint ); 747 dlf.setPointSize( fontPoint );
746 QFontMetrics f( dlf ); 748 QFontMetrics f( dlf );
747 wid = f.width( "30" ); 749 wid = f.width( "30" );
748 needWid = wid * selCount; 750 needWid = wid * selCount;
749 if ( needWid < maxWid ) 751 if ( needWid < maxWid )
750 break; 752 break;
751 } 753 }