Slightly refactored touchbar.

Telegram/SourceFiles/platform/mac/mac_touchbar.mm

@@ -172,6 +172,17 @@ inline int UnreadCount(not_null<PeerData*> peer) {
 	return 0;
 }
 
+inline bool CanWriteToActiveChat() {
+	if (const auto window = App::wnd()) {
+		if (const auto controller = window->sessionController()) {
+			if (const auto chat = controller->activeChatCurrent()) {
+				return chat.history()->peer->canWrite();
+			}
+		}
+	}
+	return false;
+}
+
 QString TitleRecentlyUsed() {
 	const auto &sets = Auth().data().stickerSets();
 	const auto it = sets.constFind(Stickers::CloudRecentSetId);
@@ -677,38 +688,40 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
 }
 
 - (void)scrubber:(NSScrubber *)scrubber didSelectItemAtIndex:(NSInteger)index {
-	const auto controller = App::wnd()->sessionController();
+	if (!CanWriteToActiveChat()) {
-	if (const auto history = controller->activeChatCurrent().history()) {
+		return;
-		Fn<void()> callback;
+	}
+	const auto history = App::wnd()->sessionController()->activeChatCurrent()
+		.history();
+
+	const auto callback = [&]() -> bool {
 		if (const auto document = _stickers[index].document) {
-			callback = [=] {
 			Auth().api().sendExistingDocument(
 				document,
 				document->stickerSetOrigin(),
 				{},
 				ApiWrap::SendOptions(history));
-			};
+			return true;
-		}
+		} else if (const auto emoji = _stickers[index].emoji) {
-		if (const auto emoji = _stickers[index].emoji) {
+			if (const auto inputField = qobject_cast<QTextEdit*>(
-			callback = [=] {
+					QApplication::focusWidget())) {
-				if (const auto inputField = qobject_cast<Ui::InputField*>(
-						QApplication::focusWidget()->parentWidget())) {
 				Ui::InsertEmojiAtCursor(inputField->textCursor(), emoji);
 				Ui::Emoji::AddRecent(emoji);
+				return true;
 			}
+		}
+		return false;
 	};
-		}
+
-		if (!callback) {
+	if (!Core::Sandbox::Instance().customEnterFromEventLoop(callback)) {
 		return;
 	}
-		Core::Sandbox::Instance().customEnterFromEventLoop(
+
-			std::move(callback));
 	if (_parentPopover) {
 		[_parentPopover dismissPopover:nil];
 	}
 	scrubber.selectedIndex = -1;
 }
-}
 
 - (void)updateStickers {
 	std::vector<PickerScrubberItem> temp;
@@ -1075,33 +1088,24 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
 }
 
 - (void) showInputFieldItem:(bool)show {
-	[self showItem:kPopoverInputItemIdentifier show:show];
+	[self showItemInMain: show
-	if (show) {
+		? kPopoverInputItemIdentifier
-		[self showItem:kPickerPopoverItemIdentifier show:false];
+		: CanWriteToActiveChat()
-	} else {
+			? kPickerPopoverItemIdentifier
-		const auto chat = App::wnd()->sessionController()->activeChatCurrent();
+			: nil];
-		[self showItem:kPickerPopoverItemIdentifier show:(!show
-			&& chat
-			&& chat.history()->peer->canWrite())];
-	}
 }
 
 - (void) showPickerItem:(bool)show {
-	[self showItem:kPickerPopoverItemIdentifier show:show];
+	[self showItemInMain: show
-	if (show) {
+		? kPickerPopoverItemIdentifier
-		[self showItem:kPopoverInputItemIdentifier show:false];
+		: nil];
-	}
 }
 
-- (void) showItem:(NSTouchBarItemIdentifier)item show:(bool)show {
+- (void) showItemInMain:(NSTouchBarItemIdentifier)item {
-	NSMutableArray *items = [NSMutableArray arrayWithArray:_touchBarMain.defaultItemIdentifiers];
+	NSMutableArray *items = [NSMutableArray arrayWithArray:@[kPinnedPanelItemIdentifier]];
-	if (show) {
+	if (item) {
-		if (![items containsObject:item]) {
 		[items addObject:item];
 	}
-	} else if ([items containsObject:item]) {
-		[items removeObject:item];
-	}
 	_touchBarMain.defaultItemIdentifiers = items;
 }