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

Bug 266769, Mac windows can't be drag-moved when a sheet is open. Remove conditionals only intended for use on pre-OS X. Patch by Ari <the_great_spam_bin@yahoo.com> (if that even is a real address). r=me sr=smfr

Browse Source
This commit is contained in:
mark%moxienet.com 2005-09-07 22:01:07 +00:00
parent 53e1e737ec
commit e1a6e25275
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widget/src/mac/nsMacMessagePump.cpp
View File

@ -612,22 +612,9 @@ PRBool nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
if ( gRollupListener && gRollupWidget )
gRollupListener->Rollup();
/* Do the drag, but not if the window is disabled or if the command key
is not down. (DragWindow itself will activate the window if
the command key isn't down.) However, allow the drag on OSX.
On OSX we disable only the single parent of a window with a sheet,
so it's a safe-ish assumption that the disabled window can be
dragged and brought to the foreground. */
nsCOMPtr<nsIWidget> topWidget;
PRBool enabled;
nsToolkit::GetTopWidget(whichWindow, getter_AddRefs(topWidget));
if (!topWidget || NS_FAILED(topWidget->IsEnabled(&enabled)) || enabled ||
(anEvent.modifiers & cmdKey)) {
Rect screenRect;
::GetRegionBounds(::GetGrayRgn(), &screenRect);
::DragWindow(whichWindow, anEvent.where, &screenRect);
} else
::SysBeep(1);
Rect screenRect;
::GetRegionBounds(::GetGrayRgn(), &screenRect);
::DragWindow(whichWindow, anEvent.where, &screenRect);
nsWatchTask::GetTask().Resume();
@ -637,6 +624,9 @@ PRBool nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
// only activate if the command key is not down
if (!(anEvent.modifiers & cmdKey))
{
nsCOMPtr<nsIWidget> topWidget;
nsToolkit::GetTopWidget(whichWindow, getter_AddRefs(topWidget));
nsCOMPtr<nsPIWidgetMac> macWindow ( do_QueryInterface(topWidget) );
if ( macWindow )
macWindow->ComeToFront();