procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve Emoji / GIFs list variable width support.

This commit is contained in:
John Preston 2017-11-14 14:26:12 +04:00
parent defa0ae4d0
commit fafcd02e7c
11 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/basic.style
View File

@ -291,7 +291,7 @@ inlineRowBorder: 1px;
inlineRowBorderFg: shadowFg;
inlineRowFileNameTop: 2px;
inlineRowFileDescriptionTop: 23px;
inlineResultsMinWidth: 64px;
inlineResultsMinWidth: 48px;
inlineDurationMargin: 3px;
toastTextStyle: defaultTextStyle;

2
Telegram/SourceFiles/boxes/sticker_set_box.cpp
View File

@ -38,7 +38,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
namespace {
constexpr auto kStickersPanelPerRow = Stickers::kPanelPerRow;
constexpr auto kStickersPanelPerRow = 5;
} // namespace

1
Telegram/SourceFiles/chat_helpers/chat_helpers.style
View File

@ -162,6 +162,7 @@ emojiPanShowDuration: 200;
emojiPanDuration: 200;
emojiPanHover: windowBgOver;
emojiPanSlideDuration: 200;
emojiPanDesiredSize: 45px;
emojiPanHeader: 42px;
emojiPanHeaderFont: semiboldFont;

43
Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
View File

@ -26,12 +26,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
#include "lang/lang_keys.h"
namespace ChatHelpers {
namespace {
constexpr auto kEmojiPanelPerRow = Ui::Emoji::kPanelPerRow;
constexpr auto kEmojiPanelRowsPerPage = Ui::Emoji::kPanelRowsPerPage;
} // namespace
class EmojiListWidget::Footer : public TabbedSelector::InnerFooter {
public:
@ -376,11 +370,13 @@ object_ptr<TabbedSelector::InnerFooter> EmojiListWidget::createFooter() {
template <typename Callback>
bool EmojiListWidget::enumerateSections(Callback callback) const {
Expects(_columnCount > 0);
auto info = SectionInfo();
for (auto i = 0; i != kEmojiSectionCount; ++i) {
info.section = i;
info.count = _counts[i];
info.rowsCount = (info.count / kEmojiPanelPerRow) + ((info.count % kEmojiPanelPerRow) ? 1 : 0);
info.rowsCount = (info.count / _columnCount) + ((info.count % _columnCount) ? 1 : 0);
info.rowsTop = info.top + (i == 0 ? st::emojiPanPadding : st::emojiPanHeader);
info.rowsBottom = info.rowsTop + info.rowsCount * _singleSize.height();
if (!callback(info)) {
@ -418,10 +414,15 @@ EmojiListWidget::SectionInfo EmojiListWidget::sectionInfoByOffset(int yOffset) c
int EmojiListWidget::countDesiredHeight(int newWidth) {
auto fullWidth = (st::buttonRadius + newWidth + st::emojiScroll.width);
_rowsLeft = fullWidth / (kEmojiPanelPerRow * 4 + 2);
_columnCount = std::max(
(fullWidth - st::emojiPadding * 2) / st::emojiPanDesiredSize,
1);
_rowsLeft = fullWidth / (_columnCount * 4 + 2);
auto rowsRight = std::max(_rowsLeft, st::emojiScroll.width);
auto singleWidth = (fullWidth - _rowsLeft - rowsRight)
/ kEmojiPanelPerRow;
/ _columnCount;
_rowsLeft -= st::buttonRadius;
_singleSize = QSize(singleWidth, singleWidth - 4 * st::lineWidth);
_picker->setSingleSize(_singleSize);
return sectionInfo(kEmojiSectionCount - 1).rowsBottom + st::emojiPanPadding;
@ -455,12 +456,12 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
}
p.fillRect(r, st::emojiPanBg);
auto fromColumn = floorclamp(r.x() - _rowsLeft, _singleSize.width(), 0, kEmojiPanelPerRow);
auto toColumn = ceilclamp(r.x() + r.width() - _rowsLeft, _singleSize.width(), 0, kEmojiPanelPerRow);
auto fromColumn = floorclamp(r.x() - _rowsLeft, _singleSize.width(), 0, _columnCount);
auto toColumn = ceilclamp(r.x() + r.width() - _rowsLeft, _singleSize.width(), 0, _columnCount);
if (rtl()) {
qSwap(fromColumn, toColumn);
fromColumn = kEmojiPanelPerRow - fromColumn;
toColumn = kEmojiPanelPerRow - toColumn;
fromColumn = _columnCount - fromColumn;
toColumn = _columnCount - toColumn;
}
enumerateSections([this, &p, r, fromColumn, toColumn](const SectionInfo &info) {
@ -480,7 +481,7 @@ void EmojiListWidget::paintEvent(QPaintEvent *e) {
auto toRow = ceilclamp(r.y() + r.height() - info.rowsTop, _singleSize.height(), 0, info.rowsCount);
for (auto i = fromRow; i < toRow; ++i) {
for (auto j = fromColumn; j < toColumn; ++j) {
auto index = i * kEmojiPanelPerRow + j;
auto index = i * _columnCount + j;
if (index >= info.count) break;
auto selected = (!_picker->isHidden() && info.section * MatrixRowShift + index == _pickerSel) || (info.section * MatrixRowShift + index == _selected);
@ -597,7 +598,7 @@ void EmojiListWidget::onShowPicker() {
y += _picker->height() - st::buttonRadius + _singleSize.height() - st::buttonRadius;
}
auto xmax = width() - _picker->width();
auto coef = float64(sel % kEmojiPanelPerRow) / float64(kEmojiPanelPerRow - 1);
auto coef = float64(sel % _columnCount) / float64(_columnCount - 1);
if (rtl()) coef = 1. - coef;
_picker->move(qRound(xmax * coef), y);
@ -615,10 +616,12 @@ void EmojiListWidget::onPickerHidden() {
}
QRect EmojiListWidget::emojiRect(int section, int sel) {
Expects(_columnCount > 0);
auto info = sectionInfo(section);
auto countTillItem = (sel - (sel % kEmojiPanelPerRow));
auto rowsToSkip = (countTillItem / kEmojiPanelPerRow) + ((countTillItem % kEmojiPanelPerRow) ? 1 : 0);
auto x = _rowsLeft + ((sel % kEmojiPanelPerRow) * _singleSize.width());
auto countTillItem = (sel - (sel % _columnCount));
auto rowsToSkip = (countTillItem / _columnCount) + ((countTillItem % _columnCount) ? 1 : 0);
auto x = _rowsLeft + ((sel % _columnCount) * _singleSize.width());
auto y = info.rowsTop + rowsToSkip * _singleSize.height();
return QRect(x, y, _singleSize.width(), _singleSize.height());
}
@ -711,8 +714,8 @@ void EmojiListWidget::updateSelected() {
auto info = sectionInfoByOffset(p.y());
if (p.y() >= info.rowsTop && p.y() < info.rowsBottom) {
auto sx = (rtl() ? width() - p.x() : p.x()) - _rowsLeft;
if (sx >= 0 && sx < kEmojiPanelPerRow * _singleSize.width()) {
newSelected = qFloor((p.y() - info.rowsTop) / _singleSize.height()) * kEmojiPanelPerRow + qFloor(sx / _singleSize.width());
if (sx >= 0 && sx < _columnCount * _singleSize.width()) {
newSelected = qFloor((p.y() - info.rowsTop) / _singleSize.height()) * _columnCount + qFloor(sx / _singleSize.width());
if (newSelected >= _emoji[info.section].size()) {
newSelected = -1;
} else {

1
Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
View File

@ -163,6 +163,7 @@ private:
QVector<EmojiPtr> _emoji[kEmojiSectionCount];
int _rowsLeft = 0;
int _columnCount = 1;
QSize _singleSize;
int _esize = 0;

2
Telegram/SourceFiles/chat_helpers/stickers.h
View File

@ -64,8 +64,6 @@ inline MTPInputStickerSet inputSetId(const Set &set) {
return MTP_inputStickerSetShortName(MTP_string(set.shortName));
}
constexpr auto kPanelPerRow = 5;
void ApplyArchivedResult(const MTPDmessages_stickerSetInstallResultArchive &d);
bool ApplyArchivedResultFake(); // For testing.
void InstallLocally(uint64 setId);

7
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -541,6 +541,7 @@ int StickersListWidget::featuredRowHeight() const {
template <typename Callback>
bool StickersListWidget::enumerateSections(Callback callback) const {
Expects(_section == Section::Stickers);
auto info = SectionInfo();
for (auto i = 0; i != _mySets.size(); ++i) {
auto &set = _mySets[i];
@ -1137,6 +1138,8 @@ void StickersListWidget::removeFavedSticker(int section, int index) {
}
void StickersListWidget::setColumnCount(int count) {
Expects(count > 0);
if (_columnCount != count) {
_columnCount = count;
refreshFooterIcons();
@ -1219,7 +1222,7 @@ void StickersListWidget::refreshStickers() {
resizeToWidth(width());
if (_footer && _columnCount > 0) {
if (_footer) {
refreshFooterIcons();
}
refreshSettingsVisibility();
@ -1236,8 +1239,6 @@ void StickersListWidget::refreshSettingsVisibility() {
}
void StickersListWidget::refreshFooterIcons() {
Expects(_columnCount > 0);
_footer->refreshIcons(ValidateIconAnimations::None);
if (_footer->hasOnlyFeaturedSets() && _section != Section::Featured) {
showStickerSet(Stickers::FeaturedSetId);

2
Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
View File

@ -235,7 +235,7 @@ private:
Footer *_footer = nullptr;
int _rowsLeft = 0;
int _columnCount = 0;
int _columnCount = 1;
QSize _singleSize;
OverState _selected;

5
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.h
View File

@ -80,6 +80,11 @@ public:
// ClickHandlerHost interface
void clickHandlerActiveChanged(const ClickHandlerPtr &p, bool active) override;
int resizeGetHeight(int width) {
_width = width;
return _minh;
}
private:
QSize countFrameSize() const;

6
Telegram/SourceFiles/ui/emoji_config.cpp
View File

@ -269,7 +269,7 @@ RecentEmojiPack &GetRecent() {
0xD83DDE15LLU,
};
for (auto oldKey : defaultRecent) {
if (result.size() >= kPanelPerRow * kPanelRowsPerPage) break;
if (result.size() >= kRecentLimit) break;
if (auto emoji = Ui::Emoji::FromOldKey(oldKey)) {
if (!haveAlready(emoji)) {
@ -307,7 +307,9 @@ void AddRecent(EmojiPtr emoji) {
}
}
if (i == e) {
while (recent.size() >= kPanelPerRow * kPanelRowsPerPage) recent.pop_back();
while (recent.size() >= kRecentLimit) {
recent.pop_back();
}
recent.push_back(qMakePair(emoji, 1));
for (i = recent.end() - 1; i != recent.begin(); --i) {
if ((i - 1)->second > i->second) {

3
Telegram/SourceFiles/ui/emoji_config.h
View File

@ -27,8 +27,7 @@ namespace Ui {
namespace Emoji {
constexpr auto kPostfix = static_cast<ushort>(0xFE0F);
constexpr auto kPanelPerRow = 7;
constexpr auto kPanelRowsPerPage = 6;
constexpr auto kRecentLimit = 42;
void Init();