procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactored pinned buttons in touchbar.

This commit is contained in:
23rd 2019-06-26 19:27:00 +03:00 committed by John Preston
parent 821bd3c65b
commit 26569683ca
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Telegram/SourceFiles/platform/mac/mac_touchbar.mm
View File

@ -425,9 +425,12 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
} }
self.number = num; self.number = num;
NSButton *button = [NSButton buttonWithImage:[NSImage imageNamed:NSImageNameStopProgressTemplate] target:self action:@selector(buttonActionPin:)]; NSButton *button = [[NSButton alloc] initWithFrame:NSZeroRect];
[button setBordered:NO]; NSButtonCell *cell = [[NSButtonCell alloc] init];
[button sizeToFit]; [cell setBezelStyle:NSBezelStyleCircular];
button.cell = cell;
button.target = self;
button.action = @selector(buttonActionPin:);
self.view = button; self.view = button;
using Update = const Window::Theme::BackgroundUpdate; using Update = const Window::Theme::BackgroundUpdate;
@ -529,14 +532,13 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
const auto s = kIdealIconSize * cIntRetinaFactor(); const auto s = kIdealIconSize * cIntRetinaFactor();
_userpic = QPixmap(s, s); _userpic = QPixmap(s, s);
Painter paint(&_userpic); Painter paint(&_userpic);
paint.fillRect(QRectF(0, 0, s, s), QColor(0, 0, 0, 255)); paint.fillRect(QRectF(0, 0, s, s), Qt::black);
if (self.number == kArchiveId) { if (self.number != kArchiveId) {
if (const auto folder = Auth().data().folderLoaded(Data::Folder::kId)) {
folder->paintUserpic(paint, 0, 0, s);
}
} else {
Ui::EmptyUserpic::PaintSavedMessages(paint, 0, 0, s, s); Ui::EmptyUserpic::PaintSavedMessages(paint, 0, 0, s, s);
} else if (const auto folder =
Auth().data().folderLoaded(Data::Folder::kId)) {
folder->paintUserpic(paint, 0, 0, s);
} }
_userpic.setDevicePixelRatio(cRetinaFactor()); _userpic.setDevicePixelRatio(cRetinaFactor());
[self updateImage:_userpic]; [self updateImage:_userpic];
@ -567,7 +569,9 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
- (void) updateImage:(QPixmap)pixmap { - (void) updateImage:(QPixmap)pixmap {
NSButton *button = self.view; NSButton *button = self.view;
button.image = [qt_mac_create_nsimage(pixmap) autorelease]; NSImage *image = [qt_mac_create_nsimage(pixmap) autorelease];
[image setSize:NSMakeSize(kScrubberHeight, kScrubberHeight)];
[button.cell setImage:image];
} }
@end @end
@ -923,10 +927,10 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
Auth().data().chatsListChanges( Auth().data().chatsListChanges(
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {
if (const auto window = App::wnd()) { if (const auto window = App::wnd()) {
if (!Auth().data().stickerSets().size()) {
Auth().api().updateStickers();
}
if (const auto controller = window->sessionController()) { if (const auto controller = window->sessionController()) {
if (!Auth().data().stickerSets().size()) {
Auth().api().updateStickers();
}
_lifetimeSessionControllerChecker.destroy(); _lifetimeSessionControllerChecker.destroy();
controller->activeChatChanges( controller->activeChatChanges(
) | rpl::start_with_next([=](Dialogs::Key key) { ) | rpl::start_with_next([=](Dialogs::Key key) {
@ -1075,10 +1079,11 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
button.isDeletedFromView = true; button.isDeletedFromView = true;
continue; continue;
} }
[stackView addView:button.view inGravity:NSStackViewGravityCenter]; [stackView addView:button.view inGravity:NSStackViewGravityTrailing];
} }
const auto space = 30;
[stackView setSpacing:-15]; [stackView setEdgeInsets:NSEdgeInsetsMake(0, space / 2., 0, space)];
[stackView setSpacing:space];
item.view = stackView; item.view = stackView;
[dictionaryItem setObject:item.view forKey:@"view"]; [dictionaryItem setObject:item.view forKey:@"view"];
return item; return item;
@ -1090,7 +1095,7 @@ void AppendEmojiPacks(std::vector<PickerScrubberItem> &to) {
- (void) createTouchBar { - (void) createTouchBar {
_touchBarMain = [[NSTouchBar alloc] init]; _touchBarMain = [[NSTouchBar alloc] init];
_touchBarMain.delegate = self; _touchBarMain.delegate = self;
_touchBarMain.defaultItemIdentifiers = @[kPinnedPanelItemIdentifier]; [self showItemInMain:nil];
_touchBarAudioPlayer = [[NSTouchBar alloc] init]; _touchBarAudioPlayer = [[NSTouchBar alloc] init];
_touchBarAudioPlayer.delegate = self; _touchBarAudioPlayer.delegate = self;