From 621e9d75eb99f9a6825f4660f7e3f4e9c4586d8e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 1 Nov 2023 09:44:11 -0600
Subject: [PATCH] Rename wrap setting to word_wrap

---
 src/config.rs | 6 +++---
 src/main.rs   | 6 +++---
 src/menu.rs   | 2 +-
 src/tab.rs    | 8 +++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index d711ae5..50fc288 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -39,7 +39,7 @@ impl KeyBind {
         bind!(CTRL, O, OpenFileDialog);
         bind!(CTRL, S, Save);
         bind!(CTRL, Q, Quit);
-        bind!(ALT, Z, ToggleWrap);
+        bind!(ALT, Z, ToggleWordWrap);
 
         keybinds
     }
@@ -65,7 +65,7 @@ impl fmt::Display for KeyBind {
 
 #[derive(Clone, Debug)]
 pub struct Config {
-    pub wrap: bool,
+    pub word_wrap: bool,
     pub keybinds: HashMap<KeyBind, Message>,
 }
 
@@ -73,7 +73,7 @@ impl Config {
     //TODO: load from cosmic-config
     pub fn load() -> Self {
         Self {
-            wrap: false,
+            word_wrap: false,
             keybinds: KeyBind::load(),
         }
     }
diff --git a/src/main.rs b/src/main.rs
index bf042a6..3113b5c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -86,7 +86,7 @@ pub enum Message {
     TabActivate(segmented_button::Entity),
     TabClose(segmented_button::Entity),
     Todo,
-    ToggleWrap,
+    ToggleWordWrap,
 }
 
 impl App {
@@ -539,8 +539,8 @@ impl cosmic::Application for App {
             Message::Todo => {
                 log::warn!("TODO");
             }
-            Message::ToggleWrap => {
-                self.config.wrap = !self.config.wrap;
+            Message::ToggleWordWrap => {
+                self.config.word_wrap = !self.config.word_wrap;
                 //TODO: provide iterator over data
                 let entities: Vec<_> = self.tab_model.iter().collect();
                 for entity in entities {
diff --git a/src/menu.rs b/src/menu.rs
index 6505783..1fbeced 100644
--- a/src/menu.rs
+++ b/src/menu.rs
@@ -152,7 +152,7 @@ pub fn menu_bar<'a>(config: &Config) -> Element<'a, Message> {
                     ],
                 ),
                 MenuTree::new(horizontal_rule(1)),
-                menu_checkbox(fl!("word-wrap"), config.wrap, Message::ToggleWrap),
+                menu_checkbox(fl!("word-wrap"), config.word_wrap, Message::ToggleWordWrap),
                 menu_checkbox(fl!("show-line-numbers"), false, Message::Todo),
                 menu_checkbox(fl!("highlight-current-line"), false, Message::Todo),
                 menu_item(fl!("syntax-highlighting"), Message::Todo),
diff --git a/src/tab.rs b/src/tab.rs
index b3ff07a..a57d359 100644
--- a/src/tab.rs
+++ b/src/tab.rs
@@ -45,9 +45,11 @@ impl Tab {
         let mut editor = self.editor.lock().unwrap();
         let mut font_system = FONT_SYSTEM.lock().unwrap();
         let mut editor = editor.borrow_with(&mut font_system);
-        editor
-            .buffer_mut()
-            .set_wrap(if config.wrap { Wrap::Word } else { Wrap::None });
+        editor.buffer_mut().set_wrap(if config.word_wrap {
+            Wrap::Word
+        } else {
+            Wrap::None
+        });
     }
 
     pub fn open(&mut self, path: PathBuf) {