From 88e77fe3af871ca9515b7c2c9dd414d5497801ce Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Tue, 26 Feb 2019 11:03:49 +0100
Subject: [PATCH] WindowServer: Bump height of window titlebars and menus from
 16 to 18.

---
 WindowServer/WSMenu.h            | 2 +-
 WindowServer/WSWindowManager.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WindowServer/WSMenu.h b/WindowServer/WSMenu.h
index 9bcb44bb2a..f99f747d8c 100644
--- a/WindowServer/WSMenu.h
+++ b/WindowServer/WSMenu.h
@@ -52,7 +52,7 @@ public:
     int width() const;
     int height() const;
 
-    int item_height() const { return 16; }
+    int item_height() const { return 18; }
     int vertical_padding() const { return 4; }
     int horizontal_padding() const { return left_padding() + right_padding(); }
     int left_padding() const { return 14; }
diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp
index 5f61edd2b5..ff512356ec 100644
--- a/WindowServer/WSWindowManager.cpp
+++ b/WindowServer/WSWindowManager.cpp
@@ -24,7 +24,7 @@
 #define RESIZE_DEBUG
 #define USE_WALLPAPER
 
-static const int window_titlebar_height = 16;
+static const int window_titlebar_height = 18;
 
 static inline Rect menu_window_rect(const Rect& rect)
 {
@@ -329,11 +329,11 @@ void WSWindowManager::set_current_menubar(WSMenuBar* menubar)
     else
         m_current_menubar = nullptr;
     dbgprintf("[WM] Current menubar is now %p\n", menubar);
-    Point next_menu_location { menubar_menu_margin() / 2, 3 };
+    Point next_menu_location { menubar_menu_margin() / 2, 0 };
     for_each_active_menubar_menu([&] (WSMenu& menu) {
         int text_width = font().width(menu.name());
         menu.set_rect_in_menubar({ next_menu_location.x() - menubar_menu_margin() / 2, 0, text_width + menubar_menu_margin(), menubar_rect().height() - 1 });
-        menu.set_text_rect_in_menubar({ next_menu_location, { text_width, font().glyph_height() } });
+        menu.set_text_rect_in_menubar({ next_menu_location, { text_width, menubar_rect().height() } });
         next_menu_location.move_by(menu.rect_in_menubar().width(), 0);
         return true;
     });
@@ -889,7 +889,7 @@ void WSWindowManager::invalidate_cursor()
 
 Rect WSWindowManager::menubar_rect() const
 {
-    return { 0, 0, m_screen_rect.width(), 16 };
+    return { 0, 0, m_screen_rect.width(), 18 };
 }
 
 void WSWindowManager::draw_menubar()