mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Replaced snap util function with std::clamp.

Browse Source
This commit is contained in:
23rd
2021-01-23 06:29:50 +03:00
parent 4895e5e110
commit dd01ece14a
44 changed files with 193 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Telegram/SourceFiles/core/core_settings.cpp
View File

@@ -101,7 +101,7 @@ QByteArray Settings::serialize() const {
<< qint32(_floatPlayerColumn)
<< qint32(_floatPlayerCorner)
<< qint32(_thirdSectionInfoEnabled ? 1 : 0)
<< qint32(snap(
<< qint32(std::clamp(
qRound(_dialogsWidthRatio.current() * 1000000),
0,
1000000))
@@ -259,7 +259,10 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
>> thirdColumnWidth
>> thirdSectionExtendedBy
>> notifyFromAll;
dialogsWidthRatio = snap(dialogsWidthRatioInt / 1000000., 0., 1.);
dialogsWidthRatio = std::clamp(
dialogsWidthRatioInt / 1000000.,
0.,
1.);
}
if (!stream.atEnd()) {
stream >> nativeWindowFrame;

19
Telegram/SourceFiles/core/utils.h
View File

@@ -124,11 +124,6 @@ T rand_value() {
return result;
}
template <typename T>
inline T snap(const T &v, const T &_min, const T &_max) {
return (v < _min) ? _min : ((v > _max) ? _max : v);
}
QString translitRusEng(const QString &rus);
QString rusKeyboardLayoutSwitch(const QString &from);
@@ -150,16 +145,22 @@ inline int rowscount(int fullCount, int countPerRow) {
return (fullCount + countPerRow - 1) / countPerRow;
}
inline int floorclamp(int value, int step, int lowest, int highest) {
return qMin(qMax(value / step, lowest), highest);
return std::clamp(value / step, lowest, highest);
}
inline int floorclamp(float64 value, int step, int lowest, int highest) {
return qMin(qMax(static_cast<int>(std::floor(value / step)), lowest), highest);
return std::clamp(
static_cast<int>(std::floor(value / step)),
lowest,
highest);
}
inline int ceilclamp(int value, int step, int lowest, int highest) {
return qMax(qMin((value + step - 1) / step, highest), lowest);
return std::clamp((value + step - 1) / step, lowest, highest);
}
inline int ceilclamp(float64 value, int32 step, int32 lowest, int32 highest) {
return qMax(qMin(static_cast<int>(std::ceil(value / step)), highest), lowest);
return std::clamp(
static_cast<int>(std::ceil(value / step)),
lowest,
highest);
}
static int32 FullArcLength = 360 * 16;