summaryrefslogtreecommitdiff
authorhrw <hrw>2005-09-12 21:17:18 (UTC)
committer hrw <hrw>2005-09-12 21:17:18 (UTC)
commit2b74c3a954389db73827ba2bf0d79b835ec569f1 (patch) (unidiff)
tree3d0268c50d01836aea555803ed4f98538881eafe
parentc94b0601f73dabfb65525b263222d0ccdbd1544c (diff)
downloadopie-2b74c3a954389db73827ba2bf0d79b835ec569f1.zip
opie-2b74c3a954389db73827ba2bf0d79b835ec569f1.tar.gz
opie-2b74c3a954389db73827ba2bf0d79b835ec569f1.tar.bz2
libqpe/datebookmonth selector use too small fontsize on VGA screen.
- now on =>480 screen.width it will use "default_fontsize" - 2 size on smaller screen devices behavior is not changed - close bug #1695
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog11
-rw-r--r--library/datebookmonth.cpp9
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f347db..3b0f1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
1 2005-??-??Opie 1.2.2
2
3
4 New Features
5 ------------
6
7
8 Fixed Bugs
9 ----------
10 * #1695 - Date selector use too small fontsize on VGA screen (hrw)
11
1 2005-09-11Opie 1.2.1 12 2005-09-11Opie 1.2.1
2 13
3 14
4 New Features 15 New Features
5 ------------ 16 ------------
6 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker) 17 * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
7 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly) 18 * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
8 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer) 19 * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index 2616b7b..ffdf335 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -656,17 +656,24 @@ void DayItemMonth::paint( QPainter *p, const QColorGroup &cg,
656 if (x2 < x1 + 2) 656 if (x2 < x1 + 2)
657 x2 = x1 + 2; 657 x2 = x1 + 2;
658 p->fillRect(x1, y, x2 - x1, h, colorRepeat); 658 p->fillRect(x1, y, x2 - x1, h, colorRepeat);
659 } 659 }
660 660
661 661
662 // Finally, draw the number. 662 // Finally, draw the number.
663 QFont f = p->font(); 663 QFont f = p->font();
664 f.setPointSize( ( f.pointSize() / 3 ) * 2 ); 664 if(qApp->desktop()->width() >= 480)
665 {
666 f.setPointSize( f.pointSize() - 2 );
667 }
668 else
669 {
670 f.setPointSize( ( f.pointSize() / 3 ) * 2 );
671 }
665 p->setFont( f ); 672 p->setFont( f );
666 QFontMetrics fm( f ); 673 QFontMetrics fm( f );
667 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) ); 674 p->drawText( 1, 1 + fm.ascent(), QString::number( day() ) );
668 675
669 p->restore(); 676 p->restore();
670} 677}
671 678
672 679