From: Po Lu <luangruo@yahoo.com>
Date: Sun, 30 Jan 2022 05:20:15 +0000 (+0000)
Subject: Use consistent font when displaying menu equivalent keys on Haiku
X-Git-Tag: emacs-29.0.90~2653
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28865201604c57c4d7a43625010c1aed8ca1bd46;p=emacs.git

Use consistent font when displaying menu equivalent keys on Haiku

* src/haiku_support.cc (DrawContent): Set plain font when
drawing key text.
---

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 2284953517f..794023c98e4 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -1679,11 +1679,17 @@ public:
 
     if (key)
       {
-	BRect r = menu->Frame ();
-	int w = menu->StringWidth (key);
+	BRect r = Frame ();
+	int w;
+
+	menu->PushState ();
+	menu->ClipToRect (r);
+	menu->SetFont (be_plain_font);
+	w = menu->StringWidth (key);
 	menu->MovePenTo (BPoint (BE_RECT_WIDTH (r) - w - 4,
 				 menu->PenLocation ().y));
 	menu->DrawString (key);
+	menu->PopState ();
       }
   }