Improve settings

This commit is contained in:
Alex Kotov 2022-09-09 16:01:52 +04:00
parent cebb1adea7
commit 792ac381ea
Signed by: kotovalexarian
GPG Key ID: 553C0EBBEB5D5F08
2 changed files with 14 additions and 6 deletions

View File

@ -23,7 +23,7 @@ unsafe extern "C" fn settings_set_bar_on_top_by_default(value: bool) {
#[no_mangle] #[no_mangle]
unsafe extern "C" fn settings_set_border_for_single_window(value: c_uchar) { 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] #[no_mangle]
@ -33,7 +33,7 @@ unsafe extern "C" fn settings_get_border_width() -> c_int {
#[no_mangle] #[no_mangle]
unsafe extern "C" fn settings_set_border_width(value: c_int) { 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] #[no_mangle]
@ -78,7 +78,7 @@ unsafe extern "C" fn settings_set_focus_on_wheel(value: bool) {
#[no_mangle] #[no_mangle]
unsafe extern "C" fn settings_set_gap_for_single_window(value: c_uchar) { 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] #[no_mangle]
@ -88,7 +88,7 @@ unsafe extern "C" fn settings_get_gap_size() -> c_int {
#[no_mangle] #[no_mangle]
unsafe extern "C" fn settings_set_gap_size(value: c_int) { 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] #[no_mangle]

View File

@ -118,7 +118,11 @@ impl Settings {
self.bar_on_top_by_default = value; 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 &mut self.border
} }
@ -156,7 +160,11 @@ impl Settings {
self.focus_on_wheel = value; 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 &mut self.gap
} }