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

Moved vars from interface to implementation in touchbar.

This commit is contained in:
23rd 2019-05-27 17:21:29 +03:00 committed by John Preston
parent 2c1e3cd094
commit 7798f88c6f
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/platform/mac/touchbar.h
View File

@ -20,22 +20,7 @@ enum class TouchBarType {
};
} // namespace
@interface TouchBar : NSTouchBar {
@private
NSView *_parentView;
NSMutableArray *_mainPinnedButtons;
NSTouchBar *_touchBarMain;
NSTouchBar *_touchBarAudioPlayer;
Platform::TouchBarType _touchBarType;
Platform::TouchBarType _touchBarTypeBeforeLock;
double _duration;
double _position;
rpl::lifetime _lifetime;
}
@interface TouchBar : NSTouchBar
@property(retain) NSDictionary * _Nullable touchBarItems;

28
Telegram/SourceFiles/platform/mac/touchbar.mm
View File

@ -92,11 +92,7 @@ NSString *FormatTime(int time) {
} // namespace
@interface PinnedDialogButton : NSCustomTouchBarItem {
rpl::lifetime _lifetime;
rpl::lifetime _userpicChangedLifetime;
bool isWaitingUserpicLoad;
}
@interface PinnedDialogButton : NSCustomTouchBarItem
@property(nonatomic, assign) int number;
@property(nonatomic, assign) PeerData *peer;
@ -109,7 +105,11 @@ NSString *FormatTime(int time) {
@end // @interface PinnedDialogButton
@implementation PinnedDialogButton : NSCustomTouchBarItem
@implementation PinnedDialogButton {
rpl::lifetime _lifetime;
rpl::lifetime _userpicChangedLifetime;
bool isWaitingUserpicLoad;
}
- (id) init:(int)num {
if (num == kSavedMessagesId) {
@ -241,7 +241,21 @@ NSString *FormatTime(int time) {
@interface TouchBar()<NSTouchBarDelegate>
@end // @interface TouchBar
@implementation TouchBar
@implementation TouchBar {
NSView *_parentView;
NSMutableArray *_mainPinnedButtons;
NSTouchBar *_touchBarMain;
NSTouchBar *_touchBarAudioPlayer;
Platform::TouchBarType _touchBarType;
Platform::TouchBarType _touchBarTypeBeforeLock;
double _duration;
double _position;
rpl::lifetime _lifetime;
}
- (id) init:(NSView *)view {
self = [super init];