Font sizes to ensure 0.82 and 0.84 compatibility

2 files changed, 31 insertions, 2 deletions

diff --git a/pippy_app.py b/pippy_app.py
index 2b0569b..bd54ae2 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -28,6 +28,7 @@ import re, os, os.path
 import gobject
 import time
 
+from port.style import font_zoom
 from signal import SIGTERM
 from gettext import gettext as _
 from dbus.service import method, signal
@@ -143,7 +144,7 @@ class PippyActivity(ViewSourceActivity):
         self.text_view.set_cursor_visible(True)
         self.text_view.set_show_line_numbers(True)
         self.text_view.set_wrap_mode(gtk.WRAP_CHAR)
-        self.text_view.modify_font(pango.FontDescription("Monospace 10"))
+        self.text_view.modify_font(pango.FontDescription("Monospace " + str(font_zoom(8))))
 
         # We could change the color theme here, if we want to.
         #mgr = gtksourceview2.style_manager_get_default()
@@ -190,7 +191,7 @@ class PippyActivity(ViewSourceActivity):
         self._vte.set_encoding('utf-8')
         self._vte.set_size(30, 5)
         self._vte.set_size_request(200, 300)
-        font = 'Monospace 10'
+        font = 'Monospace ' + str(font_zoom(8))
         self._vte.set_font(pango.FontDescription(font))
         self._vte.set_colors(gtk.gdk.color_parse ('#000000'),
                              gtk.gdk.color_parse ('#E7E7E7'),
diff --git a/port/style.py b/port/style.py
new file mode 100644
index 0000000..1345ae9
--- /dev/null
+++ b/port/style.py
@@ -0,0 +1,28 @@
+# This program is free software; you can redistribute it and/or modify 
+# it under the terms of the GNU General Public License as published by 
+# the Free Software Foundation; either version 2 of the License, or 
+# (at your option) any later version. 
+# 
+# This program is distributed in the hope that it will be useful, 
+# but WITHOUT ANY WARRANTY; without even the implied warranty of 
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+# GNU General Public License for more details. 
+# 
+# You should have received a copy of the GNU General Public License 
+# along with this program; if not, write to the Free Software 
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+
+""" GUI look&feel related declarations """ 
+from sugar.graphics import style 
+
+def font_zoom(size):
+    """ 21 Returns the proper font size for current Sugar environment
+    NOTE: Use this function only if you are targeting activity for XO with 
+    0.82 Sugar and want non-default font sizes, otherwise just
+    do not mention font sizes in your code
+    """
+
+    if hasattr(style, '_XO_DPI'):
+        return style.zoom(size)
+    else:
+        return size 
\ No newline at end of file