diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-04-07 01:42:51 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-04-07 01:42:51 (GMT) |
| commit | 4828870afd08aef48fa96f7a82076e0fcf5fc2f5 (patch) | |
| tree | 1c8c5d32d942e9339611dd2ff123316e2a34b6cc /sugar | |
| parent | e3cf7aa1d32b4266e0687b9f43d8cc3a1529c7e2 (diff) | |
Use gtk to detect dpi.
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/activity/activity.py | 5 | ||||
| -rw-r--r-- | sugar/graphics/units.py | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 937d686..fc29104 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -32,11 +32,6 @@ class Activity(Window, gtk.Container): def __init__(self, handle): Window.__init__(self) - # FIXME: This will work only for activities in python. We need a xsetting. - display = gtk.gdk.display_manager_get().get_default_display() - screen = display.get_default_screen() - screen.set_resolution(_sugar.get_screen_dpi()) - self.connect('destroy', self._destroy_cb) self._shared = False diff --git a/sugar/graphics/units.py b/sugar/graphics/units.py index 2417255..0e415e2 100644 --- a/sugar/graphics/units.py +++ b/sugar/graphics/units.py @@ -61,19 +61,18 @@ units to device units. import gtk -import _sugar - _MAX_ZOOM_FACTOR = 2.0 _ZOOM_CONSTANT = 650.0 def _compute_zoom_factor(): screen_width = gtk.gdk.screen_width() - if _sugar.get_screen_dpi() == 201.0 and screen_width == 1200: + if _screen_dpi == 201.0 and screen_width == 1200: return 1.0 else: return min(_MAX_ZOOM_FACTOR, screen_width / _ZOOM_CONSTANT) -_screen_dpi = float(_sugar.get_screen_dpi()) +_gtk_xft_dpi = gtk.settings_get_default().get_property('gtk-xft-dpi') +_screen_dpi = float(_gtk_xft_dpi / 1024) _dpi_factor = _screen_dpi / 201.0 _zoom_factor = _compute_zoom_factor() |