From 57ca6e23b9af44419898f3b43e47546d8073cd4f Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 3 Feb 2021 14:43:31 +0400 Subject: [PATCH] Port Qt-based title widget to lib_ui --- .../icons/calls/call_shadow_left.png | Bin 100 -> 0 bytes .../icons/calls/call_shadow_left@2x.png | Bin 125 -> 0 bytes .../icons/calls/call_shadow_left@3x.png | Bin 139 -> 0 bytes .../Resources/icons/calls/call_shadow_top.png | Bin 103 -> 0 bytes .../icons/calls/call_shadow_top@2x.png | Bin 127 -> 0 bytes .../icons/calls/call_shadow_top@3x.png | Bin 141 -> 0 bytes .../icons/calls/call_shadow_top_left.png | Bin 295 -> 0 bytes .../icons/calls/call_shadow_top_left@2x.png | Bin 559 -> 0 bytes .../icons/calls/call_shadow_top_left@3x.png | Bin 927 -> 0 bytes Telegram/SourceFiles/calls/calls.style | 14 ---------- .../SourceFiles/calls/calls_group_panel.cpp | 25 +++++++----------- .../SourceFiles/calls/calls_group_panel.h | 4 +-- Telegram/SourceFiles/calls/calls_panel.cpp | 23 +++++++--------- Telegram/SourceFiles/calls/calls_panel.h | 4 +-- .../SourceFiles/media/view/media_view_pip.cpp | 2 +- Telegram/SourceFiles/window/main_window.cpp | 2 +- .../SourceFiles/window/window_title_qt.cpp | 2 +- 17 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 Telegram/Resources/icons/calls/call_shadow_left.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_left@2x.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_left@3x.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top@2x.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top@3x.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top_left.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top_left@2x.png delete mode 100644 Telegram/Resources/icons/calls/call_shadow_top_left@3x.png diff --git a/Telegram/Resources/icons/calls/call_shadow_left.png b/Telegram/Resources/icons/calls/call_shadow_left.png deleted file mode 100644 index 74864ad4b58577ca3a3d1856559ea719998b84c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^5S&IOG=oClave$R06yz;H^)?a3(FUic47BRliXODFQYGd$p^>bP0l+XkK{=Q^Ny44$rjF6*2UngGhbD!Kpw diff --git a/Telegram/Resources/icons/calls/call_shadow_left@3x.png b/Telegram/Resources/icons/calls/call_shadow_left@3x.png deleted file mode 100644 index 30257ebe7755d12085cb5c309c4fad0dd42aa4cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^9ze{@!2~4t3*6feq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c73q4qIEGZ*N=ivcNN{2G@$osqqbA{yHkoCER8yw-9aWwy k3_d)EMR=n78CfJ4gajDgI;9(g0yQ#ty85}Sb4q9e0F2NjR{#J2 diff --git a/Telegram/Resources/icons/calls/call_shadow_top.png b/Telegram/Resources/icons/calls/call_shadow_top.png deleted file mode 100644 index 653e0afa994e839c76ca58e1a20333f70799a448..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!3HF)&rH7sr1U&p978x}=AL%sVld!1a-g^S z$A9tb-4}xPoY534U<$ZVck;}_Rb_df_8w5kT*`Q0HIwMytuLj4IvG4&{an^LB{Ts5 D!GI#Y diff --git a/Telegram/Resources/icons/calls/call_shadow_top@2x.png b/Telegram/Resources/icons/calls/call_shadow_top@2x.png deleted file mode 100644 index 47c672ca3b028dbf40d89d5aa5825b95344fc3d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bF!3HF)SyndzDK}3S#}J9BdnXw3F(_~_dpG{K zj}$-JG121Wl{=0c91Uy?M>K>d+UmF(eVyYHI@zjormCo72uu0?l}USU$Sv8CG->+w bKRmJqnM^Htf2OejO=R$N^>bP0l+XkK@!lpq diff --git a/Telegram/Resources/icons/calls/call_shadow_top@3x.png b/Telegram/Resources/icons/calls/call_shadow_top@3x.png deleted file mode 100644 index 350db0481b414a97a62b64e5b4fce8198d667177..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^%s}kH!2~4tT)p8Aq$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~-c73q7rIEGZ*N=j;A6mxTP6N>cl@liRYbY#QEj!<)p$SWUJ nSs$KhG1n8^ba*DKKmvo#Nyck0LQ7qMS{XcD{an^LB{Ts5gEA{X diff --git a/Telegram/Resources/icons/calls/call_shadow_top_left.png b/Telegram/Resources/icons/calls/call_shadow_top_left.png deleted file mode 100644 index baba49364f09da2655e03782fd31be9da4594658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmV+?0oeYDP)uNtfcakpfN-YxxTVa_qeZ)~hNXY1VB5$cMUfGE;=&cG6YgDi$! zop}W)fof;M5>SbnnS9UOJOG(EgxvjlXIOOe$pOU7Y`FXFS-E1J3!s|G!fUPJ?l%y- zQN=D6=6E2E4M+r4G07=Hjc4T2IpqmK|lZi002ovPDHLkV1fWgeZv3% diff --git a/Telegram/Resources/icons/calls/call_shadow_top_left@2x.png b/Telegram/Resources/icons/calls/call_shadow_top_left@2x.png deleted file mode 100644 index 0d9672fb51b6dd970b3413917c45f15c5453534d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmV+~0?_@5P)Ec#O%U3)F~-mMV(o7mSk>o^n{M0IHrH(c zt0vX!+W^=NJ6C?y(_1ivWOh##dtVwi^=2E_!B?DxP+oO73kp#e2 z4jHciMSY$qfU-TjqteIbZvjxuN9PQR8D~Ht01G)XjLfSr89{)^JTg7T82i3UFbG8P zBLOH-s6`Mez)}*kL{&`BpAnFS$QTa+keGRPWYK5`U`c3Ao^AfDM57fzNv6m=1F-b%Y~@0pCiN;%*q?A(syxSU5@N&$#qXbwax?`@;g{0xD%R!1IO z09Y8K>f=R#K~y3T0(e5nX19+8IgXL?0cn?YD5$|(ILMtzm%!FinLi+rR2qKl$LR$*)m0G7}e!h?!T-%^DT1T)CYD-ac>--)9!tSJl727nAJhE$`dFQc|! zXjsIe)n18!44|4q$*s&)(JjA`Rn1g%0f@?`RmP-J1gdf)@Z<`vDz%0FB3Nq+{@elB}egPU73!TJ&h#UX_002ovPDHLkV1h57@K68% diff --git a/Telegram/Resources/icons/calls/call_shadow_top_left@3x.png b/Telegram/Resources/icons/calls/call_shadow_top_left@3x.png deleted file mode 100644 index 260bb2658094fd232fe80415fdbfa6e624f5214e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 927 zcmV;Q17Q4#P)x=B%+b((NP+-79ieeick9*wXEyl4wf@4YyX-nv@*K778NZ-WLTwsx)KLeN>WjR4r zV3kngPb9se0>No3fHmA+?pMzoBGfbxl@)i97S&|lzJBG=oxnPu!trm^;+bgoRYZZH z>0fYY1!KYKq2ejRqY4C9dpjw*o}nr*&LLhlT7U%~uo|>Aon-Vm+;Rw*N`%tXNsAS$ zi(KwJ&l3|>rPZ{?4B6C@!1A6l3HxVSYU2m%jmByTFY`m~1aMxJqxrz_gr+k=0?QFg zUwr}$ld)8SW*cm#tpgVHS!+mU+>~Z|i0?p!MiH|!NV-z{{#wuVg=9YR4_#vZ< zA(0!*{jnye0CRPi2`LdvsO2c&IS$OlnX1fP#ipXo3=}XHb=!aiD^58>7#^%i)%QD% zF}X!JZCAKPC+)#<%dw1gwFcDE1BYI?dOn|Y`dxqV+OTec#@3{!h=o0A^bsjWfK`_* zOn7V$ONdm`&i|uIlhc94YZ*1ZqBIp1TcE8JWJ*2O(1CNa`wOiqR9Re?bOhYdZ7n8M zftDtZ@W4jzI%I#hIK{cL?u}P!yde`%7;38g(y zP0D3JO1-~lnrdI|1o??%x}b6!2@Eg;>g9M%ZQ-HZQmE?f0! zS&ExsXZO3aW&N1?IfS|{V~X&h$Sd5PonXKi@CMfmd#2g>_|kDU7__^BfxbvX-{DOe zTky^0AC{t}H1(+bUZ6+M^j>YBLWdaZ$(26OJiZoK(cVT&*vwc&$+OkIL5f4XVHPmj zfeZ$^*pSW{I=o%+GlA`03~$D6U^lQESkw3sU;yU*jCdo?|6>3E002ovPDHLkV1l1} Bw%Gsx diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 446780c1b..0dfade9b7 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -22,20 +22,6 @@ CallSignalBars { inactiveOpacity: double; } -callRadius: 6px; -callShadow: Shadow { - left: icon {{ "calls/call_shadow_left", windowShadowFg }}; - topLeft: icon {{ "calls/call_shadow_top_left", windowShadowFg }}; - top: icon {{ "calls/call_shadow_top", windowShadowFg }}; - topRight: icon {{ "calls/call_shadow_top_left-flip_horizontal", windowShadowFg }}; - right: icon {{ "calls/call_shadow_left-flip_horizontal", windowShadowFg }}; - bottomRight: icon {{ "calls/call_shadow_top_left-flip_vertical-flip_horizontal", windowShadowFg }}; - bottom: icon {{ "calls/call_shadow_top-flip_vertical", windowShadowFg }}; - bottomLeft: icon {{ "calls/call_shadow_top_left-flip_vertical", windowShadowFg }}; - extend: margins(9px, 8px, 9px, 10px); - fallback: windowShadowFgFallback; -} - callWidthMin: 300px; callHeightMin: 440px; callWidth: 720px; diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index dae98cb5b..93a00f41f 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_group_common.h" #include "calls/calls_group_members.h" #include "calls/calls_group_settings.h" +#include "ui/platform/ui_platform_window_title.h" #include "ui/widgets/buttons.h" #include "ui/widgets/window.h" #include "ui/widgets/call_button.h" @@ -38,10 +39,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_calls.h" #include "styles/style_layers.h" -#ifdef Q_OS_WIN -#include "ui/platform/win/ui_window_title_win.h" -#endif // Q_OS_WIN - #include #include #include @@ -304,11 +301,11 @@ GroupPanel::GroupPanel(not_null call) , _peer(call->peer()) , _window(std::make_unique(Core::App().getModalParent())) , _layerBg(std::make_unique(_window->body())) -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC , _controls(std::make_unique( - _window.get(), + _window->body(), st::groupCallTitle)) -#endif // Q_OS_WIN +#endif // !Q_OS_MAC , _members(widget(), call) , _settings(widget(), st::groupCallSettings) , _mute(std::make_unique( @@ -749,9 +746,9 @@ void GroupPanel::kickMemberSure(not_null user) { void GroupPanel::initLayout() { initGeometry(); -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC _controls->raise(); -#endif // Q_OS_WIN +#endif // !Q_OS_MAC } void GroupPanel::showControls() { @@ -783,14 +780,12 @@ int GroupPanel::computeMembersListTop() const { } std::optional GroupPanel::computeTitleRect() const { -#ifdef Q_OS_WIN +#ifdef Q_OS_MAC + return QRect(70, 0, widget()->width() - 70, 28); +#else // Q_OS_MAC const auto controls = _controls->geometry(); return QRect(0, 0, controls.x(), controls.height()); -#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; -#endif // Q_OS_WIN || Q_OS_MAC +#endif // !Q_OS_MAC } void GroupPanel::updateControlsGeometry() { diff --git a/Telegram/SourceFiles/calls/calls_group_panel.h b/Telegram/SourceFiles/calls/calls_group_panel.h index 32cd06caa..1887f3dbb 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.h +++ b/Telegram/SourceFiles/calls/calls_group_panel.h @@ -110,9 +110,9 @@ private: const std::unique_ptr _window; const std::unique_ptr _layerBg; -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC std::unique_ptr _controls; -#endif // Q_OS_WIN +#endif // !Q_OS_MAC rpl::lifetime _callLifetime; diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp index d64c829d9..2c3f5e6c6 100644 --- a/Telegram/SourceFiles/calls/calls_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_panel.cpp @@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_signal_bars.h" #include "calls/calls_userpic.h" #include "calls/calls_video_bubble.h" +#include "ui/platform/ui_platform_window_title.h" #include "ui/widgets/call_button.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" @@ -45,10 +46,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_calls.h" #include "styles/style_chat.h" -#ifdef Q_OS_WIN -#include "ui/platform/win/ui_window_title_win.h" -#endif // Q_OS_WIN - #include #include #include @@ -189,12 +186,12 @@ Panel::Panel(not_null call) : _call(call) , _user(call->user()) , _window(std::make_unique(Core::App().getModalParent())) -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC , _controls(std::make_unique( - _window.get(), + _window->body(), st::callTitle, [=](bool maximized) { toggleFullScreen(maximized); })) -#endif // Q_OS_WIN +#endif // !Q_OS_MAC , _bodySt(&st::callBodyLayout) , _answerHangupRedial(widget(), st::callAnswer, &st::callHangup) , _decline(widget(), object_ptr(widget(), st::callHangup)) @@ -270,11 +267,11 @@ void Panel::initWindow() { if (!widget()->rect().contains(widgetPoint)) { return Flag::None | Flag(0); } -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC if (_controls->geometry().contains(widgetPoint)) { return Flag::None | Flag(0); } -#endif // Q_OS_WIN +#endif // !Q_OS_MAC const auto buttonWidth = st::callCancel.button.width; const auto buttonsWidth = buttonWidth * 4; const auto inControls = (_fingerprint @@ -595,9 +592,9 @@ void Panel::initLayout() { updateControlsGeometry(); }, widget()->lifetime()); -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC _controls->raise(); -#endif // Q_OS_WIN +#endif // !Q_OS_MAC } void Panel::showControls() { @@ -669,10 +666,10 @@ void Panel::updateControlsGeometry() { refreshIncomingGeometry(); } if (_fingerprint) { -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC const auto minRight = _controls->geometry().width() + st::callFingerprintTop; -#else // Q_OS_WIN +#else // !Q_OS_MAC const auto minRight = 0; #endif // _controls const auto desired = (widget()->width() - _fingerprint->width()) / 2; diff --git a/Telegram/SourceFiles/calls/calls_panel.h b/Telegram/SourceFiles/calls/calls_panel.h index ec8d7e4ea..4c6e13b81 100644 --- a/Telegram/SourceFiles/calls/calls_panel.h +++ b/Telegram/SourceFiles/calls/calls_panel.h @@ -108,9 +108,9 @@ private: const std::unique_ptr _window; std::unique_ptr _incoming; -#ifdef Q_OS_WIN +#ifndef Q_OS_MAC std::unique_ptr _controls; -#endif // Q_OS_WIN +#endif // !Q_OS_MAC QSize _incomingFrameSize; diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp index 3059d8993..83e716456 100644 --- a/Telegram/SourceFiles/media/view/media_view_pip.cpp +++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp @@ -28,9 +28,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "ui/text/format_values.h" #include "window/window_controller.h" +#include "styles/style_widgets.h" #include "styles/style_window.h" #include "styles/style_media_view.h" -#include "styles/style_calls.h" // st::callShadow #include #include diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index fd69d2932..05afa18fb 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -35,8 +35,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "mainwidget.h" // session->content()->windowShown(). #include "facades.h" #include "app.h" +#include "styles/style_widgets.h" #include "styles/style_window.h" -#include "styles/style_calls.h" // st::callShadow #include #include diff --git a/Telegram/SourceFiles/window/window_title_qt.cpp b/Telegram/SourceFiles/window/window_title_qt.cpp index 8b3e26df7..d9703107f 100644 --- a/Telegram/SourceFiles/window/window_title_qt.cpp +++ b/Telegram/SourceFiles/window/window_title_qt.cpp @@ -13,8 +13,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "core/core_settings.h" #include "core/application.h" +#include "styles/style_widgets.h" #include "styles/style_window.h" -#include "styles/style_calls.h" // st::callShadow #include #include