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

Minor refactoring

This commit is contained in:
Evgenii Zheltonozhskii 2018-10-21 19:56:59 +03:00 committed by Alex
parent 4b78d52194
commit 25fbc2f7e1
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -2026,40 +2026,24 @@ void DialogsInner::loadPeerPhotos() {
_filterResults[from]->history()->peer->loadUserpic();
}
}
from = (yFrom > filteredOffset() + st::searchedBarHeight ?
((yFrom - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) :
0) -
_filterResults.size();
auto offset = filteredOffset() + st::searchedBarHeight;
from = (yFrom > offset ? ((yFrom - offset) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size();
if (from < 0) from = 0;
if (from < _peerSearchResults.size()) {
qint32 to = (yTo > filteredOffset() + st::searchedBarHeight ?
((yTo - filteredOffset() - st::searchedBarHeight) / qint32(st::dialogsRowHeight)) :
0) -
_filterResults.size() + 1;
qint32 to =
(yTo > offset ? ((yTo - offset) / qint32(st::dialogsRowHeight)) : 0) - _filterResults.size() + 1;
if (to > _peerSearchResults.size()) to = _peerSearchResults.size();
for (; from < to; ++from) {
_peerSearchResults[from]->peer->loadUserpic();
}
}
from = (yFrom > filteredOffset() +
((_peerSearchResults.empty() ? 0 : st::searchedBarHeight) + st::searchedBarHeight) ?
((yFrom - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) -
st::searchedBarHeight) /
qint32(st::dialogsRowHeight)) :
0) -
_filterResults.size() - _peerSearchResults.size();
auto offset2 = offset + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight);
auto results_size = _filterResults.size() + _peerSearchResults.size();
from = (yFrom > offset2 ? ((yFrom - offset2) / qint32(st::dialogsRowHeight)) : 0) - results_size;
if (from < 0) from = 0;
if (from < _searchResults.size()) {
qint32 to = (yTo > filteredOffset() + (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) +
st::searchedBarHeight ?
((yTo - filteredOffset() - (_peerSearchResults.empty() ? 0 : st::searchedBarHeight) -
st::searchedBarHeight) /
qint32(st::dialogsRowHeight)) :
0) -
_filterResults.size() - _peerSearchResults.size() + 1,
w = width();
qint32 to = (yTo > offset2 ? ((yTo - offset2) / qint32(st::dialogsRowHeight)) : 0) - results_size + 1;
if (to > _searchResults.size()) to = _searchResults.size();
for (; from < to; ++from) {

8
Telegram/SourceFiles/mainwindow.cpp
View File

@ -1609,11 +1609,9 @@ void LastCrashedWindow::updateControls() {
h += _networkSettings.height() + padding;
QRect scr(QApplication::primaryScreen()->availableGeometry());
QSize s(2 * padding +
QFontMetrics(_label.font())
.width(qsl("Last time %1 was not closed properly.").arg(str_const_toString(AppName))) +
padding + _networkSettings.width(),
h);
auto label_width = QFontMetrics(_label.font())
.width(qsl("Last time %1 was not closed properly.").arg(str_const_toString(AppName)));
QSize s(2 * padding + label_width + padding + _networkSettings.width(), h);
if (s == size()) {
resizeEvent(0);
} else {