diff options
| author | Raul Gutierrez Segales <rgs@collabora.co.uk> | 2011-09-11 21:36:07 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2011-09-12 10:32:44 (GMT) |
| commit | 203f9af4c2eb188668ae2f8008964033158b62ab (patch) | |
| tree | cabdbe3257c0f3733052cde65714a210d77b5240 | |
| parent | d99b897efc517c432ce2367ce18441cb9cf43464 (diff) | |
Fixed upper frame so it looks right
| -rw-r--r-- | src/jarabe/frame/frame.py | 1 | ||||
| -rw-r--r-- | src/jarabe/frame/framewindow.py | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py index 66fe894..84041a8 100644 --- a/src/jarabe/frame/frame.py +++ b/src/jarabe/frame/frame.py @@ -178,6 +178,7 @@ class Frame(object): panel = self._create_panel(gtk.POS_TOP) zoom_toolbar = ZoomToolbar() + zoom_toolbar.set_size_request(4 * style.GRID_CELL_SIZE, -1) panel.append(zoom_toolbar) zoom_toolbar.show() diff --git a/src/jarabe/frame/framewindow.py b/src/jarabe/frame/framewindow.py index fdd7d04..abc3b3c 100644 --- a/src/jarabe/frame/framewindow.py +++ b/src/jarabe/frame/framewindow.py @@ -90,11 +90,20 @@ class FrameWindow(gtk.Window): screen.connect('size-changed', self._size_changed_cb) def append(self, child, flags=0): - # TODO(rgs): we are swalllowing the flags, we should do something - if self._position == gtk.POS_BOTTOM: - self._container.pack_end(child, True, True) + width, height = child.get_size_request() + + if self._position == gtk.POS_BOTTOM or self._position == gtk.POS_LEFT: + if height == -1: + expand, fill = True, True + else: + expand, fill = False, False + self._container.pack_end(child, expand, fill) else: - self._container.pack_start(child, True, True) + if width == -1: + expand, fill = True, True + else: + expand, fill = False, False + self._container.pack_start(child, expand, fill) def _update_size(self): if self._position == gtk.POS_TOP or self._position == gtk.POS_BOTTOM: |