diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:06:38 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-03-19 20:06:38 (GMT) |
| commit | e20cfb534e276fa7762980bbdd6d633a7ce99ccc (patch) | |
| tree | 747a17e315aee9461ec81ab826b7de500b2d36d6 /src/sugar/graphics/window.py | |
| parent | ea24f196d662e0020a09b5e31c410adb1b7a7600 (diff) | |
| parent | 2778a3bb56bb4509aef529eff0d52f02c554a96c (diff) | |
Merge branch 'tutorial_toolkit' of ssh://mike@bobthebuilder.mine.nu:8080/home/git into tutorial_toolkit
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/core.py
Diffstat (limited to 'src/sugar/graphics/window.py')
| -rw-r--r-- | src/sugar/graphics/window.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/sugar/graphics/window.py b/src/sugar/graphics/window.py index 1ad2bca..a17ebcc 100644 --- a/src/sugar/graphics/window.py +++ b/src/sugar/graphics/window.py @@ -23,6 +23,7 @@ import gobject import gtk from sugar.graphics.icon import Icon +from sugar.tutorius.overlayer import Overlayer class UnfullscreenButton(gtk.Window): @@ -97,9 +98,13 @@ class Window(gtk.Window): self._hbox.pack_start(self._event_box) self._event_box.show() - self.add(self._vbox) +## self.add(self._vbox) self._vbox.show() + self._overlayer = Overlayer(self._vbox) + self.add(self._overlayer) + self._overlayer.show() + self._is_fullscreen = False self._unfullscreen_button = UnfullscreenButton() self._unfullscreen_button.set_transient_for(self) |