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

Use separate TopBar for History and Overview.

Browse Source 
Move TopBar widget to History and Overview from MainWidget.
This commit is contained in:
John Preston
2017-03-27 15:24:38 +03:00
parent cdca00368f
commit 8d4be19952
14 changed files with 309 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
Telegram/SourceFiles/overviewwidget.cpp
View File

@@ -44,6 +44,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "observer_peer.h"
#include "auth_session.h"
#include "storage/file_download.h"
#include "ui/widgets/dropdown_menu.h"
// flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html
@@ -1895,13 +1896,23 @@ OverviewInner::~OverviewInner() {
clear();
}
OverviewWidget::OverviewWidget(QWidget *parent, PeerData *peer, MediaOverviewType type) : TWidget(parent)
OverviewWidget::OverviewWidget(QWidget *parent, gsl::not_null<Window::Controller*> controller, PeerData *peer, MediaOverviewType type) : TWidget(parent)
, _controller(controller)
, _topBar(this, _controller)
, _scroll(this, st::settingsScroll, false)
, _mediaType(this, st::defaultDropdownMenu)
, _topShadow(this, st::shadowFg) {
_inner = _scroll->setOwnedWidget(object_ptr<OverviewInner>(this, _scroll, peer, type));
_scroll->move(0, 0);
_inner->move(0, 0);
connect(_topBar, &Window::TopBarWidget::clicked, this, [this] { topBarClick(); });
_mediaType->hide();
_mediaType->setOrigin(Ui::PanelAnimation::Origin::TopRight);
_topBar->mediaTypeButton()->installEventFilter(_mediaType);
_topBar->show();
_scroll->show();
connect(_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
@@ -1934,11 +1945,14 @@ void OverviewWidget::onScroll() {
}
void OverviewWidget::resizeEvent(QResizeEvent *e) {
_topBar->setGeometryToLeft(0, 0, width(), st::topBarHeight);
auto scrollAreaTop = _topBar->bottomNoMargins();
_noDropResizeIndex = true;
int32 st = _scroll->scrollTop();
_scroll->resize(size());
int32 newScrollTop = _inner->resizeToWidth(width(), st, height());
if (int32 addToY = App::main() ? App::main()->contentScrollAddToY() : 0) {
auto st = _scroll->scrollTop();
_scroll->setGeometryToLeft(0, scrollAreaTop, width(), height() - scrollAreaTop);
auto newScrollTop = _inner->resizeToWidth(width(), st, height() - _topBar->height());
if (auto addToY = App::main() ? App::main()->contentScrollAddToY() : 0) {
newScrollTop += addToY;
}
if (newScrollTop != _scroll->scrollTop()) {
@@ -1947,7 +1961,9 @@ void OverviewWidget::resizeEvent(QResizeEvent *e) {
_noDropResizeIndex = false;
_topShadow->resize(width() - ((!Adaptive::OneColumn() && !_inGrab) ? st::lineWidth : 0), st::lineWidth);
_topShadow->moveToLeft((!Adaptive::OneColumn() && !_inGrab) ? st::lineWidth : 0, 0);
_topShadow->moveToLeft((!Adaptive::OneColumn() && !_inGrab) ? st::lineWidth : 0, _topBar->bottomNoMargins());
_mediaType->moveToRight(0, scrollAreaTop);
}
void OverviewWidget::paintEvent(QPaintEvent *e) {
@@ -1957,18 +1973,17 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
auto progress = _a_show.current(getms(), 1.);
if (_a_show.animating()) {
auto retina = cIntRetinaFactor();
auto inCacheTop = st::topBarHeight;
auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);
auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
auto coordOver = fromLeft ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
auto shadow = fromLeft ? (1. - progress) : progress;
if (coordOver > 0) {
p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * retina, inCacheTop * retina, coordOver * retina, height() * retina));
p.drawPixmap(QRect(0, 0, coordOver, height()), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, height() * retina));
p.setOpacity(shadow);
p.fillRect(0, 0, coordOver, height(), st::slideFadeOutBg);
p.setOpacity(1);
}
p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, inCacheTop * retina, _cacheOver.width(), height() * retina));
p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, height()), _cacheOver, QRect(0, 0, _cacheOver.width(), height() * retina));
p.setOpacity(shadow);
st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), height()));
return;
@@ -1994,24 +2009,6 @@ void OverviewWidget::scrollReset() {
}
bool OverviewWidget::paintTopBar(Painter &p, int decreaseWidth) {
if (_a_show.animating()) {
auto progress = _a_show.current(1.);
auto retina = cIntRetinaFactor();
auto fromLeft = (_showDirection == Window::SlideDirection::FromLeft);
auto coordUnder = fromLeft ? anim::interpolate(-st::slideShift, 0, progress) : anim::interpolate(0, -st::slideShift, progress);
auto coordOver = fromLeft ? anim::interpolate(0, width(), progress) : anim::interpolate(width(), 0, progress);
auto shadow = fromLeft ? (1. - progress) : progress;
if (coordOver > 0) {
p.drawPixmap(QRect(0, 0, coordOver, st::topBarHeight), _cacheUnder, QRect(-coordUnder * retina, 0, coordOver * retina, st::topBarHeight * retina));
p.setOpacity(shadow);
p.fillRect(0, 0, coordOver, st::topBarHeight, st::slideFadeOutBg);
p.setOpacity(1);
}
p.drawPixmap(QRect(coordOver, 0, _cacheOver.width() / retina, st::topBarHeight), _cacheOver, QRect(0, 0, _cacheOver.width(), st::topBarHeight * retina));
p.setOpacity(shadow);
st::slideShadow.fill(p, QRect(coordOver - st::slideShadow.width(), 0, st::slideShadow.width(), st::topBarHeight));
return false;
}
st::topBarBack.paint(p, (st::topBarArrowPadding.left() - st::topBarBack.width()) / 2, (st::topBarHeight - st::topBarBack.height()) / 2, width());
p.setFont(st::defaultLightButton.font);
p.setPen(st::defaultLightButton.textFg);
@@ -2053,7 +2050,7 @@ void OverviewWidget::switchType(MediaOverviewType type) {
_header = _header.toUpper();
noSelectingScroll();
App::main()->topBar()->showSelected(0);
_topBar->showSelected(0);
updateTopBarSelection();
scrollReset();
@@ -2063,14 +2060,27 @@ void OverviewWidget::switchType(MediaOverviewType type) {
activate();
}
bool OverviewWidget::showMediaTypeSwitch() const {
for (int32 i = 0; i < OverviewCount; ++i) {
if (!(_mediaTypeMask & ~(1 << i))) {
return false;
}
}
return true;
}
bool OverviewWidget::contentOverlapped(const QRect &globalRect) {
return _mediaType->overlaps(globalRect);
}
void OverviewWidget::updateTopBarSelection() {
int32 selectedForForward, selectedForDelete;
_inner->getSelectionState(selectedForForward, selectedForDelete);
_selCount = selectedForForward ? selectedForForward : selectedForDelete;
_inner->setSelectMode(_selCount > 0);
if (App::main()) {
App::main()->topBar()->showSelected(_selCount > 0 ? _selCount : 0, (selectedForDelete == selectedForForward));
App::main()->topBar()->update();
_topBar->showSelected(_selCount > 0 ? _selCount : 0, (selectedForDelete == selectedForForward));
_topBar->update();
}
if (App::wnd() && !Ui::isLayerShown()) {
_inner->activate();
@@ -2122,11 +2132,12 @@ void OverviewWidget::showAnimated(Window::SlideDirection direction, const Window
_cacheUnder = params.oldContentCache;
show();
_topBar->showAll();
_topShadow->setVisible(params.withTopBarShadow ? false : true);
_cacheOver = App::main()->grabForShowAnimation(params);
_topShadow->setVisible(params.withTopBarShadow ? true : false);
App::main()->topBar()->startAnim();
_topBar->hide();
_scrollSetAfterShow = _scroll->scrollTop();
_scroll->hide();
@@ -2135,25 +2146,27 @@ void OverviewWidget::showAnimated(Window::SlideDirection direction, const Window
}
_a_show.start([this] { animationCallback(); }, 0., 1., st::slideDuration, Window::SlideAnimation::transition());
App::main()->topBar()->update();
_backAnimationButton.create(this);
_backAnimationButton->setClickedCallback([this] { topBarClick(); });
_backAnimationButton->setGeometry(_topBar->geometry());
_backAnimationButton->show();
activate();
}
void OverviewWidget::animationCallback() {
update();
App::main()->topBar()->update();
if (!_a_show.animating()) {
_topShadow->show();
_cacheUnder = _cacheOver = QPixmap();
App::main()->topBar()->stopAnim();
doneShow();
}
}
void OverviewWidget::doneShow() {
_topBar->animationFinished();
_backAnimationButton.destroy();
_topBar->show();
_scroll->show();
_scroll->scrollToY(_scrollSetAfterShow);
activate();
@@ -2166,6 +2179,47 @@ void OverviewWidget::mediaOverviewUpdated(const Notify::PeerUpdate &update) {
onScroll();
updateTopBarSelection();
}
int32 mask = 0;
History *h = update.peer ? App::historyLoaded(update.peer->migrateTo() ? update.peer->migrateTo() : update.peer) : nullptr;
History *m = (update.peer && update.peer->migrateFrom()) ? App::historyLoaded(update.peer->migrateFrom()->id) : 0;
if (h) {
for (int32 i = 0; i < OverviewCount; ++i) {
if (!h->overview[i].isEmpty() || h->overviewCount(i) > 0 || i == type()) {
mask |= (1 << i);
} else if (m && (!m->overview[i].isEmpty() || m->overviewCount(i) > 0)) {
mask |= (1 << i);
}
}
}
if (mask != _mediaTypeMask) {
auto typeLabel = [](MediaOverviewType type) -> QString {
switch (type) {
case OverviewPhotos: return lang(lng_media_type_photos);
case OverviewVideos: return lang(lng_media_type_videos);
case OverviewMusicFiles: return lang(lng_media_type_songs);
case OverviewFiles: return lang(lng_media_type_files);
case OverviewVoiceFiles: return lang(lng_media_type_audios);
case OverviewLinks: return lang(lng_media_type_links);
}
return QString();
};
_mediaType->clearActions();
for (auto i = 0; i != OverviewCount; ++i) {
if (mask & (1 << i)) {
auto type = static_cast<MediaOverviewType>(i);
auto label = typeLabel(type);
if (!label.isEmpty()) {
_mediaType->addAction(label, [this, type] {
switchType(type);
_mediaType->hideAnimated();
});
}
}
}
_mediaTypeMask = mask;
_mediaType->move(width() - _mediaType->width(), st::topBarHeight);
updateTopBarSelection();
}
}
void OverviewWidget::changingMsgId(HistoryItem *row, MsgId newId) {