Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Collazo <scollazo@activitycentral.com>2013-01-28 14:42:14 (GMT)
committer Santiago Collazo <scollazo@activitycentral.com>2013-01-28 14:42:14 (GMT)
commit3beab76c44499431551886724aca491ebb75d858 (patch)
tree4d5ad1f0668ba9915d0ba3244291e81b9a5590c3
parent7dab98681faf7fc60e72b306dfb4d0face4a454b (diff)
parent4f2acacc2414173a20965053e1dfa737cebfe8d2 (diff)
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
-rw-r--r--src/sugar3/activity/activity.py14
-rw-r--r--src/sugar3/graphics/window.py1
2 files changed, 1 insertions, 14 deletions
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py
index 3325f47..a0ee86a 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -508,19 +508,7 @@ class Activity(Window, Gtk.Container):
self.move(0, 0)
def _adapt_window_to_screen(self):
- screen = Gdk.Screen.get_default()
- 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)
+ return
def __session_quit_requested_cb(self, session):
self._quit_requested = True
diff --git a/src/sugar3/graphics/window.py b/src/sugar3/graphics/window.py
index 6f19ad7..484f2ff 100644
--- a/src/sugar3/graphics/window.py
+++ b/src/sugar3/graphics/window.py
@@ -90,7 +90,6 @@ class Window(Gtk.Window):
GObject.GObject.__init__(self, **args)
self.set_decorated(False)
- self.maximize()
self.connect('realize', self.__window_realize_cb)
self.connect('key-press-event', self.__key_press_cb)