diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-14 19:24:01 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-08-14 19:24:01 (GMT) |
commit | d93122bf5e8622f6c8ede4b3b80295f9b8511425 (patch) | |
tree | 3eb27e91975eeef66d55df0f7608e28b463f177f /sugar/graphics | |
parent | 7368429ad6feadd9e81757433b68b63d9d27c04f (diff) | |
parent | 0e4eccd49b056e5aebe71ffa46d462e15fd7a883 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/graphics')
-rw-r--r-- | sugar/graphics/style.py | 8 | ||||
-rw-r--r-- | sugar/graphics/xocolor.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sugar/graphics/style.py b/sugar/graphics/style.py index a5186da..c0094b6 100644 --- a/sugar/graphics/style.py +++ b/sugar/graphics/style.py @@ -15,14 +15,20 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. +import os + import gtk import pango def _get_screen_dpi(): xft_dpi = gtk.settings_get_default().get_property('gtk-xft-dpi') - return float(xft_dpi / 1024) + return float(xft_dpi / 1024) def _compute_zoom_factor(): + if os.environ.has_key('SUGAR_XO_STYLE'): + if os.environ['SUGAR_XO_STYLE'] == 'yes': + return 1.0 + return gtk.gdk.screen_width() / 1200.0 def zoom(units): diff --git a/sugar/graphics/xocolor.py b/sugar/graphics/xocolor.py index 3ab029f..ff5a2b5 100644 --- a/sugar/graphics/xocolor.py +++ b/sugar/graphics/xocolor.py @@ -82,7 +82,7 @@ _colors = [ ['#F8E800', '#807500'], \ ['#BE9E00', '#F8E800'], \ ['#F8E800', '#BE9E00'], \ -['#FFFA00', '#F8E800'], \ +['#FFFA00', '#EDDE00'], \ ['#008009', '#F8E800'], \ ['#F8E800', '#008009'], \ ['#00EA11', '#F8E800'], \ |