Diffstat (limited to 'noncore/apps/opie-reader/FontControl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/FontControl.cpp | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/noncore/apps/opie-reader/FontControl.cpp b/noncore/apps/opie-reader/FontControl.cpp index cfa8534..d082898 100644 --- a/noncore/apps/opie-reader/FontControl.cpp +++ b/noncore/apps/opie-reader/FontControl.cpp | |||
@@ -1,30 +1,40 @@ | |||
1 | #include <qfontdatabase.h> | ||
2 | #include "opie.h" | ||
3 | #include "useqpe.h" | ||
1 | #include "FontControl.h" | 4 | #include "FontControl.h" |
2 | 5 | ||
3 | int FontControl::gzoom() | 6 | int FontControl::gzoom() |
4 | { | 7 | { |
5 | int ret; | 8 | if (m_fixgraphics) |
6 | if (m_size == g_size) | ||
7 | { | 9 | { |
8 | ret = m_fontsizes[m_size]*m_basesize; | 10 | return 100; |
9 | } | 11 | } |
10 | else if (g_size < 0) | 12 | else |
11 | { | 13 | { |
12 | int f = -g_size; | 14 | int ret; |
13 | ret = (m_fontsizes[0]*m_basesize) >> (f/2); | 15 | if (m_size == g_size) |
14 | if (f%2) ret = (2*ret/3); | 16 | { |
15 | } | 17 | ret = m_fontsizes[m_size]*m_basesize; |
16 | else | 18 | } |
17 | { | 19 | else if (g_size < 0) |
18 | int f = g_size - m_maxsize + 1; | 20 | { |
19 | ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2); | 21 | int f = -g_size; |
20 | if (f%2) ret = (3*ret/2); | 22 | ret = (m_fontsizes[0]*m_basesize) >> (f/2); |
23 | if (f%2) ret = (2*ret/3); | ||
24 | } | ||
25 | else | ||
26 | { | ||
27 | int f = g_size - m_maxsize + 1; | ||
28 | ret = (m_fontsizes[m_maxsize-1]*m_basesize) << (f/2); | ||
29 | if (f%2) ret = (3*ret/2); | ||
30 | } | ||
31 | return ret; | ||
21 | } | 32 | } |
22 | return ret; | ||
23 | } | 33 | } |
24 | 34 | ||
25 | bool FontControl::ChangeFont(QString& n, int tgt) | 35 | bool FontControl::ChangeFont(QString& n, int tgt) |
26 | { | 36 | { |
27 | QValueList<int>::Iterator it; | 37 | QValueList<int>::Iterator it; |
28 | QFontDatabase fdb; | 38 | QFontDatabase fdb; |
29 | QValueList<int> sizes = fdb.pointSizes(n); | 39 | QValueList<int> sizes = fdb.pointSizes(n); |
30 | if (sizes.count() == 0) | 40 | if (sizes.count() == 0) |