From 792ac381ea732d9207120d6ca116a8c8dcededa9 Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Fri, 9 Sep 2022 16:01:52 +0400
Subject: [PATCH] Improve settings

---
 src/api/settings.rs |  8 ++++----
 src/settings.rs     | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/api/settings.rs b/src/api/settings.rs
index 958670e..1b07355 100644
--- a/src/api/settings.rs
+++ b/src/api/settings.rs
@@ -23,7 +23,7 @@ unsafe extern "C" fn settings_set_bar_on_top_by_default(value: bool) {
 
 #[no_mangle]
 unsafe extern "C" fn settings_set_border_for_single_window(value: c_uchar) {
-    SETTINGS.unwrap().border().mode_set(value.into());
+    SETTINGS.unwrap().border_mut().mode_set(value.into());
 }
 
 #[no_mangle]
@@ -33,7 +33,7 @@ unsafe extern "C" fn settings_get_border_width() -> c_int {
 
 #[no_mangle]
 unsafe extern "C" fn settings_set_border_width(value: c_int) {
-    SETTINGS.unwrap().border().width_set(value);
+    SETTINGS.unwrap().border_mut().width_set(value);
 }
 
 #[no_mangle]
@@ -78,7 +78,7 @@ unsafe extern "C" fn settings_set_focus_on_wheel(value: bool) {
 
 #[no_mangle]
 unsafe extern "C" fn settings_set_gap_for_single_window(value: c_uchar) {
-    SETTINGS.unwrap().gap().mode_set(value.into());
+    SETTINGS.unwrap().gap_mut().mode_set(value.into());
 }
 
 #[no_mangle]
@@ -88,7 +88,7 @@ unsafe extern "C" fn settings_get_gap_size() -> c_int {
 
 #[no_mangle]
 unsafe extern "C" fn settings_set_gap_size(value: c_int) {
-    SETTINGS.unwrap().gap().size_set(value);
+    SETTINGS.unwrap().gap_mut().size_set(value);
 }
 
 #[no_mangle]
diff --git a/src/settings.rs b/src/settings.rs
index ea03863..e84fc41 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -118,7 +118,11 @@ impl Settings {
         self.bar_on_top_by_default = value;
     }
 
-    pub fn border(&mut self) -> &mut Border {
+    pub fn border(&self) -> &Border {
+        &self.border
+    }
+
+    pub fn border_mut(&mut self) -> &mut Border {
         &mut self.border
     }
 
@@ -156,7 +160,11 @@ impl Settings {
         self.focus_on_wheel = value;
     }
 
-    pub fn gap(&mut self) -> &mut Gap {
+    pub fn gap(&self) -> &Gap {
+        &self.gap
+    }
+
+    pub fn gap_mut(&mut self) -> &mut Gap {
         &mut self.gap
     }