From 841ea5e8feb81e5c87a0c60eaf1e4ab6a3863f3f Mon Sep 17 00:00:00 2001 From: jugeeya Date: Mon, 16 Aug 2021 17:09:51 -0700 Subject: [PATCH] Single Option Menu (#231) * add flag * Update clickToggle() to handle single-option submenus (#232) Co-authored-by: asimon-1 Co-authored-by: asimon-1 <40246417+asimon-1@users.noreply.github.com> Co-authored-by: asimon-1 --- src/common/menu.rs | 12 ++++++++---- src/templates/menu.html | 16 +++++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/common/menu.rs b/src/common/menu.rs index ce204b5..2cada26 100644 --- a/src/common/menu.rs +++ b/src/common/menu.rs @@ -39,7 +39,8 @@ struct SubMenu<'a> { sliders: Vec, onoffselector: Vec>, index: usize, - check_against: usize + check_against: usize, + is_single_option: Option } impl<'a> SubMenu<'a> { @@ -103,7 +104,8 @@ impl<'a> Menu<'a> { sliders: Vec::new(), onoffselector: Vec::new(), index: self.max_idx() + 1, - check_against + check_against, + is_single_option: Some(true) }; for toggle in toggles { @@ -125,7 +127,8 @@ impl<'a> Menu<'a> { sliders: Vec::new(), onoffselector: Vec::new(), index: self.max_idx() + 1, - check_against + check_against, + is_single_option: None }; for i in 0..strs.len() { @@ -145,7 +148,8 @@ impl<'a> Menu<'a> { sliders: Vec::new(), onoffselector: Vec::new(), index: self.max_idx() + 1, - check_against + check_against, + is_single_option: None }; sub_menu.add_onoffselector(title, checked, (default & OnOff::On as usize) != 0); diff --git a/src/templates/menu.html b/src/templates/menu.html index 8527992..f279101 100644 --- a/src/templates/menu.html +++ b/src/templates/menu.html @@ -155,7 +155,7 @@