Changeset 1277
- Timestamp:
- 11/29/06 02:15:40
- Files:
-
- trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (2 diffs)
- trunk/libtinymailui-gtk/tny-gtk-msg-window.c (modified) (3 diffs)
- trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (2 diffs)
- trunk/tinymail/tny-demoui-summary-view.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libtinymailui-gtk/tny-gtk-msg-view.c
r1276 r1277 764 764 } 765 765 766 static GtkWidget*767 get_non_inline_container (TnyGtkMsgView *self, GtkBox *kid)768 {769 GtkWidget *widget = gtk_scrolled_window_new (NULL, NULL);770 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget),771 GTK_SHADOW_NONE);772 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),773 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);774 gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (widget),775 GTK_WIDGET (kid));776 777 gtk_widget_show (widget);778 779 return widget;780 }781 766 782 767 static void … … 829 814 830 815 /* Default is a non-online viewer */ 831 gtk_container_add (GTK_CONTAINER (self), get_non_inline_container (self,vbox));816 gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (vbox)); 832 817 833 818 gtk_widget_show (GTK_WIDGET (vbox)); trunk/libtinymailui-gtk/tny-gtk-msg-window.c
r1235 r1277 46 46 { 47 47 TnyMsgView *msg_view; 48 GtkScrolledWindow *widget; 48 49 }; 49 50 … … 221 222 222 223 /* This adds a reference to msgview (it's a gtkwidget) */ 223 gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (priv->msg_view)); 224 gtk_scrolled_window_add_with_viewport (priv->widget, 225 GTK_WIDGET (msgview)); 226 224 227 gtk_widget_show (GTK_WIDGET (priv->msg_view)); 225 228 … … 227 230 } 228 231 232 229 233 static void 230 234 tny_gtk_msg_window_instance_init (GTypeInstance *instance, gpointer g_class) 231 235 { 232 236 TnyGtkMsgWindow *self = (TnyGtkMsgWindow *)instance; 237 TnyGtkMsgWindowPriv *priv = TNY_GTK_MSG_WINDOW_GET_PRIVATE (self); 238 GtkWidget *widget = gtk_scrolled_window_new (NULL, NULL); 233 239 234 240 gtk_window_set_default_size (GTK_WINDOW (self), 640, 480); 241 242 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), 243 GTK_SHADOW_NONE); 244 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), 245 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 246 247 gtk_widget_show (widget); 248 priv->widget = GTK_SCROLLED_WINDOW (widget); 249 250 gtk_container_add (GTK_CONTAINER (self), widget); 235 251 236 252 return; trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c
r1235 r1277 54 54 } 55 55 56 static void57 parent_size_alloc (GtkWidget *widget, GtkAllocation *allocation, gpointer user_data)58 {59 if (GTK_IS_WIDGET (user_data))60 {61 gtk_widget_set_usize(GTK_WIDGET (user_data),62 widget->allocation.width>11?widget->allocation.width-10:1,63 widget->allocation.height>11?widget->allocation.height-10:1);64 }65 }66 67 static void68 size_to_callback (GtkMozEmbed *mozilla, gint width, gint height, TnyMsgView *self)69 {70 gtk_widget_set_usize (GTK_WIDGET (mozilla), width, height);71 }72 56 73 57 /** … … 94 78 95 79 retval = tny_moz_embed_html_mime_part_view_new (); 96 97 g_signal_connect (GTK_OBJECT (retval), "size_to",98 G_CALLBACK (size_to_callback), self);99 g_signal_connect (G_OBJECT (self), "size_allocate",100 G_CALLBACK (parent_size_alloc), retval);101 80 102 81 gtk_widget_set_usize(GTK_WIDGET (retval), trunk/tinymail/tny-demoui-summary-view.c
r1262 r1277 591 591 TnyPlatformFactory *platfact; 592 592 GtkVBox *vbox = GTK_VBOX (self); 593 GtkWidget *mailbox_sw ;593 GtkWidget *mailbox_sw, *widget; 594 594 GtkWidget *header_sw; 595 595 GtkCellRenderer *renderer; … … 649 649 650 650 gtk_widget_show (GTK_WIDGET (priv->msg_view)); 651 gtk_paned_pack2 (GTK_PANED (vpaned1), GTK_WIDGET (priv->msg_view), TRUE, TRUE); 651 652 widget = gtk_scrolled_window_new (NULL, NULL); 653 gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), 654 GTK_SHADOW_NONE); 655 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), 656 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 657 gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (widget), 658 GTK_WIDGET (priv->msg_view)); 659 660 gtk_widget_show (widget); 661 662 gtk_paned_pack2 (GTK_PANED (vpaned1), widget, TRUE, TRUE); 652 663 653 664 priv->account_view = GTK_COMBO_BOX (gtk_combo_box_new ());
