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

Reduce entropy a bit

This commit is contained in:
Evgenii Zheltonozhskii 2018-06-04 03:31:11 +03:00
parent 93d2fd3035
commit e5ca84bd80
23 changed files with 30 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,9 +369,7 @@ void StickerSetBox::Inner::paintEvent(QPaintEvent *e) {
if (_pack.isEmpty()) return;
auto ms = getms();
qint32 rows = _pack.size() / kStickersPanelPerRow + ((_pack.size() % kStickersPanelPerRow) ? 1 : 0);
qint32 from = std::floor(e->rect().top() / st::stickersSize.height()),
to = std::floor(e->rect().bottom() / st::stickersSize.height()) + 1;
qint32 from = std::floor(e->rect().top() / st::stickersSize.height()), to = std::floor(e->rect().bottom() / st::stickersSize.height()) + 1;
for (qint32 i = from; i < to; ++i) {
for (qint32 j = 0; j < kStickersPanelPerRow; ++j) {

10
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -952,12 +952,12 @@ void StickersBox::Inner::setPressed(int pressed) {
update(0, _itemsTop + _pressed * _rowHeight, width(), _rowHeight);
auto &set = _rows[_pressed];
auto rippleMask = Ui::RippleAnimation::rectMask(QSize(width(), _rowHeight));
if (!_rows[_pressed]->ripple) {
_rows[_pressed]->ripple = std::make_unique<Ui::RippleAnimation>(
st::contactsRipple, std::move(rippleMask),
[this, index = _pressed] { update(0, _itemsTop + index * _rowHeight, width(), _rowHeight); });
if (!set->ripple) {
set->ripple = std::make_unique<Ui::RippleAnimation>(st::contactsRipple, std::move(rippleMask), [this, index = _pressed] {
update(0, _itemsTop + index * _rowHeight, width(), _rowHeight);
});
}
_rows[_pressed]->ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(0, _itemsTop + _pressed * _rowHeight));
set->ripple->add(mapFromGlobal(QCursor::pos()) - QPoint(0, _itemsTop + _pressed * _rowHeight));
}
}

3
Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp
View File

@ -79,9 +79,6 @@ void ChatSearchFromController::rowClicked(not_null<PeerListRow *> row) {
}
void ChatSearchFromController::rebuildRows() {
auto ms = getms();
auto wasEmpty = !delegate()->peerListFullRowsCount();
auto now = unixtime();
QMultiMap<qint32, UserData *> ordered;
if (_chat->noParticipantInfo()) {

2
Telegram/SourceFiles/history/history_admin_log_section.cpp
View File

@ -379,7 +379,7 @@ void Widget::paintEvent(QPaintEvent *e) {
Painter p(this);
auto clip = e->rect();
auto ms = getms();
//auto ms = getms();
//_historyDownShown.step(ms);
auto fill = QRect(0, 0, width(), App::main()->height());

6
Telegram/SourceFiles/mainwidget.cpp
View File

@ -920,7 +920,6 @@ void MainWidget::showSendPathsLayer() {
void MainWidget::deleteLayer(int selectedCount) {
if (selectedCount) {
auto forDelete = true;
auto selected = _overview ? _overview->getSelectedItems() : _history->getSelectedItems();
if (!selected.isEmpty()) {
Ui::show(Box<DeleteMessagesBox>(selected));
@ -1307,7 +1306,7 @@ void MainWidget::checkedHistory(PeerData *peer, const MTPmessages_Messages &resu
if (h) Local::addSavedPeer(peer, h->lastMsgDate);
} else if (peer->isChannel()) {
if (peer->asChannel()->inviter > 0 && peer->asChannel()->amIn()) {
if (auto from = App::userLoaded(peer->asChannel()->inviter)) {
if (App::userLoaded(peer->asChannel()->inviter)) {
auto h = App::history(peer->id);
h->clear(true);
h->addNewerSlice(QVector<MTPMessage>());
@ -1358,9 +1357,6 @@ void MainWidget::onCacheBackground() {
result.setDevicePixelRatio(cRetinaFactor());
{
QPainter p(&result);
auto left = 0;
auto top = 0;
auto right = _willCacheFor.width();
auto bottom = _willCacheFor.height();
auto w = bg.width() / cRetinaFactor();
auto h = bg.height() / cRetinaFactor();

1
Telegram/SourceFiles/media/media_clip_reader.cpp
View File

@ -769,7 +769,6 @@ Manager::ResultHandleState Manager::handleResult(ReaderPrivate *reader, ProcessR
auto it = constUnsafeFindReaderPointer(reader);
if (it != _readerPointers.cend()) {
qint32 index = 0;
Reader *r = it.key();
Reader::Frame *frame = it.key()->frameToWrite(&index);
if (frame) {
frame->clear();

7
Telegram/SourceFiles/media/player/media_player_cover.cpp
View File

@ -279,13 +279,10 @@ void CoverWidget::handleSongUpdate(const TrackState &state) {
void CoverWidget::updateTimeText(const TrackState &state) {
QString time;
qint64 position = 0, length = 0, display = 0;
qint64 display = 0;
auto frequency = state.frequency;
if (!IsStoppedOrStopping(state.state)) {
display = position = state.position;
length = state.length;
} else {
length = state.length ? state.length : (state.id.audio()->song()->duration * frequency);
display = state.position;
}
_lastDurationMs = (state.length * 1000LL) / frequency;

5
Telegram/SourceFiles/media/player/media_player_widget.cpp
View File

@ -431,11 +431,10 @@ void Widget::handleSongUpdate(const TrackState &state) {
void Widget::updateTimeText(const TrackState &state) {
QString time;
qint64 position = 0, length = 0, display = 0;
qint64 display = 0;
auto frequency = state.frequency;
if (!IsStoppedOrStopping(state.state)) {
display = position = state.position;
length = state.length;
display = state.position;
} else if (state.length) {
display = state.length;
} else if (state.id.audio()->song()) {

8
Telegram/SourceFiles/mediaview.cpp
View File

@ -2141,7 +2141,7 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
if (titleRect.x() < 0) {
titleRect = QRect(0, _themePreviewRect.y(), width(), st::themePreviewMargin.top());
}
if (auto fillTitleRect = (titleRect.y() < 0)) {
if (titleRect.y() < 0) {
titleRect.moveTop(0);
fillOverlay(titleRect);
}
@ -2154,10 +2154,8 @@ void MediaView::paintThemePreview(Painter &p, QRect clip) {
p.drawTextLeft(titleRect.x(), titleRect.y(), width(), lang(lng_theme_preview_title));
}
auto buttonsRect = QRect(_themePreviewRect.x(),
_themePreviewRect.y() + _themePreviewRect.height() - st::themePreviewMargin.bottom(),
_themePreviewRect.width(), st::themePreviewMargin.bottom());
if (auto fillButtonsRect = (buttonsRect.y() + buttonsRect.height() > height())) {
auto buttonsRect = QRect(_themePreviewRect.x(), _themePreviewRect.y() + _themePreviewRect.height() - st::themePreviewMargin.bottom(), _themePreviewRect.width(), st::themePreviewMargin.bottom());
if (buttonsRect.y() + buttonsRect.height() > height()) {
buttonsRect.moveTop(height() - buttonsRect.height());
fillOverlay(buttonsRect);
}

4
Telegram/SourceFiles/mtproto/session.cpp
View File

@ -50,9 +50,7 @@ void SessionData::setKey(const AuthKeyPtr &key) {
void SessionData::clear(Instance *instance) {
RPCCallbackClears clearCallbacks;
{
QReadLocker locker1(haveSentMutex()), locker2(toResendMutex()), locker3(haveReceivedMutex()),
locker4(wereAckedMutex());
auto receivedResponsesEnd = _receivedResponses.cend();
QReadLocker locker1(haveSentMutex()), locker2(toResendMutex()), locker3(haveReceivedMutex()), locker4(wereAckedMutex());
clearCallbacks.reserve(_haveSent.size() + _wereAcked.size());
for (auto i = _haveSent.cbegin(), e = _haveSent.cend(); i != e; ++i) {
auto requestId = i.value()->requestId;

16
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -784,11 +784,6 @@ bool OverviewInner::preloadLocal() {
}
TextSelection OverviewInner::itemSelectedValue(qint32 index) const {
qint32 selfrom = -1, selto = -1;
if (_dragSelFromIndex >= 0 && _dragSelToIndex >= 0) {
selfrom = _dragSelToIndex;
selto = _dragSelFromIndex;
}
if (_items.at(index)->toMediaItem()) { // draw item
if (index >= _dragSelToIndex && index <= _dragSelFromIndex && _dragSelToIndex >= 0) {
return (_dragSelecting && _items.at(index)->msgId() > 0) ? FullSelection : TextSelection{0, 0};
@ -834,7 +829,6 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
}
SelectedItems::const_iterator selEnd = _selected.cend();
bool hasSel = !_selected.isEmpty();
if (_type == OverviewPhotos || _type == OverviewVideos) {
qint32 count = _items.size(), rowsCount = count / _photosInRow + ((count % _photosInRow) ? 1 : 0);
@ -859,7 +853,7 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
}
} else {
p.translate(_rowsLeft, _marginTop);
qint32 y = 0, w = _rowWidth;
qint32 y = 0;
for (qint32 j = 0, l = _items.size(); j < l; ++j) {
qint32 i = _reversed ? (l - j - 1) : j, nexti = _reversed ? (i - 1) : (i + 1);
qint32 nextItemTop =
@ -897,7 +891,6 @@ void OverviewInner::onUpdateSelected() {
ClickHandlerHost *lnkhost = nullptr;
HistoryItem *item = 0;
qint32 index = -1;
qint32 newsel = 0;
HistoryCursorState cursorState = HistoryDefaultCursorState;
if (_type == OverviewPhotos || _type == OverviewVideos) {
double w = (double(_width - st::overviewPhotoSkip) / _photosInRow);
@ -1016,11 +1009,8 @@ void OverviewInner::onUpdateSelected() {
}
if (_dragAction == Selecting) {
bool canSelectMany = (_peer != 0);
if (_mousedItem == _dragItem && lnk && !_selected.isEmpty() &&
_selected.cbegin().value() != FullSelection) {
bool afterSymbol = false, uponSymbol = false;
quint16 second = 0;
_selected[_dragItem] = {0, 0};
if (_mousedItem == _dragItem && lnk && !_selected.isEmpty() && _selected.cbegin().value() != FullSelection) {
_selected[_dragItem] = { 0, 0 };
updateDragSelection(0, -1, 0, -1, false);
} else if (canSelectMany) {
bool selectingDown =

6
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -251,13 +251,10 @@ void MainWindow::psCreateTrayIcon() {
void MainWindow::psFirstShow() {
psCreateTrayIcon();
psUpdateMargins();
bool showShadows = true;
show();
//_private.enableShadow(winId());
if (cWindowPos().maximized) {
DEBUG_LOG(("Window Pos: First show, setting maximized."));
setWindowState(Qt::WindowMaximized);
@ -270,7 +267,6 @@ void MainWindow::psFirstShow() {
} else {
show();
}
showShadows = false;
} else {
show();
}

1
Telegram/SourceFiles/settings/settings_cover.cpp
View File

@ -134,7 +134,6 @@ int CoverWidget::resizeGetHeight(int newWidth) {
void CoverWidget::refreshButtonsGeometry(int newWidth) {
int buttonLeft = _userpicButton->x() + _userpicButton->width() + st::settingsButtonLeft;
int buttonsRight = newWidth - st::settingsButtonSkip;
_setPhoto->moveToLeft(buttonLeft, _userpicButton->y() + st::settingsButtonTop, newWidth);
buttonLeft += _setPhoto->width() + st::settingsButtonSkip;
_editName->moveToLeft(buttonLeft, _setPhoto->y(), newWidth);

2
Telegram/SourceFiles/storage/localimageloader.cpp
View File

@ -359,7 +359,7 @@ void FileLoadTask::process() {
filemime = _information->filemime;
if (auto image = base::get_if<FileLoadTask::Image>(&_information->media)) {
fullimage = base::take(image->data);
if (auto opaque = (filemime != stickerMime)) {
if (filemime != stickerMime) {
fullimage = Images::prepareOpaque(std::move(fullimage));
}
isAnimation = image->animated;

8
Telegram/SourceFiles/structs.cpp
View File

@ -138,7 +138,7 @@ void EmptyUserpic::Impl::fillString(const QString &name) {
auto ch = name.constData(), end = ch + name.size();
while (ch != end) {
auto emojiLength = 0;
if (auto emoji = Ui::Emoji::Find(ch, end, &emojiLength)) {
if (Ui::Emoji::Find(ch, end, &emojiLength)) {
ch += emojiLength;
} else if (ch->isHighSurrogate()) {
++ch;
@ -1771,10 +1771,8 @@ void DocumentData::performActionOnLoad() {
auto showImage = !isVideo() && (size < App::kImageSizeLimit);
auto playVoice = voice() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
auto playMusic = tryPlaySong() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen);
auto playAnimation = isAnimation() &&
(_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen) && showImage &&
item && item->getMedia();
if (auto applyTheme = isTheme()) {
auto playAnimation = isAnimation() && (_actionOnLoad == ActionOnLoadPlayInline || _actionOnLoad == ActionOnLoadOpen) && showImage && item && item->getMedia();
if (isTheme()) {
if (!loc.isEmpty() && loc.accessEnable()) {
Messenger::Instance().showDocument(this, item);
loc.accessDisable();

2
Telegram/SourceFiles/ui/countryinput.cpp
View File

@ -97,8 +97,6 @@ CountryInput::CountryInput(QWidget *parent, const style::InputField &st)
initCountries();
resize(_st.width, _st.heightMin);
auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() -
_st.placeholderMargins.right() - 1;
auto placeholderFont = _st.placeholderFont->f;
placeholderFont.setStyleStrategy(QFont::PreferMatch);
auto metrics = QFontMetrics(placeholderFont);

2
Telegram/SourceFiles/ui/images.cpp
View File

@ -73,7 +73,7 @@ QImage prepareBlur(QImage img) {
uchar *pix = img.bits();
if (pix) {
int w = img.width(), h = img.height(), wold = w, hold = h;
int w = img.width(), h = img.height();
const int radius = 3;
const int r1 = radius + 1;
const int div = radius * 2 + 1;

1
Telegram/SourceFiles/ui/style/style_core.cpp
View File

@ -84,7 +84,6 @@ void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect
auto pattern = anim::shifted(c);
auto resultBytesPerPixel = (src.depth() >> 3);
constexpr auto resultIntsPerPixel = 1;
auto resultIntsPerLine = (outResult->bytesPerLine() >> 2);
auto resultIntsAdded = resultIntsPerLine - width * resultIntsPerPixel;

1
Telegram/SourceFiles/ui/text/text.cpp
View File

@ -513,7 +513,6 @@ public:
qint32 i = 0, l = preparsed.size();
source.entities.clear();
source.entities.reserve(l);
const QChar s = source.text.size();
for (; i < l; ++i) {
auto type = preparsed.at(i).type();
if (((type == EntityInTextMention || type == EntityInTextMentionName) && !parseMentions) ||

7
Telegram/SourceFiles/ui/text/text_entity.cpp
View File

@ -1253,7 +1253,7 @@ QString EscapeForRichParsing(const QString &text) {
QString SingleLine(const QString &text) {
auto result = text;
auto s = text.unicode(), ch = s, e = text.unicode() + text.size();
auto s = text.unicode(), e = text.unicode() + text.size();
// Trim.
while (s < e && chIsTrimmed(*s)) {
@ -1315,7 +1315,6 @@ QStringList PrepareSearchWords(const QString &query, const QRegularExpression *S
auto result = QStringList();
if (!clean.isEmpty()) {
auto list = clean.split(SplitterOverride ? *SplitterOverride : RegExpWordSplit(), QString::SkipEmptyParts);
auto size = list.size();
result.reserve(list.size());
for_const (auto &word, list) {
auto trimmed = word.trimmed();
@ -1401,7 +1400,7 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, qint32 limit) {
}
int elen = 0;
if (auto e = Ui::Emoji::Find(ch, end, &elen)) {
if (Ui::Emoji::Find(ch, end, &elen)) {
for (int i = 0; i < elen; ++i, ++ch, ++s) {
if (ch->isHighSurrogate() && i + 1 < elen && (ch + 1)->isLowSurrogate()) {
++ch;
@ -2066,7 +2065,7 @@ QString ApplyEntities(const TextWithEntities &text) {
QString result;
qint32 size = text.text.size();
const QChar *b = text.text.constData(), *already = b, *e = b + size;
const QChar *b = text.text.constData(), *already = b;//, *e = b + size;
auto entity = text.entities.cbegin(), end = text.entities.cend();
auto skipTillRelevantAndGetTag = [&entity, &end, size, &tags] {
while (entity != end) {

6
Telegram/SourceFiles/ui/text/text_entity.h
View File

@ -219,10 +219,8 @@ enum class PrepareTextOption {
CheckLinks,
};
inline QString PrepareForSending(const QString &text, PrepareTextOption option = PrepareTextOption::IgnoreLinks) {
auto result = TextWithEntities{text};
auto prepareFlags = (option == PrepareTextOption::CheckLinks) ?
(TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands) :
0;
auto result = TextWithEntities { text }; // , {}}
auto prepareFlags = (option == PrepareTextOption::CheckLinks) ? (TextParseLinks | TextParseMentions | TextParseHashtags | TextParseBotCommands) : 0;
PrepareForSending(result, prepareFlags);
return result.text;
}

1
Telegram/SourceFiles/ui/widgets/input_fields.cpp
View File

@ -1567,7 +1567,6 @@ void FlatInput::touchEvent(QTouchEvent *e) {
case QEvent::TouchEnd:
if (!_touchPress) return;
if (!_touchMove && window()) {
Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton);
QPoint mapped(mapFromGlobal(_touchStart)), winMapped(window()->mapFromGlobal(_touchStart));
if (_touchRightButton) {

1
Telegram/SourceFiles/ui/widgets/tooltip.cpp
View File

@ -381,7 +381,6 @@ void ImportantTooltip::updateGeometry() {
}
void ImportantTooltip::resizeEvent(QResizeEvent *e) {
auto inner = countInner();
auto contentTop = _st.padding.top();
if (_useTransparency && (_side & RectPart::Bottom)) {
contentTop += _st.arrow;