From 9dad091bc2aaac165de4222459a68e8ebbe6bf55 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 18 May 2011 21:41:21 +0200
Subject: [PATCH] fix bad scrolling in chat window

---
 gtk/chat.c      |  7 ++++++-
 gtk/chatroom.ui | 49 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/gtk/chat.c b/gtk/chat.c
index b81a6aa1..0dafbdb9 100644
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -68,7 +68,12 @@ void linphone_gtk_push_text(GtkTextView *v, const char *from, const char *messag
 	gtk_text_buffer_get_end_iter(b,&iter);
 	gtk_text_buffer_insert(b,&iter,"\n",-1);
 	gtk_text_buffer_get_end_iter(b,&iter);
-	gtk_text_view_scroll_to_iter(v,&iter,0,FALSE,0,0);
+	
+	GtkTextMark *mark=gtk_text_buffer_create_mark(b,NULL,&iter,FALSE);
+	gtk_text_view_scroll_mark_onscreen(v,mark);
+	//gtk_text_buffer_get_end_iter(b,&iter);
+	//gtk_text_iter_forward_to_line_end(&iter);
+	//gtk_text_view_scroll_to_iter(v,&iter,0,TRUE,1.0,1.0);
 }
 
 const char* linphone_gtk_get_used_identity(){
diff --git a/gtk/chatroom.ui b/gtk/chatroom.ui
index 6322d09c..dc392710 100644
--- a/gtk/chatroom.ui
+++ b/gtk/chatroom.ui
@@ -1,20 +1,32 @@
-<?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Wed Jul 30 15:51:13 2008 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="chatroom">
-    <signal handler="linphone_gtk_chat_destroyed" name="destroy"/>
+    <signal name="destroy" handler="linphone_gtk_chat_destroyed"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <object class="GtkTextView" id="textlog">
-            <property name="width_request">200</property>
-            <property name="height_request">200</property>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="editable">False</property>
-            <property name="wrap_mode">GTK_WRAP_WORD</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <object class="GtkTextView" id="textlog">
+                <property name="width_request">400</property>
+                <property name="height_request">200</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="wrap_mode">word</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkHBox" id="hbox1">
@@ -24,15 +36,18 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
-                <signal handler="linphone_gtk_send_text" name="activate"/>
+                <signal name="activate" handler="linphone_gtk_send_text"/>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="send">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal handler="linphone_gtk_send_text" name="clicked"/>
+                <signal name="clicked" handler="linphone_gtk_send_text"/>
                 <child>
                   <object class="GtkHBox" id="hbox2">
                     <property name="visible">True</property>
@@ -41,6 +56,9 @@
                         <property name="visible">True</property>
                         <property name="stock">gtk-ok</property>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label1">
@@ -71,18 +89,21 @@
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
                 <property name="use_stock">True</property>
-                <signal handler="linphone_gtk_chat_close" name="clicked"/>
+                <signal name="clicked" handler="linphone_gtk_chat_close"/>
               </object>
               <packing>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
-- 
2.39.2