mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 09:05:14 +00:00
Code Issues Releases Wiki Activity

Moved inline bot result structs from structs.cpp/h module.

Browse Source 
Moved inline bot result layouts from layout.cpp/h module.
Over status prepared for inline bot file result icon.
Dependencies reduced, inline bots code moved to InlineBots namespace.
Build in Xcode and QtCreator broken.
This commit is contained in:
John Preston
2016-04-05 01:09:46 +04:00
parent a2fc7f6915
commit 3e2485678d
31 changed files with 2789 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/overviewwidget.cpp
View File

@@ -809,7 +809,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
p.setClipRect(r);
}
uint64 ms = getms();
OverviewPaintContext context(ms, _selMode);
PaintContextOverview context(ms, _selMode);
if (_history->overview[_type].isEmpty() && (!_migrated || !_history->overviewLoaded(_type) || _migrated->overview[_type].isEmpty())) {
QPoint dogPos((_width - st::msgDogImg.pxWidth()) / 2, ((height() - st::msgDogImg.pxHeight()) * 4) / 9);
@@ -908,7 +908,7 @@ void OverviewInner::onUpdateSelected() {
upon = false;
}
if (i >= 0) {
if (LayoutMediaItem *media = _items.at(i)->toLayoutMediaItem()) {
if (LayoutMediaItemBase *media = _items.at(i)->toLayoutMediaItem()) {
item = media->getItem();
index = i;
if (upon) {
@@ -945,7 +945,7 @@ void OverviewInner::onUpdateSelected() {
j = _reversed ? (l - i - 1) : i;
}
if (LayoutMediaItem *media = _items.at(i)->toLayoutMediaItem()) {
if (LayoutMediaItemBase *media = _items.at(i)->toLayoutMediaItem()) {
item = media->getItem();
index = i;
media->getState(lnk, cursorState, m.x() - _rowsLeft, m.y() - _marginTop - top);
@@ -1632,7 +1632,7 @@ void OverviewInner::mediaOverviewUpdated() {
allGood = false;
}
HistoryItem *item = App::histItemById(itemChannel(msgid), itemMsgId(msgid));
LayoutMediaItem *layout = layoutPrepare(item);
LayoutMediaItemBase *layout = layoutPrepare(item);
if (!layout) continue;
setLayoutItem(index, layout, 0);
@@ -1678,7 +1678,7 @@ void OverviewInner::mediaOverviewUpdated() {
allGood = false;
}
HistoryItem *item = App::histItemById(itemChannel(msgid), itemMsgId(msgid));
LayoutMediaItem *layout = layoutPrepare(item);
LayoutMediaItemBase *layout = layoutPrepare(item);
if (!layout) continue;
if (withDates) {
@@ -1840,8 +1840,8 @@ void OverviewInner::recountMargins() {
}
}
LayoutMediaItem *OverviewInner::layoutPrepare(HistoryItem *item) {
if (!item) return 0;
LayoutMediaItemBase *OverviewInner::layoutPrepare(HistoryItem *item) {
if (!item) return nullptr;
LayoutItems::const_iterator i = _layoutItems.cend();
HistoryMedia *media = item->getMedia();
@@ -1879,10 +1879,10 @@ LayoutMediaItem *OverviewInner::layoutPrepare(HistoryItem *item) {
i.value()->initDimensions();
}
}
return (i == _layoutItems.cend()) ? 0 : i.value();
return (i == _layoutItems.cend()) ? nullptr : i.value();
}
LayoutItem *OverviewInner::layoutPrepare(const QDate &date, bool month) {
LayoutOverviewItemBase *OverviewInner::layoutPrepare(const QDate &date, bool month) {
int32 key = date.year() * 100 + date.month();
if (!month) key = key * 100 + date.day();
LayoutDates::const_iterator i = _layoutDates.constFind(key);
@@ -1893,7 +1893,7 @@ LayoutItem *OverviewInner::layoutPrepare(const QDate &date, bool month) {
return i.value();
}
int32 OverviewInner::setLayoutItem(int32 index, LayoutItem *item, int32 top) {
int32 OverviewInner::setLayoutItem(int32 index, LayoutOverviewItemBase *item, int32 top) {
if (_items.size() > index) {
_items[index] = item;
} else {