diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-10-29 10:20:30 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-11-22 12:28:55 (GMT) |
| commit | e88ffabf4bb2c5df8c1764f2888029d00d3de8e8 (patch) | |
| tree | a6b7d77e36f3accd6a41cfcb6bfadf3d7a2802af | |
| parent | e326b7287caeac6a252387594ba3180aa8fb5cc1 (diff) | |
Adapt to changed Gtk.Window.set_geometry_hints() API
Unlike PyGTK [1], GTK3+pygi [2] wants GDK Geometry and WindowHints objects,
rather than individual values.
[1] http://developer.gnome.org/pygtk/stable/class-gtkwindow.html#method-gtkwindow--set-geometry-hints
[2] http://developer.gnome.org/gtk3/3.0/GtkWindow.html#gtk-window-set-geometry-hints
[replaced description, included fix-up commit]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
| -rw-r--r-- | src/sugar3/activity/activity.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py index dfa4e15..3e942d4 100644 --- a/src/sugar3/activity/activity.py +++ b/src/sugar3/activity/activity.py @@ -57,6 +57,7 @@ from functools import partial from gi.repository import GConf from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GObject import dbus import dbus.service @@ -507,11 +508,18 @@ class Activity(Window, Gtk.Container): def _adapt_window_to_screen(self): screen = Gdk.Screen.get_default() - self.set_geometry_hints(None, - screen.get_width(), screen.get_height(), - screen.get_width(), screen.get_height(), - screen.get_width(), screen.get_height(), - 1, 1, 1, 1) + geometry = Gdk.Geometry() + geometry.max_width = geometry.base_width = geometry.min_width = \ + screen.get_width() + geometry.max_height = geometry.base_height = geometry.min_height = \ + screen.get_height() + geometry.width_inc = geometry.height_inc = geometry.min_aspect = \ + geometry.max_aspect = 1 + hints = Gdk.WindowHints(Gdk.WindowHints.ASPECT | + Gdk.WindowHints.BASE_SIZE | + Gdk.WindowHints.MAX_SIZE | + Gdk.WindowHints.MIN_SIZE) + self.set_geometry_hints(None, geometry, hints) def __session_quit_requested_cb(self, session): self._quit_requested = True |