WindowServer: Strip Alt-shortcut marker ('&') when measuring menu texts

We were including these markers when computing the sizes of menus, causing them to get a little too much padding.
luteresa · Apr 12, 2021 · 767bd8c · 767bd8c
1 parent fbbb4b3
commit 767bd8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Userland/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp
@@ -115,7 +115,7 @@ int Menu::content_width() const
  if (item.type() != MenuItem::Text)
  continue;
  auto& use_font = item.is_default() ? Gfx::FontDatabase::default_bold_font() : font();
- int text_width = use_font.width(item.text());
+ int text_width = use_font.width(Gfx::parse_ampersand_string(item.text()));
  if (!item.shortcut_text().is_empty()) {
  int shortcut_width = use_font.width(item.shortcut_text());
  widest_shortcut = max(shortcut_width, widest_shortcut);

diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp
@@ -990,7 +990,7 @@ void Window::set_menubar(MenuBar* menubar)
  Gfx::IntPoint next_menu_location { 0, 0 };
  auto menubar_rect = Gfx::WindowTheme::current().menubar_rect(Gfx::WindowTheme::WindowType::Normal, rect(), wm.palette(), 1);
  m_menubar->for_each_menu([&](Menu& menu) {
- int text_width = wm.font().width(menu.name());
+ int text_width = wm.font().width(Gfx::parse_ampersand_string(menu.name()));
  menu.set_rect_in_window_menubar({ next_menu_location.x(), 0, text_width + menubar_menu_margin, menubar_rect.height() });
  next_menu_location.move_by(menu.rect_in_window_menubar().width(), 0);
  return IterationDecision::Continue;