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

don't play sound during GetAttention. b=307323 r=mano sr=smfr

Browse Source
This commit is contained in:
joshmoz%gmail.com 2005-09-09 02:58:46 +00:00
parent 60174e3d08
commit ec09744d98
2 changed files with 7 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
widget/src/cocoa/nsChildView.mm
View File

@ -125,11 +125,6 @@
nsIRollupListener * gRollupListener = nsnull;
nsIWidget * gRollupWidget = nsnull;
// Since we only want a single notification pending for the app we'll declare
// these static
static NMRec gNMRec;
static Boolean gNotificationInstalled = false;
#pragma mark -
//#define PAINT_DEBUGGING // flash areas as they are painted
@ -1925,38 +1920,7 @@ NS_IMETHODIMP nsChildView::SetTitle(const nsAString& title)
NS_IMETHODIMP nsChildView::GetAttention(PRInt32 aCycleCount)
{
// Since the Mac doesn't consider each window a separate process this call functions
// slightly different than on other platforms. We first check to see if we're the
// foreground process and, if so, ignore the call. We also check to see if a notification
// is already pending and, if so, remove it since we only have one notification per process.
// After all that checking we install a notification manager request to mark the app's icon
// in the process menu and play the default alert sound
OSErr err;
if (WeAreFrontProcess())
return NS_OK;
if (gNotificationInstalled)
{
(void)::NMRemove(&gNMRec);
gNotificationInstalled = false;
}
err = GetIconSuite( &gNMRec.nmIcon, 128, svAllSmallData );
if ( err != noErr )
gNMRec.nmIcon = NULL;
// Setup and install the notification manager rec
gNMRec.qType = nmType;
gNMRec.nmMark = 1; // Flag the icon in the process menu
gNMRec.nmSound = (Handle)-1L; // Use the default alert sound
gNMRec.nmStr = NULL; // No alert/window so no text
gNMRec.nmResp = NULL; // No response proc, use the default behavior
gNMRec.nmRefCon = NULL;
if (::NMInstall(&gNMRec) == noErr)
gNotificationInstalled = true;
[NSApp requestUserAttention:NSCriticalRequest];
return NS_OK;
}

12
widget/src/mac/nsWindow.cpp
View File

@ -2309,12 +2309,12 @@ NS_IMETHODIMP nsWindow::GetAttention(PRInt32 aCycleCount)
gNMRec.nmIcon = NULL;
// Setup and install the notification manager rec
gNMRec.qType = nmType;
gNMRec.nmMark = 1; // Flag the icon in the process menu
gNMRec.nmSound = (Handle)-1L; // Use the default alert sound
gNMRec.nmStr = NULL; // No alert/window so no text
gNMRec.nmResp = NULL; // No response proc, use the default behavior
gNMRec.nmRefCon = NULL;
gNMRec.qType = nmType;
gNMRec.nmMark = 1; // Make the dock icon bounce
gNMRec.nmSound = NULL; // No alert sound, see bug 307323
gNMRec.nmStr = NULL; // No alert/window so no text
gNMRec.nmResp = NULL; // No response proc, use the default behavior
gNMRec.nmRefCon = NULL;
if (::NMInstall(&gNMRec) == noErr)
gNotificationInstalled = true;