diff options
| author | John (J5) Palmieri <quinticent@localhost.localdomain> | 2007-08-20 18:41:03 (GMT) |
|---|---|---|
| committer | John (J5) Palmieri <quinticent@localhost.localdomain> | 2007-08-20 18:41:03 (GMT) |
| commit | 655d7f41741d90617aa341db7542153261c9f6e7 (patch) | |
| tree | 88c0df40a8bb109500672136fb7916b34348275b /shell/view/frame/frame.py | |
| parent | 735b0cf2c8a5c85b89a0b82d4fc1f40ec6ab5d12 (diff) | |
| parent | 1a65f81d10186d2f82aafb17533e6b5946761ec8 (diff) | |
Merge branch 'master' of git+ssh://j5@dev.laptop.org/git/sugar
Diffstat (limited to 'shell/view/frame/frame.py')
| -rw-r--r-- | shell/view/frame/frame.py | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/shell/view/frame/frame.py b/shell/view/frame/frame.py index 1c4680e..2582fe6 100644 --- a/shell/view/frame/frame.py +++ b/shell/view/frame/frame.py @@ -208,11 +208,10 @@ class Frame(object): self._right_panel.hover) def _create_top_panel(self): - panel = self._create_panel(hippo.ORIENTATION_HORIZONTAL) - root = panel.get_root() + panel = self._create_panel(gtk.POS_TOP) box = ZoomBox(self._shell) - root.append(box) + panel.append(box) #box = OverlayBox(self._shell) #root.append(box, hippo.PACK_END) @@ -220,25 +219,23 @@ class Frame(object): return panel def _create_bottom_panel(self): - panel = self._create_panel(hippo.ORIENTATION_HORIZONTAL) - root = panel.get_root() + panel = self._create_panel(gtk.POS_BOTTOM) box = ActivitiesBox(self._shell) - root.append(box) + panel.append(box) return panel def _create_right_panel(self): - panel = self._create_panel(hippo.ORIENTATION_VERTICAL) - root = panel.get_root() + panel = self._create_panel(gtk.POS_RIGHT) box = FriendsBox(self._shell) - root.append(box) + panel.append(box) return panel def _create_left_panel(self): - panel = ClipboardPanelWindow(self, hippo.ORIENTATION_VERTICAL) + panel = ClipboardPanelWindow(self, gtk.POS_LEFT) self._connect_to_panel(panel) panel.connect('drag-motion', self._drag_motion_cb) @@ -271,16 +268,16 @@ class Frame(object): screen_w = gtk.gdk.screen_width() self._move_panel(self._top_panel, self._current_position, - 0, - style.GRID_CELL_SIZE, 0, 0) + 0, - self._top_panel.size, 0, 0) self._move_panel(self._bottom_panel, self._current_position, - 0, screen_h, 0, screen_h - style.GRID_CELL_SIZE) + 0, screen_h, 0, screen_h - self._bottom_panel.size) self._move_panel(self._left_panel, self._current_position, - - style.GRID_CELL_SIZE, 0, 0, 0) + - self._left_panel.size, 0, 0, 0) self._move_panel(self._right_panel, self._current_position, - screen_w, 0, screen_w - style.GRID_CELL_SIZE, 0) + screen_w, 0, screen_w - self._right_panel.size, 0) def _hide_completed_cb(self, animator): self.mode = MODE_NONE |