diff --git a/tryton/gui/window/view_form/view/form_gtk/parser.py b/tryton/gui/window/view_form/view/form_gtk/parser.py index 43f5ffade7..33b1d18703 100644 --- a/tryton/gui/window/view_form/view/form_gtk/parser.py +++ b/tryton/gui/window/view_form/view/form_gtk/parser.py @@ -418,6 +418,14 @@ class ParserForm(ParserInterface): widget, widgets, buttons, on_write, notebook_list2, cursor_widget2 = \ self.parse(model, node, fields, notebook, tooltips=tooltips) + max_width, max_height = -1, -1 + for i in range(notebook.get_n_pages()): + width, height = notebook.get_nth_page(i).size_request() + if width > max_width: + max_width = width + if height > max_height: + max_height = height + notebook.set_size_request(max_width + 20, max_height + 20) if not cursor_widget: cursor_widget = cursor_widget2 notebook_list.extend(notebook_list2) diff --git a/tryton/gui/window/view_form/view/screen_container.py b/tryton/gui/window/view_form/view/screen_container.py index d14a66c236..c371079609 100644 --- a/tryton/gui/window/view_form/view/screen_container.py +++ b/tryton/gui/window/view_form/view/screen_container.py @@ -7,16 +7,10 @@ _ = gettext.gettext class ScreenContainer(object): def __init__(self): - self.old_widget = False - self.scrolledwindow = gtk.ScrolledWindow() - self.scrolledwindow.set_shadow_type(gtk.SHADOW_NONE) - self.scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, - gtk.POLICY_AUTOMATIC) self.viewport = gtk.Viewport() self.viewport.set_shadow_type(gtk.SHADOW_NONE) - self.scrolledwindow.add(self.viewport) self.vbox = gtk.VBox(spacing=3) - self.vbox.pack_end(self.scrolledwindow) + self.vbox.pack_end(self.viewport) self.filter_vbox = None self.button = None @@ -74,7 +68,7 @@ class ScreenContainer(object): if self.viewport.get_child(): self.viewport.remove(self.viewport.get_child()) self.viewport.add(widget) - self.scrolledwindow.show_all() + self.viewport.show_all() def size_get(self): return self.viewport.get_child().size_request()