Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Truncate menu items to 300px. r=sdagley/sr=sfraser/a=asa. bug# 98455

Browse Source
This commit is contained in:
pinkerton%netscape.com 2001-10-05 14:12:35 +00:00
parent 07b649d931
commit 4f70b20af4
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
widget/src/mac/nsMenuX.cpp
View File

@ -63,13 +63,8 @@
#include "nsIServiceManager.h"
#include <Appearance.h>
#include <TextUtils.h>
#include <ToolUtils.h>
#include <Devices.h>
#include <UnicodeConverter.h>
#include <Fonts.h>
#include <Sound.h>
#include <Balloons.h>
#include <CarbonEvents.h>
#include "nsGUIEvent.h"
@ -138,9 +133,9 @@ nsMenuX::~nsMenuX()
{
RemoveAll();
if (mMacMenuHandle != NULL)
if ( mMacMenuHandle )
::ReleaseMenu(mMacMenuHandle);
// alert the change notifier we don't care no more
mManager->Unregister(mMenuContent);
@ -264,9 +259,7 @@ NS_METHOD nsMenuX::AddMenuItem(nsIMenuItem * aMenuItem)
nsAutoString label;
aMenuItem->GetLabel(label);
CFStringRef labelRef = ::CFStringCreateWithCharacters(kCFAllocatorDefault, (UniChar*)label.get(), label.Length());
::InsertMenuItemTextWithCFString(mMacMenuHandle, labelRef, currItemIndex, 0, 0);
::CFRelease(labelRef);
InsertMenuItemWithTruncation ( label, currItemIndex );
// I want to be internationalized too!
nsAutoString keyEquivalent(NS_LITERAL_STRING(" "));
@ -332,11 +325,7 @@ NS_METHOD nsMenuX::AddMenu(nsIMenu * aMenu)
// We have to add it as a menu item and then associate it with the item
nsAutoString label;
aMenu->GetLabel(label);
//printf("AddMenu %s \n", NS_LossyConvertUCS2toASCII(label).get());
CFStringRef labelRef = ::CFStringCreateWithCharacters(kCFAllocatorDefault, (UniChar*)label.get(), label.Length());
::InsertMenuItemTextWithCFString(mMacMenuHandle, labelRef, currItemIndex, 0, 0);
::CFRelease(labelRef);
InsertMenuItemWithTruncation ( label, currItemIndex );
PRBool isEnabled;
aMenu->GetEnabled(&isEnabled);
@ -352,6 +341,31 @@ NS_METHOD nsMenuX::AddMenu(nsIMenu * aMenu)
return NS_OK;
}
//
// InsertMenuItemWithTruncation
//
// Insert a new item in this menu with index |inItemIndex| with the text |inItemLabel|,
// middle-truncated to a certain pixel width with an elipsis.
//
void
nsMenuX :: InsertMenuItemWithTruncation ( nsAutoString & inItemLabel, PRUint32 inItemIndex )
{
// ::TruncateThemeText() doesn't take the number of characters to truncate to, it takes a pixel with
// to fit the string in. Ugh. I talked it over with sfraser and we couldn't come up with an
// easy way to compute what this should be given the system font, etc, so we're just going
// to hard code it to something reasonable and bigger fonts will just have to deal.
const short kMaxItemPixelWidth = 300;
CFMutableStringRef labelRef = ::CFStringCreateMutable ( kCFAllocatorDefault, inItemLabel.Length() );
::CFStringAppendCharacters ( labelRef, (UniChar*)inItemLabel.get(), inItemLabel.Length() );
::TruncateThemeText(labelRef, kThemeMenuItemFont, kThemeStateActive, kMaxItemPixelWidth, truncMiddle, NULL);
::InsertMenuItemTextWithCFString(mMacMenuHandle, labelRef, inItemIndex, 0, 0);
::CFRelease(labelRef);
} // InsertMenuItemWithTruncation
//-------------------------------------------------------------------------
NS_METHOD nsMenuX::AddSeparator()
{

5
widget/src/mac/nsMenuX.h
View File

@ -115,6 +115,11 @@ protected:
// fetch the content node associated with the menupopup item
void GetMenuPopupContent ( nsIContent** aResult ) ;
// Insert a new item in this menu with index |inItemIndex| with the text |inItemLabel|,
// middle-truncated to a certain pixel width with an elipsis.
void InsertMenuItemWithTruncation ( nsAutoString & inItemLabel,
PRUint32 inItemIndex ) ;
// fire handlers for oncreate/ondestroy
PRBool OnDestroy() ;
PRBool OnCreate() ;