Improve info layer presentation.

Telegram/SourceFiles/history/history_top_bar_widget.cpp

@@ -345,6 +345,8 @@ void HistoryTopBarWidget::setHistoryPeer(
 		not_null<PeerData*> historyPeer) {
 	if (_historyPeer != historyPeer) {
 		_historyPeer = historyPeer;
+		update();
+
 		updateUnreadBadge();
 		if (_historyPeer) {
 			_info.create(

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 }};

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(
+	if (parts) {
-				p,
+		App::roundRect(
-				rect(),
+			p,
-				st::boxBg,
+			rect(),
-				BoxCorners,
+			st::boxBg,
-				nullptr,
+			BoxCorners,
-				parts);
+			nullptr,
-		}
+			parts);
-	} else {
-		p.fillRect(0, 0, width(), st::boxRadius, st::boxBg);
 	}
 }
 

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::duplicate(forked) | rpl::map($1 > 0)
-		| rpl::map($1 > 0));
+	);
 	tracker.track(button);
 	return button;
 };

Telegram/SourceFiles/info/profile/info_profile_actions.cpp

@@ -64,7 +64,11 @@ object_ptr<Ui::RpWidget> CreateSkipWidget(
 
 object_ptr<Ui::SlideWrap<>> CreateSlideSkipWidget(
 		not_null<Ui::RpWidget*> parent) {
-	return Ui::CreateSlideSkipWidget(parent, st::infoProfileSkip);
+	auto result = Ui::CreateSlideSkipWidget(
+		parent,
+		st::infoProfileSkip);
+	result->setDuration(st::infoSlideDuration);
+	return result;
 }
 
 template <typename Text, typename ToggleOn, typename Callback>
@@ -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<Ui::RpWidget> DetailsFiller::setupInfo() {
 		result,
 		object_ptr<Ui::PlainShadow>(result),
 		st::infoProfileSeparatorPadding)
-	)->toggleOn(std::move(tracker).atLeastOneShownValue());
+	)->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(
+		std::move(tracker).atLeastOneShownValue()
+	);
 	object_ptr<FloatingIcon>(
 		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<UserData*> user) {
@@ -730,7 +744,11 @@ object_ptr<Ui::RpWidget> SetupChannelMembers(
 	auto result = object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent));
-	result->toggleOn(std::move(membersShown));
+	result->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(
+		std::move(membersShown)
+	);
 
 	auto members = result->entity();
 	members->add(object_ptr<BoxContentDivider>(members));

Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp

@@ -100,7 +100,11 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 		_infoWrap = result->add(object_ptr<Ui::SlideWrap<>>(
 			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<Ui::RpWidget> InnerWidget::setupSharedMedia(
 	//	}, result->lifetime());
 	//
 	// Using that instead
-	result->toggleOn(tracker.atLeastOneShownValue());
+	result->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(
+		tracker.atLeastOneShownValue()
+	);
 
 	auto layout = result->entity();
 

Telegram/SourceFiles/info/profile/info_profile_text.cpp

@@ -41,6 +41,9 @@ TextWithLabel CreateTextWithLabel(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent),
 		padding);
+	result->setDuration(
+		st::infoSlideDuration
+	);
 	auto layout = result->entity();
 	auto nonEmptyText = std::move(text)
 		| rpl::before_next([slide = result.data()](

Telegram/SourceFiles/ui/wrap/slide_wrap.cpp

@@ -60,10 +60,11 @@ SlideWrap<RpWidget> *SlideWrap<RpWidget>::setDuration(int duration) {
 SlideWrap<RpWidget> *SlideWrap<RpWidget>::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<RpWidget> *SlideWrap<RpWidget>::toggle(
 				anim::linear);
 		}
 	}
-	if (animated == anim::type::normal) {
+	if (animate) {
 		animationStep();
 	} else {
 		finishAnimating();