wip: port to sourceview

p2panda · Dec 14, 2024 · 21c6d5c · 21c6d5c
1 parent 99bd85c
commit 21c6d5c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aardvark-app/Cargo.toml b/aardvark-app/Cargo.toml
@@ -12,6 +12,7 @@ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.128"
 tokio = { version = "1.42.0", features = ["full"] }
+sourceview = { package = "sourceview5", version = "0.9" }
 
 [dependencies.adw]
 package = "libadwaita"

diff --git a/aardvark-app/src/textbuffer.rs b/aardvark-app/src/textbuffer.rs
@@ -22,8 +22,10 @@ use adw::subclass::prelude::*;
 use glib::subclass::Signal;
 use gtk::glib;
 use gtk::prelude::*;
+use gtk::*;
 use std::cell::Cell;
 use std::sync::OnceLock;
+use sourceview::*;
 
 mod imp {
     use super::*;
@@ -37,7 +39,7 @@ mod imp {
     impl ObjectSubclass for AardvarkTextBuffer {
         const NAME: &'static str = "AardvarkTextBuffer";
         type Type = super::AardvarkTextBuffer;
-        type ParentType = gtk::TextBuffer;
+        type ParentType = sourceview::Buffer;
     }
 
     impl ObjectImpl for AardvarkTextBuffer {
@@ -82,7 +84,7 @@ mod imp {
 
 glib::wrapper! {
     pub struct AardvarkTextBuffer(ObjectSubclass<imp::AardvarkTextBuffer>)
-        @extends gtk::TextBuffer;
+        @extends sourceview::Buffer;
 }
 
 impl AardvarkTextBuffer {

diff --git a/aardvark-app/src/window.rs b/aardvark-app/src/window.rs
@@ -25,6 +25,7 @@ use adw::subclass::prelude::*;
 use glib::subclass::Signal;
 use gtk::prelude::*;
 use gtk::{gio, glib};
+use sourceview::*;
 
 use crate::AardvarkTextBuffer;
 
@@ -36,7 +37,7 @@ mod imp {
     pub struct AardvarkWindow {
         // Template widgets
         #[template_child]
-        pub text_view: TemplateChild<gtk::TextView>,
+        pub text_view: TemplateChild<sourceview::View>,
         #[template_child]
         pub open_document_button: TemplateChild<gtk::Button>,
         #[template_child]
@@ -63,7 +64,7 @@ mod imp {
             self.parent_constructed();
 
             let buffer = AardvarkTextBuffer::new();
-            self.text_view.set_buffer(Some(&buffer));
+            self.text_view.clone().upcast::<gtk::TextView>().set_buffer(Some(&buffer));
 
             let obj = self.obj().clone();
             buffer.connect_changed(move |buffer| {

diff --git a/aardvark-app/src/window.ui b/aardvark-app/src/window.ui
@@ -68,10 +68,11 @@
             <property name="height-request">180</property>
             <property name="width-request">300</property>
             <child>
-              <object class="GtkTextView" id="text_view">
+              <object class="GtkSourceView" id="text_view">
                 <property name="top-margin">6</property>
                 <property name="bottom-margin">12</property>
                 <property name="left-margin">12</property>
+                <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
                 <style>
                   <class name="inline"/>
                   <class name="editor"/>