Improve macOS voice chat window title.

This commit is contained in:
John Preston 2020-12-17 15:59:41 +04:00
parent bb8647dd4c
commit 7aa12b6e07
2 changed files with 6 additions and 6 deletions

View File

@ -220,8 +220,6 @@ GroupPanel::GroupPanel(not_null<GroupCall*> call)
_layerBg->setStyleOverrides(&st::groupCallBox, &st::groupCallLayerBox);
_settings->setColorOverrides(_mute->colorOverrides());
_window->setTitleStyle(st::groupCallTitle);
SubscribeToMigration(
_peer,
_window->lifetime(),
@ -276,7 +274,7 @@ void GroupPanel::initWindow() {
_window->setAttribute(Qt::WA_NoSystemBackground);
_window->setWindowIcon(
QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
_window->setTitleStyle(st::callTitle);
_window->setTitleStyle(st::groupCallTitle);
subscribeToPeerChanges();
@ -589,7 +587,7 @@ std::optional<QRect> GroupPanel::computeTitleRect() const {
#ifdef Q_OS_WIN
const auto controls = _controls->geometry();
return QRect(0, 0, controls.x(), controls.height());
#elif Q_OS_MAC // Q_OS_WIN
#elif defined Q_OS_MAC // Q_OS_WIN
return QRect(70, 0, widget()->width() - 70, 28);
#else // Q_OS_WIN || Q_OS_MAC
return std::nullopt;
@ -678,7 +676,9 @@ void GroupPanel::refreshTitle() {
const auto top = _title
? st::groupCallSubtitleTop
: st::groupCallTitleTop;
_subtitle->moveToLeft(middle - (_subtitle->width() / 2), top);
_subtitle->moveToLeft(
(widget()->width() - _subtitle->width()) / 2,
top);
}
void GroupPanel::paint(QRect clip) {

@ -1 +1 @@
Subproject commit 3bd98ac5640523d2ccd241c2c0af49aba9494066
Subproject commit 5e3897fcff29c65c72fdf8f7f282aee0f6bed644