mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
929e1e4d77
This does two things: * Modify `nsXULPopupManager::ShowPopup()` so it calls `ShowPopupAsNativeMenu()` as long as an anchor wasn't passed in, and only on Mac. * Modify `-[MOZMenuOpeningCoordinator _openMenu:atScreenPosition:forView:withAppearance:]` so it also takes a `aIsContextMenu` param. If the param is true, we synthesize a right-click event and pop up a context menu as usual. If it's false, we use `-[NSMenu popUpMenuPositioningItem:atLocation:inView:]` instead. The reason this works is because `-[NSMenu popUpMenuPositioningItem:atLocation:inView:]` opens the menu in a sensible place when the x-y coords are near the right edge of the screen. In contrast, `+[NSMenu popUpContextMenu:withEvent:forView:]` will anchor the menu's top-right corner to the mouse cursor when near the right edge. Differential Revision: https://phabricator.services.mozilla.com/D177355
94 lines
3.0 KiB
C++
94 lines
3.0 KiB
C++
/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef NativeMenuMac_h
|
|
#define NativeMenuMac_h
|
|
|
|
#include "mozilla/widget/NativeMenu.h"
|
|
|
|
#include "nsMenuItemIconX.h"
|
|
#include "nsMenuX.h"
|
|
|
|
class nsIContent;
|
|
class nsMenuGroupOwnerX;
|
|
|
|
namespace mozilla {
|
|
|
|
namespace dom {
|
|
class Element;
|
|
}
|
|
|
|
namespace widget {
|
|
|
|
class NativeMenuMac : public NativeMenu,
|
|
public nsMenuItemIconX::Listener,
|
|
public nsMenuX::Observer {
|
|
public:
|
|
explicit NativeMenuMac(dom::Element* aElement);
|
|
|
|
// NativeMenu
|
|
void ShowAsContextMenu(nsIFrame* aClickedFrame, const CSSIntPoint& aPosition,
|
|
bool aIsContextMenu) override;
|
|
bool Close() override;
|
|
void ActivateItem(dom::Element* aItemElement, Modifiers aModifiers, int16_t aButton,
|
|
ErrorResult& aRv) override;
|
|
void OpenSubmenu(dom::Element* aMenuElement) override;
|
|
void CloseSubmenu(dom::Element* aMenuElement) override;
|
|
RefPtr<dom::Element> Element() override;
|
|
void AddObserver(NativeMenu::Observer* aObserver) override {
|
|
mObservers.AppendElement(aObserver);
|
|
}
|
|
void RemoveObserver(NativeMenu::Observer* aObserver) override {
|
|
mObservers.RemoveElement(aObserver);
|
|
}
|
|
|
|
// nsMenuItemIconX::Listener
|
|
void IconUpdated() override;
|
|
|
|
// nsMenuX::Observer
|
|
void OnMenuWillOpen(dom::Element* aPopupElement) override;
|
|
void OnMenuDidOpen(dom::Element* aPopupElement) override;
|
|
void OnMenuWillActivateItem(dom::Element* aPopupElement, dom::Element* aMenuItemElement) override;
|
|
void OnMenuClosed(dom::Element* aPopupElement) override;
|
|
|
|
NSMenu* NativeNSMenu() { return mMenu ? mMenu->NativeNSMenu() : nil; }
|
|
void MenuWillOpen();
|
|
|
|
// Returns whether a menu item was found at the specified path.
|
|
bool ActivateNativeMenuItemAt(const nsAString& aIndexString);
|
|
|
|
void ForceUpdateNativeMenuAt(const nsAString& aIndexString);
|
|
void Dump();
|
|
|
|
// If this menu is the menu of a system status bar item (NSStatusItem),
|
|
// let the menu know about the status item so that it can propagate
|
|
// any icon changes to the status item.
|
|
void SetContainerStatusBarItem(NSStatusItem* aItem);
|
|
|
|
protected:
|
|
virtual ~NativeMenuMac();
|
|
|
|
// Find the deepest nsMenuX which contains aElement, only descending into open
|
|
// menus.
|
|
// Returns nullptr if the element was not found or if the menus on the path
|
|
// were not all open.
|
|
RefPtr<nsMenuX> GetOpenMenuContainingElement(dom::Element* aElement);
|
|
|
|
RefPtr<dom::Element> mElement;
|
|
RefPtr<nsMenuGroupOwnerX> mMenuGroupOwner;
|
|
RefPtr<nsMenuX> mMenu;
|
|
nsTArray<NativeMenu::Observer*> mObservers;
|
|
NSStatusItem* mContainerStatusBarItem;
|
|
|
|
// Non-zero after a call to ShowAsContextMenu. Stores the handle from the
|
|
// MOZMenuOpeningCoordinator.
|
|
NSInteger mOpeningHandle = 0;
|
|
};
|
|
|
|
} // namespace widget
|
|
} // namespace mozilla
|
|
|
|
#endif
|