master 2886520160: Use consistent font when displaying menu equivalent keys on Haiku

[Po Lu]

branch: master
commit 28865201604c57c4d7a43625010c1aed8ca1bd46
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Use consistent font when displaying menu equivalent keys on Haiku
    
    * src/haiku_support.cc (DrawContent): Set plain font when
    drawing key text.
---
 src/haiku_support.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 2284953517..794023c98e 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 ();
       }
   }