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

Fix build in macOS.

Browse Source
This commit is contained in:
John Preston
2019-10-20 15:24:09 +04:00
parent 768a3d5a12
commit 467be135d6
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
View File

@@ -69,7 +69,7 @@ void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
[[maybe_unused]] const auto usrc = reinterpret_cast<const uint*>(src); [[maybe_unused]] const auto usrc = reinterpret_cast<const uint*>(src);
#ifndef TDESKTOP_OFFICIAL_TARGET #ifndef TDESKTOP_OFFICIAL_TARGET
for (auto i = 0; i != count; ++i) { for (auto i = 0; i != intsCount; ++i) {
dst[i] = qPremultiply(src[i]); dst[i] = qPremultiply(src[i]);
} }
#elif QT_VERSION < QT_VERSION_CHECK(5, 12, 0) #elif QT_VERSION < QT_VERSION_CHECK(5, 12, 0)

18
Telegram/SourceFiles/window/themes/window_theme_preview.cpp
View File

@@ -992,19 +992,19 @@ QImage GeneratePreview(
} }
int DefaultPreviewTitleHeight() { int DefaultPreviewTitleHeight() {
return st::titleHeight; return st::defaultWindowTitle.height;
} }
void DefaultPreviewWindowTitle(Painter &p, const style::palette &palette, QRect body, int outerWidth) { void DefaultPreviewWindowTitle(Painter &p, const style::palette &palette, QRect body, int outerWidth) {
auto titleRect = QRect(body.x(), body.y() - st::titleHeight, body.width(), st::titleHeight); auto titleRect = QRect(body.x(), body.y() - st::defaultWindowTitle.height, body.width(), st::defaultWindowTitle.height);
p.fillRect(titleRect, QColor(0, 0, 0)); p.fillRect(titleRect, QColor(0, 0, 0));
p.fillRect(titleRect, st::titleBgActive[palette]); p.fillRect(titleRect, st::titleBgActive[palette]);
auto right = st::titleButtonClose.width; auto right = st::windowTitleButtonClose.width;
st::titleButtonClose.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonClose.iconPosition.x(), titleRect.y() + st::titleButtonClose.iconPosition.y(), outerWidth); st::windowTitleButtonClose.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::windowTitleButtonClose.iconPosition.x(), titleRect.y() + st::windowTitleButtonClose.iconPosition.y(), outerWidth);
right += st::titleButtonMaximize.width; right += st::defaultWindowTitle.maximize.width;
st::titleButtonMaximize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonMaximize.iconPosition.x(), titleRect.y() + st::titleButtonMaximize.iconPosition.y(), outerWidth); st::defaultWindowTitle.maximize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::defaultWindowTitle.maximize.iconPosition.x(), titleRect.y() + st::defaultWindowTitle.maximize.iconPosition.y(), outerWidth);
right += st::titleButtonMinimize.width; right += st::defaultWindowTitle.minimize.width;
st::titleButtonMinimize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::titleButtonMinimize.iconPosition.x(), titleRect.y() + st::titleButtonMinimize.iconPosition.y(), outerWidth); st::defaultWindowTitle.minimize.icon[palette].paint(p, titleRect.x() + titleRect.width() - right + st::defaultWindowTitle.minimize.iconPosition.x(), titleRect.y() + st::defaultWindowTitle.minimize.iconPosition.y(), outerWidth);
p.fillRect(titleRect.x(), titleRect.y() + titleRect.height() - st::lineWidth, titleRect.width(), st::lineWidth, st::titleShadow[palette]); p.fillRect(titleRect.x(), titleRect.y() + titleRect.height() - st::lineWidth, titleRect.width(), st::lineWidth, st::titleShadow[palette]);
} }
@@ -1052,7 +1052,7 @@ void DefaultPreviewWindowFramePaint(QImage &preview, const style::palette &palet
Painter p(&preview); Painter p(&preview);
DefaultPreviewWindowTitle(p, palette, body, outerWidth); DefaultPreviewWindowTitle(p, palette, body, outerWidth);
auto inner = QRect(body.x(), body.y() - st::titleHeight, body.width(), body.height() + st::titleHeight); auto inner = QRect(body.x(), body.y() - st::defaultWindowTitle.height, body.width(), body.height() + st::defaultWindowTitle.height);
p.setClipRegion(QRegion(inner.marginsAdded(QMargins(size, size, size, size))) - inner); p.setClipRegion(QRegion(inner.marginsAdded(QMargins(size, size, size, size))) - inner);
p.drawImage(inner.x() - left, inner.y() - top, topLeft); p.drawImage(inner.x() - left, inner.y() - top, topLeft);
p.drawImage(inner.x() + inner.width() + right - width, inner.y() - top, topRight); p.drawImage(inner.x() + inner.width() + right - width, inner.y() - top, topRight);

2
Telegram/lib_base

Submodule Telegram/lib_base updated: 2169055d74...7f9a2d5e9a