aleleba/filmcraft
1
0
Fork 0
mirror of https://github.com/storytold/filmcraft.git synced 2026-10-24 10:10:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2863 from storytold/fix/menu-bar-title-size

Browse Source 
#130: menu bar titles use the 13 pt menu text, like their menus
This commit is contained in:
Brandon Thomas
2026-10-23 10:51:13 -04:00
committed by GitHub
parent bc1d99e9e1 c0959dba17
commit 808b69b36c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/menus.rs
+2 -1
View File
@@ -904,7 +904,8 @@ pub fn menu_bar(app: &mut FilmcraftApp, ui: &mut egui::Ui) {
let labels = app.session.prefs.labels.clone();
let ctx = ui.ctx().clone();
let mut clicked: Option<String> = None;
egui::MenuBar::new().config(egui::containers::menu::MenuConfig::new().style(crate::theme::menu_style)).ui(ui, |ui| {
// The bar's titles and their menus share one size and colour, as in a native menu bar.
egui::MenuBar::new().style(crate::theme::menu_style).config(egui::containers::menu::MenuConfig::new().style(crate::theme::menu_style)).ui(ui, |ui| {
let mut titles = Vec::with_capacity(MENUS.len());
for top in MENUS {
let mine: Vec<&MenuItem> = items.iter().filter(|i| i.path.first().map(String::as_str) == Some(top)).collect();
crates/ui-egui/tests/panels_ui.rs
+1 -1
View File
@@ -836,7 +836,7 @@ fn menu_bar_menus_use_the_13pt_menu_text() {
let mut d = Driver::demo();
d.click("menu.File");
d.frames(3);
for id in ["menu.file.open", "menu.file.save", "menu.file.saveAs"] {
for id in ["menu.File", "menu.file.open", "menu.file.save", "menu.file.saveAs"] {
let v = d.ok("ui.elements", json!({"prefix": id}));
let e = v.as_array().unwrap().iter().find(|e| e["id"] == json!(id)).unwrap_or_else(|| panic!("no menu item {id}")).clone();
let label = e["label"].as_str().unwrap().to_string();