mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 19:25:43 +00:00
f56a5c0ec4
This patch also fixes the Home and Sidebar Touch Bar buttons, since using them after customizing showed that they no longer worked. Differential Revision: https://phabricator.services.mozilla.com/D35085 --HG-- extra : moz-landing-system : lando
77 lines
2.1 KiB
Plaintext
77 lines
2.1 KiB
Plaintext
/* 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/. */
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "nsTouchBar.h"
|
|
#include "nsITouchBarInput.h"
|
|
#include "nsTouchBarUpdater.h"
|
|
|
|
#include "nsCocoaWindow.h"
|
|
#include "nsIArray.h"
|
|
#include "nsIBaseWindow.h"
|
|
#include "nsIWidget.h"
|
|
|
|
// defined in nsCocoaWindow.mm.
|
|
extern BOOL sTouchBarIsInitialized;
|
|
|
|
#if !defined(MAC_OS_X_VERSION_10_12_2) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12_2
|
|
@interface BaseWindow (NSTouchBarProvider)
|
|
@property(strong) NSTouchBar* touchBar;
|
|
@end
|
|
@interface NSApplication (TouchBarMenu)
|
|
- (IBAction)toggleTouchBarCustomizationPalette:(id)sender;
|
|
@end
|
|
#endif
|
|
|
|
NS_IMPL_ISUPPORTS(nsTouchBarUpdater, nsITouchBarUpdater);
|
|
|
|
NS_IMETHODIMP
|
|
nsTouchBarUpdater::UpdateTouchBarInputs(nsIBaseWindow* aWindow,
|
|
const nsTArray<RefPtr<nsITouchBarInput>>& aInputs) {
|
|
nsCOMPtr<nsIWidget> widget = nullptr;
|
|
aWindow->GetMainWidget(getter_AddRefs(widget));
|
|
if (!widget) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
BaseWindow* cocoaWin = (BaseWindow*)widget->GetNativeData(NS_NATIVE_WINDOW);
|
|
if (!cocoaWin) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if ([cocoaWin respondsToSelector:@selector(touchBar)]) {
|
|
size_t itemCount = aInputs.Length();
|
|
for (size_t i = 0; i < itemCount; ++i) {
|
|
nsCOMPtr<nsITouchBarInput> input(aInputs.ElementAt(i));
|
|
if (!input) {
|
|
continue;
|
|
}
|
|
|
|
TouchBarInput* convertedInput = [[TouchBarInput alloc] initWithXPCOM:input];
|
|
[(nsTouchBar*)cocoaWin.touchBar updateItem:convertedInput];
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTouchBarUpdater::EnterCustomizeMode() {
|
|
[NSApp toggleTouchBarCustomizationPalette:(id)this];
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsTouchBarUpdater::IsTouchBarInitialized(bool* aResult) {
|
|
*aResult = sTouchBarIsInitialized;
|
|
return NS_OK;
|
|
}
|
|
|
|
// NOTE: This method is for internal unit tests only.
|
|
NS_IMETHODIMP
|
|
nsTouchBarUpdater::SetTouchBarInitialized(bool aIsInitialized) {
|
|
sTouchBarIsInitialized = aIsInitialized;
|
|
return NS_OK;
|
|
}
|