From a62d193edfba7af895389a23cdffcca4591f09e8 Mon Sep 17 00:00:00 2001
From: jeffser <jeffrywalfa@gmail.com>
Date: Wed, 22 May 2024 13:22:46 -0600
Subject: [PATCH] Scroll to bottom when message is sent (kinda)

---
 src/window.py | 11 ++++++++---
 src/window.ui |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/window.py b/src/window.py
index a6a9f7f..610ba71 100644
--- a/src/window.py
+++ b/src/window.py
@@ -158,7 +158,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
             css_classes=[None if bot else "card"]
         )
         message_text.set_valign(Gtk.Align.CENTER)
-        self.chat_container.append(message_box)
+
 
         if image_base64 is not None:
             image_data = base64.b64decode(image_base64)
@@ -179,6 +179,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
             message_box.append(image)
 
         message_box.append(message_text)
+        self.chat_container.append(message_box)
 
         if bot:
             self.bot_message = message_buffer
@@ -415,11 +416,15 @@ class AlpacaWindow(Adw.ApplicationWindow):
             self.export_chat_button.set_sensitive(False)
             self.import_chat_button.set_sensitive(False)
             self.image_button.set_sensitive(False)
+
             self.show_message(self.message_text_view.get_buffer().get_text(self.message_text_view.get_buffer().get_start_iter(), self.message_text_view.get_buffer().get_end_iter(), False), False, f"\n\n<small>{formated_datetime}</small>", self.attached_image["base64"])
             self.message_text_view.get_buffer().set_text("", 0)
-            self.show_message("", True)
             self.loading_spinner = Gtk.Spinner(spinning=True, margin_top=12, margin_bottom=12, hexpand=True)
             self.chat_container.append(self.loading_spinner)
+            self.show_message("", True)
+
+            vadjustment = self.chat_window.get_vadjustment()
+            vadjustment.set_value(vadjustment.get_upper())
             thread = threading.Thread(target=self.run_message, args=(data['messages'], data['model']))
             thread.start()
 
@@ -838,7 +843,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         self.preferences_dialog.present(self)
 
     def start_instance(self):
-        self.ollama_instance = subprocess.Popen(["/app/bin/ollama", "serve"], env={**os.environ, 'OLLAMA_HOST': f"127.0.0.1:{self.local_ollama_port}", "HOME": self.data_dir}, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        self.ollama_instance = subprocess.Popen(["/app/bin/ollama", "serve"], env={**os.environ, 'OLLAMA_HOST': f"127.0.0.1:{self.local_ollama_port}", "HOME": self.data_dir}, stderr=subprocess.PIPE, text=True)
         sleep(1)
         while True:
             err = self.ollama_instance.stderr.readline()
diff --git a/src/window.ui b/src/window.ui
index cc94469..e15748b 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -168,14 +168,14 @@
                     <child>
                       <object class="GtkScrolledWindow" id="chat_window">
                         <property name="margin-bottom">12</property>
-                        <property name="propagate-natural-height">true</property>
-                        <property name="kinetic-scrolling">1</property>
+                        <property name="propagate-natural-height">false</property>
+                        <property name="kinetic-scrolling">true</property>
                         <property name="vexpand">true</property>
                         <child>
                           <object class="GtkBox" id="chat_container">
                             <property name="orientation">1</property>
                             <property name="homogeneous">false</property>
-                            <property name="hexpand">false</property>
+                            <property name="hexpand">true</property>
                             <property name="vexpand">true</property>
                             <property name="spacing">12</property>
                             <property name="margin-top">12</property>