mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Version bumped to 0.9.61 stable.

Browse Source 
Merge branch 'archived_stickers' into cancel_reset.

Conflicts:
	Telegram/Resources/winrc/Telegram.rc
	Telegram/Resources/winrc/Updater.rc
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/Telegram.vcxproj.filters
	Telegram/Telegram.xcodeproj/project.pbxproj
	Telegram/build/version
This commit is contained in:
John Preston
2016-07-25 22:54:40 +03:00
parent 75ff3c3d28 02e54dd8ba
commit dbdf28d0a0
61 changed files with 3998 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Telegram/SourceFiles/mainwidget.h
View File

@@ -108,27 +108,6 @@ public:
int32 lastWidth, lastScrollTop;
};
class StackItems : public QVector<StackItem*> {
public:
bool contains(PeerData *peer) const {
for (int32 i = 0, l = size(); i < l; ++i) {
if (at(i)->peer == peer) {
return true;
}
}
return false;
}
void clear() {
for (int32 i = 0, l = size(); i < l; ++i) {
delete at(i);
}
QVector<StackItem*>::clear();
}
~StackItems() {
clear();
}
};
enum SilentNotifiesStatus {
SilentNotifiesDontChange,
SilentNotifiesSetSilent,
@@ -224,6 +203,7 @@ public:
bool mediaTypeSwitch();
void showWideSection(const Window::SectionMemento &memento);
void showMediaOverview(PeerData *peer, MediaOverviewType type, bool back = false, int32 lastScrollTop = -1);
bool stackIsEmpty() const;
void showBackFromStack();
void orderWidgets();
QRect historyRect() const;
@@ -404,7 +384,7 @@ public:
void ui_repaintInlineItem(const InlineBots::Layout::ItemBase *layout);
bool ui_isInlineItemVisible(const InlineBots::Layout::ItemBase *layout);
bool ui_isInlineItemBeingChosen();
void ui_showPeerHistory(quint64 peer, qint32 msgId, bool back);
void ui_showPeerHistory(quint64 peer, qint32 msgId, Ui::ShowWay way);
PeerData *ui_getPeerForMouseAction();
void notify_botCommandsChanged(UserData *bot);
@@ -492,7 +472,7 @@ public slots:
void onSharePhoneWithBot(PeerData *recipient);
void ui_showPeerHistoryAsync(quint64 peerId, qint32 showAtMsgId);
void ui_showPeerHistoryAsync(quint64 peerId, qint32 showAtMsgId, Ui::ShowWay way);
void ui_autoplayMediaInlineAsync(qint32 channelId, qint32 msgId);
private slots:
@@ -518,6 +498,8 @@ private:
Window::SectionSlideParams prepareOverviewAnimation();
Window::SectionSlideParams prepareDialogsAnimation();
void saveSectionInStack();
bool _started = false;
uint64 failedObjId = 0;
@@ -597,7 +579,7 @@ private:
ChildWidget<Window::TopBarWidget> _topBar;
ConfirmBox *_forwardConfirm = nullptr; // for single column layout
ChildWidget<HistoryHider> _hider = { nullptr };
StackItems _stack;
std_::vector_of_moveable<std_::unique_ptr<StackItem>> _stack;
PeerData *_peerInStack = nullptr;
MsgId _msgIdInStack = 0;