music player glitch fixed, added phrase about the members viewing in …

…channels
seahouse · Dec 6, 2015 · 485a6b5 · 485a6b5
1 parent 128cbef
commit 485a6b5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings
@@ -431,6 +431,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org
 "lng_channel_add_admins" = "New administrator";
 "lng_channel_add_members" = "Add members";
 "lng_channel_members" = "Members";
+"lng_channel_only_last_shown" = "Only last {count:_not_used_|# member|# members} are shown here";
 "lng_channel_admins" = "Administrators";
 "lng_channel_add_admin" = "Add Administrator";
 "lng_channel_admin_sure" = "Add {user} to administrators?";

diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp
@@ -1773,7 +1773,10 @@ MembersInner::MembersInner(ChannelData *channel, MembersFilter filter) : TWidget
 , _kickRequestId(0)
 , _kickBox(0)
 , _loading(true)
-, _loadingRequestId(0) {
+, _loadingRequestId(0)
+, _aboutWidth(st::boxWideWidth - st::contactsPadding.left() - st::contactsPhotoSize - st::contactsPadding.left() - st::contactsPadding.right())
+, _about(_aboutWidth)
+, _aboutHeight(0) {
 	connect(App::wnd(), SIGNAL(imageLoaded()), this, SLOT(update()));
 	connect(App::main(), SIGNAL(peerNameChanged(PeerData*, const PeerData::Names&, const PeerData::NameFirstChars&)), this, SLOT(onPeerNameChanged(PeerData*, const PeerData::Names&, const PeerData::NameFirstChars&)));
 	connect(App::main(), SIGNAL(peerPhotoChanged(PeerData*)), this, SLOT(peerUpdated(PeerData*)));
@@ -1824,6 +1827,10 @@ void MembersInner::paintEvent(QPaintEvent *e) {
 			paintDialog(p, _rows[from], data(from), sel, kickSel, kickDown);
 			p.translate(0, _rowHeight);
 		}
+		if (to == _rows.size() && (_rows.size() < _channel->count || _rows.size() >= cMaxGroupCount())) {
+			p.setPen(st::stickersReorderFg);
+			_about.drawLeft(p, st::contactsPadding.left() + st::contactsPhotoSize + st::contactsPadding.left(), st::stickersReorderPadding.top(), _aboutWidth, width());
+		}
 	}
 }
 
@@ -1995,8 +2002,14 @@ void MembersInner::chooseParticipant() {
 void MembersInner::refresh() {
 	if (_rows.isEmpty()) {
 		resize(width(), st::membersPadding.top() + st::noContactsHeight + st::membersPadding.bottom());
+		_aboutHeight = 0;
 	} else {
-		resize(width(), st::membersPadding.top() + _newItemHeight + _rows.size() * _rowHeight + st::membersPadding.bottom());
+		_about.setText(st::boxTextFont, lng_channel_only_last_shown(lt_count, _rows.size()));
+		_aboutHeight = st::stickersReorderPadding.top() + _about.countHeight(_aboutWidth) + st::stickersReorderPadding.bottom();
+		if (_rows.size() >= _channel->count && _rows.size() < cMaxGroupCount()) {
+			_aboutHeight = 0;
+		}
+		resize(width(), st::membersPadding.top() + _newItemHeight + _rows.size() * _rowHeight + st::membersPadding.bottom() + _aboutHeight);
 	}
 	update();
 }

diff --git a/Telegram/SourceFiles/boxes/contactsbox.h b/Telegram/SourceFiles/boxes/contactsbox.h
@@ -386,6 +386,10 @@ public slots:
 	MemberRoles _roles;
 	MemberDatas _datas;
 
+	int32 _aboutWidth;
+	Text _about;
+	int32 _aboutHeight;
+
 	QPoint _lastMousePos;
 
 };

diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
@@ -2716,6 +2716,7 @@ void MainWidget::hideAll() {
 	_topBar.hide();
 	_mediaType.hide();
 	_player.hide();
+	_playerHeight = 0;
 }
 
 void MainWidget::showAll() {
@@ -2790,6 +2791,7 @@ void MainWidget::showAll() {
 			}
 		}
 	}
+	resizeEvent(0);
 
 	App::wnd()->checkHistoryActivation();
 }