diff --git a/Telegram/Resources/icons/calls_close_main.png b/Telegram/Resources/icons/calls_close_main.png new file mode 100644 index 000000000..9fc9d04b2 Binary files /dev/null and b/Telegram/Resources/icons/calls_close_main.png differ diff --git a/Telegram/Resources/icons/calls_close_main@2x.png b/Telegram/Resources/icons/calls_close_main@2x.png new file mode 100644 index 000000000..6d4dbe21a Binary files /dev/null and b/Telegram/Resources/icons/calls_close_main@2x.png differ diff --git a/Telegram/Resources/icons/calls_close_main@3x.png b/Telegram/Resources/icons/calls_close_main@3x.png new file mode 100644 index 000000000..c5c3f1620 Binary files /dev/null and b/Telegram/Resources/icons/calls_close_main@3x.png differ diff --git a/Telegram/Resources/icons/calls_close_shadow.png b/Telegram/Resources/icons/calls_close_shadow.png new file mode 100644 index 000000000..1d4bafdd8 Binary files /dev/null and b/Telegram/Resources/icons/calls_close_shadow.png differ diff --git a/Telegram/Resources/icons/calls_close_shadow@2x.png b/Telegram/Resources/icons/calls_close_shadow@2x.png new file mode 100644 index 000000000..8d3b45b99 Binary files /dev/null and b/Telegram/Resources/icons/calls_close_shadow@2x.png differ diff --git a/Telegram/Resources/icons/calls_close_shadow@3x.png b/Telegram/Resources/icons/calls_close_shadow@3x.png new file mode 100644 index 000000000..bb290a25c Binary files /dev/null and b/Telegram/Resources/icons/calls_close_shadow@3x.png differ diff --git a/Telegram/Resources/icons/calls_maximize_main.png b/Telegram/Resources/icons/calls_maximize_main.png new file mode 100644 index 000000000..31d4ee719 Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_main.png differ diff --git a/Telegram/Resources/icons/calls_maximize_main@2x.png b/Telegram/Resources/icons/calls_maximize_main@2x.png new file mode 100644 index 000000000..03075fc78 Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_main@2x.png differ diff --git a/Telegram/Resources/icons/calls_maximize_main@3x.png b/Telegram/Resources/icons/calls_maximize_main@3x.png new file mode 100644 index 000000000..6ee23f39f Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_main@3x.png differ diff --git a/Telegram/Resources/icons/calls_maximize_shadow.png b/Telegram/Resources/icons/calls_maximize_shadow.png new file mode 100644 index 000000000..65d654571 Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_shadow.png differ diff --git a/Telegram/Resources/icons/calls_maximize_shadow@2x.png b/Telegram/Resources/icons/calls_maximize_shadow@2x.png new file mode 100644 index 000000000..254fdc01c Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_shadow@2x.png differ diff --git a/Telegram/Resources/icons/calls_maximize_shadow@3x.png b/Telegram/Resources/icons/calls_maximize_shadow@3x.png new file mode 100644 index 000000000..c767e8780 Binary files /dev/null and b/Telegram/Resources/icons/calls_maximize_shadow@3x.png differ diff --git a/Telegram/Resources/icons/calls_minimize_main.png b/Telegram/Resources/icons/calls_minimize_main.png new file mode 100644 index 000000000..caf58d74b Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_main.png differ diff --git a/Telegram/Resources/icons/calls_minimize_main@2x.png b/Telegram/Resources/icons/calls_minimize_main@2x.png new file mode 100644 index 000000000..b8afe8998 Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_main@2x.png differ diff --git a/Telegram/Resources/icons/calls_minimize_main@3x.png b/Telegram/Resources/icons/calls_minimize_main@3x.png new file mode 100644 index 000000000..9a837c92a Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_main@3x.png differ diff --git a/Telegram/Resources/icons/calls_minimize_shadow.png b/Telegram/Resources/icons/calls_minimize_shadow.png new file mode 100644 index 000000000..820f59da7 Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_shadow.png differ diff --git a/Telegram/Resources/icons/calls_minimize_shadow@2x.png b/Telegram/Resources/icons/calls_minimize_shadow@2x.png new file mode 100644 index 000000000..86627c14b Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_shadow@2x.png differ diff --git a/Telegram/Resources/icons/calls_minimize_shadow@3x.png b/Telegram/Resources/icons/calls_minimize_shadow@3x.png new file mode 100644 index 000000000..d482e3937 Binary files /dev/null and b/Telegram/Resources/icons/calls_minimize_shadow@3x.png differ diff --git a/Telegram/Resources/icons/calls_restore_main.png b/Telegram/Resources/icons/calls_restore_main.png new file mode 100644 index 000000000..7fca94dc4 Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_main.png differ diff --git a/Telegram/Resources/icons/calls_restore_main@2x.png b/Telegram/Resources/icons/calls_restore_main@2x.png new file mode 100644 index 000000000..89f87652f Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_main@2x.png differ diff --git a/Telegram/Resources/icons/calls_restore_main@3x.png b/Telegram/Resources/icons/calls_restore_main@3x.png new file mode 100644 index 000000000..4bbb6f22b Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_main@3x.png differ diff --git a/Telegram/Resources/icons/calls_restore_shadow.png b/Telegram/Resources/icons/calls_restore_shadow.png new file mode 100644 index 000000000..a7b663976 Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_shadow.png differ diff --git a/Telegram/Resources/icons/calls_restore_shadow@2x.png b/Telegram/Resources/icons/calls_restore_shadow@2x.png new file mode 100644 index 000000000..f34082769 Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_shadow@2x.png differ diff --git a/Telegram/Resources/icons/calls_restore_shadow@3x.png b/Telegram/Resources/icons/calls_restore_shadow@3x.png new file mode 100644 index 000000000..61e79f92a Binary files /dev/null and b/Telegram/Resources/icons/calls_restore_shadow@3x.png differ diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index a2cdf0356..119e651cd 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -262,86 +262,76 @@ callBarSignalBars: CallSignalBars(callPanelSignalBars) { callSignalMargin: 8px; callSignalPadding: 4px; +callTitleButton: IconButton { + width: 34px; + height: 30px; + iconPosition: point(0px, 0px); +} +callTitleMinimizeIcon: icon { + { "calls_minimize_shadow", windowShadowFg }, + { "calls_minimize_main", callNameFg }, +}; +callTitleMinimizeIconOver: icon { + { size(34px, 30px), callBgButton }, + { size(34px, 30px), callMuteRipple }, + { "calls_minimize_shadow", windowShadowFg }, + { "calls_minimize_main", callNameFg }, +}; +callTitleMaximizeIcon: icon { + { "calls_maximize_shadow", windowShadowFg }, + { "calls_maximize_main", callNameFg }, +}; +callTitleMaximizeIconOver: icon { + { size(34px, 30px), callBgButton }, + { size(34px, 30px), callMuteRipple }, + { "calls_maximize_shadow", windowShadowFg }, + { "calls_maximize_main", callNameFg }, +}; +callTitleRestoreIcon: icon { + { "calls_restore_shadow", windowShadowFg }, + { "calls_restore_main", callNameFg }, +}; +callTitleRestoreIconOver: icon { + { size(34px, 30px), callBgButton }, + { size(34px, 30px), callMuteRipple }, + { "calls_restore_shadow", windowShadowFg }, + { "calls_restore_main", callNameFg }, +}; +callTitleCloseIcon: icon { + { "calls_close_shadow", windowShadowFg }, + { "calls_close_main", callNameFg }, +}; +callTitleCloseIconOver: icon { + { size(34px, 30px), titleButtonCloseBgOver }, + { "calls_close_shadow", windowShadowFg }, + { "calls_close_main", titleButtonCloseFgOver }, +}; callTitle: WindowTitle(defaultWindowTitle) { height: 0px; bg: callBgOpaque; bgActive: callBgOpaque; fg: transparent; fgActive: transparent; - minimize: IconButton(windowTitleButton) { - icon: icon { - { size(24px, 21px), callBgButton }, - { "title_button_minimize", callStatusFg, point(4px, 4px) }, - }; - iconOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_minimize", callStatusFg, point(4px, 4px) }, - }; + minimize: IconButton(callTitleButton) { + icon: callTitleMinimizeIcon; + iconOver: callTitleMinimizeIconOver; } - minimizeIconActive: icon { - { size(24px, 21px), callBgButton }, - { "title_button_minimize", callStatusFg, point(4px, 4px) }, - }; - minimizeIconActiveOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_minimize", callStatusFg, point(4px, 4px) }, - }; - maximize: IconButton(windowTitleButton) { - icon: icon { - { size(24px, 21px), callBgButton }, - { "title_button_maximize", callStatusFg, point(4px, 4px) }, - }; - iconOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_maximize", callStatusFg, point(4px, 4px) }, - }; + minimizeIconActive: callTitleMinimizeIcon; + minimizeIconActiveOver: callTitleMinimizeIconOver; + maximize: IconButton(callTitleButton) { + icon: callTitleMaximizeIcon; + iconOver: callTitleMaximizeIconOver; } - maximizeIconActive: icon { - { size(24px, 21px), callBgButton }, - { "title_button_maximize", callStatusFg, point(4px, 4px) }, - }; - maximizeIconActiveOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_maximize", callStatusFg, point(4px, 4px) }, - }; - restoreIcon: icon { - { size(24px, 21px), callBgButton }, - { "title_button_restore", callStatusFg, point(4px, 4px) }, - }; - restoreIconOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_restore", callStatusFg, point(4px, 4px) }, - }; - restoreIconActive: icon { - { size(24px, 21px), callBgButton }, - { "title_button_restore", callStatusFg, point(4px, 4px) }, - }; - restoreIconActiveOver: icon { - { size(24px, 21px), callBgButton }, - { size(24px, 21px), callMuteRipple }, - { "title_button_restore", callStatusFg, point(4px, 4px) }, - }; - close: IconButton(windowTitleButtonClose) { - icon: icon { - { size(24px, 21px), callBgButton }, - { "title_button_close", callStatusFg, point(5px, 4px) }, - }; - iconOver: icon { - { size(25px, 21px), titleButtonCloseBgOver }, - { "title_button_close", titleButtonCloseFgOver, point(5px, 4px) }, - }; + maximizeIconActive: callTitleMaximizeIcon; + maximizeIconActiveOver: callTitleMaximizeIconOver; + restoreIcon: callTitleRestoreIcon; + restoreIconOver: callTitleRestoreIconOver; + restoreIconActive: callTitleRestoreIcon; + restoreIconActiveOver: callTitleRestoreIconOver; + close: IconButton(callTitleButton) { + icon: callTitleCloseIcon; + iconOver: callTitleCloseIconOver; } - closeIconActive: icon { - { size(24px, 21px), callBgButton }, - { "title_button_close", callStatusFg, point(5px, 4px) }, - }; - closeIconActiveOver: icon { - { size(25px, 21px), titleButtonCloseBgActiveOver }, - { "title_button_close", titleButtonCloseFgActiveOver, point(5px, 4px) }, - }; + closeIconActive: callTitleCloseIcon; + closeIconActiveOver: callTitleCloseIconOver; } diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp index fd2ac77f2..48f4405b7 100644 --- a/Telegram/SourceFiles/calls/calls_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_panel.cpp @@ -269,6 +269,7 @@ Panel::Panel(not_null call) #ifdef Q_OS_WIN , _controls(std::make_unique( _window.get(), + st::callTitle, [=](bool maximized) { toggleFullScreen(maximized); })) #endif // Q_OS_WIN , _bodySt(&st::callBodyLayout) @@ -309,10 +310,6 @@ void Panel::initWindow() { _window->setTitle(u" "_q); _window->setTitleStyle(st::callTitle); -#ifdef Q_OS_WIN - _controls->setStyle(st::callTitle); -#endif // Q_OS_WIN - _window->events( ) | rpl::start_with_next([=](not_null e) { if (e->type() == QEvent::Close) { @@ -547,6 +544,9 @@ void Panel::reinitWithCall(Call *call) { void Panel::initLayout() { initGeometry(); + _name->setAttribute(Qt::WA_TransparentForMouseEvents); + _status->setAttribute(Qt::WA_TransparentForMouseEvents); + using UpdateFlag = Data::PeerUpdate::Flag; _user->session().changes().peerUpdates( UpdateFlag::Name diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 4c0401773..921686055 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 4c04017737f7b80bd0a5032e732c2c75efd03f8e +Subproject commit 921686055c2b8b3a47a7f81840339a5a716b4edd