From c89a21ef5edb8ca9da3eaf21ba7bef7c057985db Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 8 May 2019 12:29:38 +0300
Subject: [PATCH] Refactored touchbar code.

---
 Telegram/SourceFiles/platform/mac/touchbar.mm | 74 ++++++-------------
 1 file changed, 22 insertions(+), 52 deletions(-)

diff --git a/Telegram/SourceFiles/platform/mac/touchbar.mm b/Telegram/SourceFiles/platform/mac/touchbar.mm
index cba8abeb83..04880d7dee 100644
--- a/Telegram/SourceFiles/platform/mac/touchbar.mm
+++ b/Telegram/SourceFiles/platform/mac/touchbar.mm
@@ -50,7 +50,6 @@ NSImage *qt_mac_create_nsimage(const QPixmap &pm);
 @property(nonatomic, assign) bool isDeletedFromView;
 
 - (id) init:(int)num;
-- (id) initSavedMessages;
 - (NSImage *) getPinImage;
 - (void)buttonActionPin:(NSButton *)sender;
 - (void)updatePinnedDialog;
@@ -63,24 +62,32 @@ auto lifetime = rpl::lifetime();
 
 - (id) init:(int)num {
 	if (num == kSavedMessagesId) {
-		return [self initSavedMessages];
+		self = [super initWithIdentifier:savedMessages];
+		self.waiting = false;
+		self.customizationLabel = [NSString stringWithFormat:@"Pinned Dialog %d", num];
 	} else if (num == kArchiveId) {
-		return [self initArchive];
+		self = [super initWithIdentifier:archiveFolder];
+		self.waiting = false;
+		self.customizationLabel = @"Archive Folder";
+	} else {
+		NSString *identifier = [NSString stringWithFormat:@"%@.pinnedDialog%d", customIDMain, num];
+		self = [super initWithIdentifier:identifier];
+		self.waiting = true;
+		self.customizationLabel = @"Saved Messages";
 	}
-	NSString *identifier = [NSString stringWithFormat:@"%@.pinnedDialog%d", customIDMain, num];
-	self = [super initWithIdentifier:identifier];
 	if (!self) {
 		return nil;
 	}
 	self.number = num;
-	self.waiting = true;
 	
 	NSButton *button = [NSButton buttonWithImage:[self getPinImage] target:self action:@selector(buttonActionPin:)];
 	[button setBordered:NO];
 	[button sizeToFit];
-	[button setHidden:(num > Auth().data().pinnedChatsOrder(nullptr).size())];
 	self.view = button;
-	self.customizationLabel = [NSString stringWithFormat:@"Pinned Dialog %d", num];
+
+	if (num <= kSavedMessagesId) {
+		return self;
+	}
 	
 	if (self.peer) {
 		Notify::PeerUpdateViewer(
@@ -108,40 +115,6 @@ auto lifetime = rpl::lifetime();
 	button.image = [self getPinImage];
 }
 
-- (id) initSavedMessages {
-	self = [super initWithIdentifier:savedMessages];
-	if (!self) {
-		return nil;
-	}
-	self.number = kSavedMessagesId;
-	self.waiting = false;
-	
-	NSButton *button = [NSButton buttonWithImage:[self getPinImage] target:self action:@selector(buttonActionPin:)];
-	[button setBordered:NO];
-	[button sizeToFit];
-	self.view = button;
-	self.customizationLabel = @"Saved Messages";
-
-	return self;
-}
-
-- (id) initArchive {
-	self = [super initWithIdentifier:archiveFolder];
-	if (!self) {
-		return nil;
-	}
-	self.number = kArchiveId;
-	self.waiting = false;
-	
-	NSButton *button = [NSButton buttonWithImage:[self getPinImage] target:self action:@selector(buttonActionPin:)];
-	[button setBordered:NO];
-	[button sizeToFit];
-	self.view = button;
-	self.customizationLabel = @"Archive Folder";
-	
-	return self;
-}
-
 - (void) buttonActionPin:(NSButton *)sender {
 	Core::Sandbox::Instance().customEnterFromEventLoop([=] {
 		App::main()->choosePeer(self.number == kSavedMessagesId || self.number == kArchiveId
@@ -300,16 +273,13 @@ auto lifetime = rpl::lifetime();
 	}
 
 	// If self chat is pinned, delete from view saved messages button.
-	if (isSelfPeerPinned) {
-		if (!selfChatButton.isDeletedFromView) {
-			selfChatButton.isDeletedFromView = true;
-			[stack removeView:selfChatButton.view];
-		}
-	} else {
-		if (selfChatButton.isDeletedFromView) {
-			selfChatButton.isDeletedFromView = false;
-			[stack insertView:selfChatButton.view atIndex:0 inGravity:NSStackViewGravityLeading];
-		}
+	if (isSelfPeerPinned && !selfChatButton.isDeletedFromView) {
+		selfChatButton.isDeletedFromView = true;
+		[stack removeView:selfChatButton.view];
+	}
+	if (!isSelfPeerPinned && selfChatButton.isDeletedFromView) {
+		selfChatButton.isDeletedFromView = false;
+		[stack insertView:selfChatButton.view atIndex:0 inGravity:NSStackViewGravityLeading];
 	}
 }