rowan/rmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Menu::run

Browse source
This commit is contained in:
Rowan 2025-01-26 05:00:23 -06:00
parent b179e581f5
commit 623b141767
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lib.rs
View file

@ -4,7 +4,7 @@ pub mod font;
use color::ColorPair; use color::ColorPair;
use font::FontExt; use font::FontExt;
use pango::{prelude::FontExt as _, Font, Language, SCALE}; use pango::{prelude::FontExt as _, Font, Language, SCALE};
use wmenu_rs::Menu as WMenu; use wmenu_rs::{Menu as WMenu, MenuError};
struct Config { struct Config {
pub bottom: bool, pub bottom: bool,
@ -18,17 +18,20 @@ struct Config {
} }
impl Config { impl Config {
// TODO: add font struct to handle these methods
fn font_string(&self) -> String { fn font_string(&self) -> String {
format!("{} {}", self.font, self.font_size) format!("{} {}", self.font, self.font_size)
} }
fn font_height(&self, font: &str) -> i32 { fn font_height(&self, font: &str) -> i32 {
let font = Font::load_from_string(font).unwrap(); let font = Font::load_from_string(font).unwrap();
// TODO: let user pick language
let metrics = font.metrics(Some(&Language::default())); let metrics = font.metrics(Some(&Language::default()));
metrics.height() / SCALE metrics.height() / SCALE
} }
// TODO: add ability to override height/line_height
fn apply(self, wmenu: &mut WMenu) { fn apply(self, wmenu: &mut WMenu) {
let font_string = self.font_string(); let font_string = self.font_string();
let font_height = self.font_height(&font_string); let font_height = self.font_height(&font_string);
@ -36,6 +39,7 @@ impl Config {
let mut height = line_height; let mut height = line_height;
// FIXME: ugly
if self.lines > 0 { if self.lines > 0 {
height = height + height * self.lines; height = height + height * self.lines;
} }
@ -99,6 +103,11 @@ impl Menu {
self.inner_mut().add_items(items); self.inner_mut().add_items(items);
self self
} }
// TODO: wrap MenuError with new error type
pub fn run(&self) -> Result<String, MenuError> {
self.inner().run()
}
} }
impl Default for Menu { impl Default for Menu {
@ -122,7 +131,7 @@ mod tests {
let items = ["rowern", "sybil", "vex"]; let items = ["rowern", "sybil", "vex"];
let mut menu = Menu::new(Config::default()); let mut menu = Menu::new(Config::default());
menu.add_items(&items); menu.add_items(&items);
let result = menu.inner_mut().run(); let result = menu.run();
assert!(items.contains(&result.unwrap().as_str())); assert!(items.contains(&result.unwrap().as_str()));
} }
} }