From 4df23d489b8542ecb942e29289d2c28686d9dc9d Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Fri, 26 Mar 2010 22:55:12 +0000
Subject: Get the new contact sizing right despite the scrolled regions. Add
 Claire's calendar popup feedback wrt. express mode

---
 addressbook/gui/contact-editor/contact-editor.ui  |  2 +-
 addressbook/gui/contact-editor/e-contact-editor.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'addressbook/gui/contact-editor')

diff --git a/addressbook/gui/contact-editor/contact-editor.ui b/addressbook/gui/contact-editor/contact-editor.ui
index adc7d466e4..8f64ddb07d 100644
--- a/addressbook/gui/contact-editor/contact-editor.ui
+++ b/addressbook/gui/contact-editor/contact-editor.ui
@@ -1325,7 +1325,7 @@
               </object>
             </child>
 	    <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow2">
+              <object class="GtkScrolledWindow" id="scrolledwindow-size-leader">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index a1c14c2ab2..d540ecd96b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2655,12 +2655,22 @@ sensitize_all (EContactEditor *editor)
 static void
 init_all (EContactEditor *editor)
 {
+	GtkRequisition tab_req;
+
 	init_simple   (editor);
 	init_email    (editor);
 	init_phone    (editor);
 	init_im       (editor);
 	init_personal (editor);
 	init_address  (editor);
+
+	/* with so many scrolled windows, we need to
+	   do some manual sizing */
+	gtk_widget_size_request (
+		e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req);
+	gtk_widget_set_size_request (
+		e_builder_get_widget (editor->builder, "scrolledwindow-size-leader"),
+		tab_req.width, tab_req.height);
 }
 
 static void
-- 
cgit v1.2.3