Incorporated TimWs current source tree and make it compile

1 files changed, 56 insertions, 7 deletions

diff --git a/noncore/apps/opie-reader/FontControl.h b/noncore/apps/opie-reader/FontControl.h
index 02049d0..5681496 100644
--- a/noncore/apps/opie-reader/FontControl.h
+++ b/noncore/apps/opie-reader/FontControl.h
@@ -10,10 +10,16 @@ class FontControl
     int * m_fontsizes;
-    int m_size;
+    int m_size, g_size;
     QString m_fontname;
+    QString m_fixedfontname;
     int m_maxsize;
     bool m_hasCourier;
+    int m_leading, m_extraspace;
+    unsigned char m_basesize;
  public:
+    void setBaseSize(unsigned char _s) { m_basesize = _s; }
+    unsigned char getBaseSize() { return m_basesize; }
+    int gzoom();
     FontControl(QString n = "helvetica", int size = 10)
         :
-        m_fontsizes(NULL), m_hasCourier(false)
+        m_fontsizes(NULL), m_hasCourier(false), m_leading(0), m_extraspace(0)
     {
@@ -25,3 +31,8 @@ class FontControl
         }
-    void hasCourier(bool _b) { m_hasCourier = _b; }
+    void hasCourier(bool _b, const QString& _nm)
+        {
+            m_hasCourier = _b;
+            m_fixedfontname = _nm;
+        }
+    QString& fixedfontname() { return m_fixedfontname; }
     bool hasCourier() { return m_hasCourier; }
@@ -29,3 +40,3 @@ class FontControl
     int currentsize() { return m_fontsizes[m_size]; }
-    int getsize(CStyle size)
+    int getsize(const CStyle& size)
         {
@@ -48,3 +59,3 @@ class FontControl
     }
-    int ascent(CStyle ch)
+    int ascent(const CStyle& ch)
     {
@@ -60,3 +71,3 @@ class FontControl
     }
-    int descent(CStyle ch)
+    int descent(const CStyle& ch)
     {
@@ -72,3 +83,3 @@ class FontControl
     }
-    int lineSpacing(CStyle ch)
+    int lineSpacing(const CStyle& ch)
     {
@@ -80,2 +91,3 @@ class FontControl
         {
+/*
             if (--m_size < 0)
@@ -86,2 +98,12 @@ class FontControl
             else return true;
+*/
+            if (g_size-- == m_size)
+            {
+                if (--m_size < 0)
+                {
+                    m_size = 0;
+                }
+            }
+        //    qDebug("Font:%d Graphics:%d", m_size, g_size);
+            return true;
         }
@@ -89,2 +111,3 @@ class FontControl
         {
+/*
             if (++m_size >= m_maxsize)
@@ -95,2 +118,12 @@ class FontControl
             else return true;
+*/
+            if (g_size++ == m_size)
+            {
+                if (++m_size >= m_maxsize)
+                {
+                    m_size = m_maxsize - 1;
+                }
+            }
+        //    qDebug("Font:%d Graphics:%d", m_size, g_size);
+            return true;
         }
@@ -101,2 +134,18 @@ class FontControl
     bool ChangeFont(QString& n, int tgt);
+    void setlead(int _lead)
+        {
+            m_leading = _lead;
+        }
+    int getlead()
+        {
+            return m_leading;
+        }
+    void setextraspace(int _lead)
+        {
+            m_extraspace = _lead;
+        }
+    int getextraspace()
+        {
+            return m_extraspace;
+        }
 };