From de3cc7646882314c0ee2d3c8c1ef3d8428d8fb86 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 11 May 2019 14:40:17 +0300
Subject: [PATCH] Fixed position of Saved Messages in touchbar when user unpins
 it.

---
 Telegram/SourceFiles/platform/mac/touchbar.mm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/mac/touchbar.mm b/Telegram/SourceFiles/platform/mac/touchbar.mm
index 083af63ef2..e1e95d0873 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar.mm
@@ -438,6 +438,7 @@ NSString* FormatTime(int time) {
 - (void) updatePinnedButtons {
 	const auto &order = Auth().data().pinnedChatsOrder(nullptr);
 	auto isSelfPeerPinned = false;
+	auto isArchivePinned = false;
 	PinnedDialogButton *selfChatButton;
 	NSCustomTouchBarItem *item = [self.touchBarMain itemForIdentifier:kPinnedPanelItemIdentifier];
 	NSStackView *stack = item.view;
@@ -447,6 +448,8 @@ NSString* FormatTime(int time) {
 		if (num <= kSavedMessagesId) {
 			if (num == kSavedMessagesId) {
 				selfChatButton = button;
+			} else if (num == kArchiveId) {
+				isArchivePinned = !button.isDeletedFromView;
 			}
 			continue;
 		}
@@ -472,7 +475,9 @@ NSString* FormatTime(int time) {
 		[stack removeView:selfChatButton.view];
 	} else if (!isSelfPeerPinned && selfChatButton.isDeletedFromView) {
 		selfChatButton.isDeletedFromView = false;
-		[stack insertView:selfChatButton.view atIndex:0 inGravity:NSStackViewGravityLeading];
+		[stack insertView:selfChatButton.view
+				  atIndex:(isArchivePinned ? 1 : 0)
+				inGravity:NSStackViewGravityLeading];
 	}
 }