From de15da8a9350c3ebe701a7cf11333400efc4680c Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 19 Nov 2017 15:37:15 +0400 Subject: [PATCH] Improve info layer presentation. --- .../history/history_top_bar_widget.cpp | 2 + Telegram/SourceFiles/info/info.style | 4 ++ .../SourceFiles/info/info_layer_widget.cpp | 43 ++++++++++--------- .../info/media/info_media_buttons.h | 6 ++- .../info/profile/info_profile_actions.cpp | 28 +++++++++--- .../profile/info_profile_inner_widget.cpp | 12 +++++- .../info/profile/info_profile_text.cpp | 3 ++ Telegram/SourceFiles/ui/wrap/slide_wrap.cpp | 5 ++- 8 files changed, 72 insertions(+), 31 deletions(-) diff --git a/Telegram/SourceFiles/history/history_top_bar_widget.cpp b/Telegram/SourceFiles/history/history_top_bar_widget.cpp index bbe4cfdb4..770cd7836 100644 --- a/Telegram/SourceFiles/history/history_top_bar_widget.cpp +++ b/Telegram/SourceFiles/history/history_top_bar_widget.cpp @@ -345,6 +345,8 @@ void HistoryTopBarWidget::setHistoryPeer( not_null historyPeer) { if (_historyPeer != historyPeer) { _historyPeer = historyPeer; + update(); + updateUnreadBadge(); if (_historyPeer) { _info.create( diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index ca6b6780c..a78b83028 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -103,6 +103,8 @@ infoTopBarSearchRow: SearchFieldRow(infoLayerMediaSearch) { } } +infoSlideDuration: 0; + infoTopBarBackIcon: icon {{ "info_back", boxTitleCloseFg }}; infoTopBarBackIconOver: icon {{ "info_back", boxTitleCloseFgOver }}; infoTopBarHeight: 54px; @@ -184,6 +186,8 @@ infoTopBar: InfoTopBar { highlightDuration: 240; } +infoLayerTopMinimal: 20px; +infoLayerTopMaximal: 40px; infoLayerTopBarHeight: boxLayerTitleHeight; infoLayerTopBarBackIcon: icon {{ "info_back", boxTitleCloseFg }}; infoLayerTopBarBackIconOver: icon {{ "info_back", boxTitleCloseFgOver }}; diff --git a/Telegram/SourceFiles/info/info_layer_widget.cpp b/Telegram/SourceFiles/info/info_layer_widget.cpp index 6f912ae6a..5a8435708 100644 --- a/Telegram/SourceFiles/info/info_layer_widget.cpp +++ b/Telegram/SourceFiles/info/info_layer_widget.cpp @@ -137,8 +137,12 @@ int LayerWidget::resizeGetHeight(int newWidth) { if (newHeight > windowHeight || newWidth >= windowWidth) { newHeight = windowHeight; } + auto layerTop = snap( + windowHeight / 24, + st::infoLayerTopMinimal, + st::infoLayerTopMaximal); - setRoundedCorners(newHeight < windowHeight); + setRoundedCorners(layerTop + newHeight < windowHeight); // First resize content to new width and get the new desired height. auto contentTop = st::boxRadius; @@ -148,39 +152,38 @@ int LayerWidget::resizeGetHeight(int newWidth) { } _content->setGeometry(0, contentTop, newWidth, contentHeight); - moveToLeft((windowWidth - newWidth) / 2, (windowHeight - newHeight) / 2); + moveToLeft((windowWidth - newWidth) / 2, layerTop); return newHeight; } void LayerWidget::setRoundedCorners(bool rounded) { _roundedCorners = rounded; - setAttribute(Qt::WA_OpaquePaintEvent, !_roundedCorners); +// setAttribute(Qt::WA_OpaquePaintEvent, !_roundedCorners); } void LayerWidget::paintEvent(QPaintEvent *e) { Painter p(this); + + auto clip = e->rect(); + auto r = st::boxRadius; + auto parts = RectPart::None | 0; + if (clip.intersects({ 0, 0, width(), r })) { + parts |= RectPart::FullTop; + } if (_roundedCorners) { - auto clip = e->rect(); - auto r = st::boxRadius; - auto parts = RectPart::None | 0; - if (clip.intersects({ 0, 0, width(), r })) { - parts |= RectPart::FullTop; - } if (clip.intersects({ 0, height() - r, width(), r })) { parts |= RectPart::FullBottom; } - if (parts) { - App::roundRect( - p, - rect(), - st::boxBg, - BoxCorners, - nullptr, - parts); - } - } else { - p.fillRect(0, 0, width(), st::boxRadius, st::boxBg); + } + if (parts) { + App::roundRect( + p, + rect(), + st::boxBg, + BoxCorners, + nullptr, + parts); } } diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h index c6a5262ea..aa7b720e2 100644 --- a/Telegram/SourceFiles/info/media/info_media_buttons.h +++ b/Telegram/SourceFiles/info/media/info_media_buttons.h @@ -80,9 +80,11 @@ inline auto AddCountedButton( parent, std::move(text), st::infoSharedMediaButton)) + )->setDuration( + st::infoSlideDuration )->toggleOn( - rpl::duplicate(forked) - | rpl::map($1 > 0)); + rpl::duplicate(forked) | rpl::map($1 > 0) + ); tracker.track(button); return button; }; diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index ac0ef0a09..990f645c2 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -64,7 +64,11 @@ object_ptr CreateSkipWidget( object_ptr> CreateSlideSkipWidget( not_null parent) { - return Ui::CreateSlideSkipWidget(parent, st::infoProfileSkip); + auto result = Ui::CreateSlideSkipWidget( + parent, + st::infoProfileSkip); + result->setDuration(st::infoSlideDuration); + return result; } template @@ -82,7 +86,9 @@ auto AddActionButton( std::move(text), st)) ); - result->toggleOn( + result->setDuration( + st::infoSlideDuration + )->toggleOn( std::move(toggleOn) )->entity()->addClickHandler(std::move(callback)); result->finishAnimating(); @@ -260,7 +266,11 @@ object_ptr DetailsFiller::setupInfo() { result, object_ptr(result), st::infoProfileSeparatorPadding) - )->toggleOn(std::move(tracker).atLeastOneShownValue()); + )->setDuration( + st::infoSlideDuration + )->toggleOn( + std::move(tracker).atLeastOneShownValue() + ); object_ptr( result, st::infoIconInformation, @@ -591,7 +601,11 @@ void ActionsFiller::addJoinChannelAction( CreateSkipWidget( _wrap, st::infoBlockButtonSkip)) - )->toggleOn(rpl::duplicate(joinVisible)); + )->setDuration( + st::infoSlideDuration + )->toggleOn( + rpl::duplicate(joinVisible) + ); } void ActionsFiller::fillUserActions(not_null user) { @@ -730,7 +744,11 @@ object_ptr SetupChannelMembers( auto result = object_ptr>( parent, object_ptr(parent)); - result->toggleOn(std::move(membersShown)); + result->setDuration( + st::infoSlideDuration + )->toggleOn( + std::move(membersShown) + ); auto members = result->entity(); members->add(object_ptr(members)); diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp index 0f0648529..40fe19832 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp @@ -100,7 +100,11 @@ object_ptr InnerWidget::setupContent( _infoWrap = result->add(object_ptr>( result, std::move(details)) - )->toggleOn(_cover->toggledValue()); + )->setDuration( + st::infoSlideDuration + )->toggleOn( + _cover->toggledValue() + ); } else { result->add(std::move(details)); } @@ -215,7 +219,11 @@ object_ptr InnerWidget::setupSharedMedia( // }, result->lifetime()); // // Using that instead - result->toggleOn(tracker.atLeastOneShownValue()); + result->setDuration( + st::infoSlideDuration + )->toggleOn( + tracker.atLeastOneShownValue() + ); auto layout = result->entity(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_text.cpp b/Telegram/SourceFiles/info/profile/info_profile_text.cpp index 77360eb03..783da925d 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_text.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_text.cpp @@ -41,6 +41,9 @@ TextWithLabel CreateTextWithLabel( parent, object_ptr(parent), padding); + result->setDuration( + st::infoSlideDuration + ); auto layout = result->entity(); auto nonEmptyText = std::move(text) | rpl::before_next([slide = result.data()]( diff --git a/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp b/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp index 7e652626b..3a3b6f66d 100644 --- a/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp +++ b/Telegram/SourceFiles/ui/wrap/slide_wrap.cpp @@ -60,10 +60,11 @@ SlideWrap *SlideWrap::setDuration(int duration) { SlideWrap *SlideWrap::toggle( bool shown, anim::type animated) { + auto animate = (animated == anim::type::normal) && _duration; auto changed = (_toggled != shown); if (changed) { _toggled = shown; - if (animated == anim::type::normal) { + if (animate) { _animation.start( [this] { animationStep(); }, _toggled ? 0. : 1., @@ -72,7 +73,7 @@ SlideWrap *SlideWrap::toggle( anim::linear); } } - if (animated == anim::type::normal) { + if (animate) { animationStep(); } else { finishAnimating();