From 78067fd996aa4771cd29ab558856c79f34efdf78 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 6 Dec 2020 17:53:17 +0400 Subject: [PATCH] Improve group call window controls on Windows. --- .../Resources/icons/title_button_close.png | Bin 164 -> 0 bytes .../Resources/icons/title_button_close@2x.png | Bin 224 -> 0 bytes .../Resources/icons/title_button_close@3x.png | Bin 376 -> 0 bytes .../Resources/icons/title_button_maximize.png | Bin 119 -> 0 bytes .../icons/title_button_maximize@2x.png | Bin 144 -> 0 bytes .../icons/title_button_maximize@3x.png | Bin 184 -> 0 bytes .../Resources/icons/title_button_minimize.png | Bin 100 -> 0 bytes .../icons/title_button_minimize@2x.png | Bin 122 -> 0 bytes .../icons/title_button_minimize@3x.png | Bin 149 -> 0 bytes .../Resources/icons/title_button_restore.png | Bin 136 -> 0 bytes .../icons/title_button_restore@2x.png | Bin 160 -> 0 bytes .../icons/title_button_restore@3x.png | Bin 209 -> 0 bytes Telegram/SourceFiles/calls/calls.style | 63 ++++++++++++++++++ .../SourceFiles/calls/calls_group_panel.cpp | 2 +- Telegram/lib_ui | 2 +- 15 files changed, 65 insertions(+), 2 deletions(-) delete mode 100644 Telegram/Resources/icons/title_button_close.png delete mode 100644 Telegram/Resources/icons/title_button_close@2x.png delete mode 100644 Telegram/Resources/icons/title_button_close@3x.png delete mode 100644 Telegram/Resources/icons/title_button_maximize.png delete mode 100644 Telegram/Resources/icons/title_button_maximize@2x.png delete mode 100644 Telegram/Resources/icons/title_button_maximize@3x.png delete mode 100644 Telegram/Resources/icons/title_button_minimize.png delete mode 100644 Telegram/Resources/icons/title_button_minimize@2x.png delete mode 100644 Telegram/Resources/icons/title_button_minimize@3x.png delete mode 100644 Telegram/Resources/icons/title_button_restore.png delete mode 100644 Telegram/Resources/icons/title_button_restore@2x.png delete mode 100644 Telegram/Resources/icons/title_button_restore@3x.png diff --git a/Telegram/Resources/icons/title_button_close.png b/Telegram/Resources/icons/title_button_close.png deleted file mode 100644 index 22cfe520c4a6e3b0da93e628ac6a63dbdfbd3ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^{2(?58;~rMGjRk`*`6+rAsQ36PCCeYK!JzZ_o&Ft z`u;Nqnc@!D25x0hoV99NMMBZ0NdXKTp0be!2j1~by6iNm;QNEs@{=a1OuF^aFvjU2 zQ_lwuodcG8CjM|P+Vy<<<#pfZZoS69koN7y(wU7VRCwgTe~DWM4fa(F?q diff --git a/Telegram/Resources/icons/title_button_close@2x.png b/Telegram/Resources/icons/title_button_close@2x.png deleted file mode 100644 index e43b4d8a7f57ad85cab66305bb7f748d60fcbf96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 224 zcmV<603ZK}P)J-q9X2TZf}TBYdSdg=YtDpgEik-bCl%E8qq? z4@dY7bPc}3H&B+HTryhKYn5zu$;(ypIh7nBB}Zo2B~f-Qc05^iSgM+#Ji7kreCI#c aPr@fwnMp8>+vjos0000SkR=p*>DEK%S&^btG=JdYlQJA!@C0H7%)UDtK9R8mS_;Okb}Kd|-eF#(SQ2f|~)LGXBR0Q|TUGrMi= z9-Nu|&{zG9=bU|O`W+r|?_mIsqdT0L-Odn*s3Ky$sL@xK-zoq90`jlqL0^?yqQ3!4 Wn%LNot(hYL0000w QK$93eUHx3vIVCg!0O)}s5dZ)H diff --git a/Telegram/Resources/icons/title_button_maximize@2x.png b/Telegram/Resources/icons/title_button_maximize@2x.png deleted file mode 100644 index 00daaae190fcb9c1850a3310d52ce1d8b17e11ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ey!3HF+&5pANQsJI1jv*eMZ>Je@9WdZw_Fwq_ z|0e5HPSXmGj1?xgocSUx!~!I?&go}oc<@pxw0yDR%guS^3Jkeyex=55OwLZY+sMG8 rz`!Vxf9Ur9$J2nkj+mqM>=le|%G@S}ffkr0P9g977^n-`))5YB1nox#;`x zpL?EdW7M5P0ynzYWF z(XpBTET6wmU(0Y(exvo`Prkpkr!Yh@WpFM~1*(Yp%}_nFc)H2_zhL fik~kGq~fkvK3~v*@74E!PGRtL^>bP0l+XkK=VnL= diff --git a/Telegram/Resources/icons/title_button_minimize.png b/Telegram/Resources/icons/title_button_minimize.png deleted file mode 100644 index 85934ddde82b3cd1145635cb7d27990c40a2d6ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^0w6XA8<1SE`<)7q()M(54AGdFoRX06fkq+&c>977^n-`+IjI$*%Va&Y&9 z|Mih|PE49&2mRI_>bBbHsn%`#h54URLmII-x9WdZ=Dt+@W z{MqIyVf(F!t!yGE!*kUIn2XrsKm>;9&`;gwlW3Q+Npm;amC7jp^PvS%t^16s-8>FVdQ I&MBb@0A_(UdjJ3c diff --git a/Telegram/Resources/icons/title_button_restore@3x.png b/Telegram/Resources/icons/title_button_restore@3x.png deleted file mode 100644 index 44b93232b2bf02340aee9fd69ea25cba61f75308..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^20*ON!3HEfFP>fkq-J=!IEF;DzMUD!bwGi~Ir`?` z{x!P~v}|2^dehTduBQHJZWqtyNE$NNHfViea!>snb-r}|?)Y_=!yTA1R2r6OA4uAHT)bD?nlN{9PSLJrD|CV9V<4?F1>Fh#x+iJtuVtu4@v44$rjF6*2U FngGSRQknn& diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index abc37b8829..0677bb9c6e 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -687,6 +687,69 @@ groupCallDelaySlider: MediaSlider(defaultContinuousSlider) { } groupCallDelayMargin: margins(22px, 5px, 20px, 10px); +groupCallTitleButton: IconButton { + width: 24px; + height: 21px; + iconPosition: point(0px, 0px); +} +groupCallTitleMinimizeIcon: icon { + { "title_button_minimize", groupCallMemberNotJoinedStatus, point(4px, 4px) }, +}; +groupCallTitleMinimizeIconOver: icon { + { size(24px, 21px), groupCallMembersBgOver }, + { "title_button_minimize", groupCallMembersFg, point(4px, 4px) }, +}; +groupCallTitleMaximizeIcon: icon { + { "title_button_maximize", groupCallMemberNotJoinedStatus, point(4px, 4px) }, +}; +groupCallTitleMaximizeIconOver: icon { + { size(24px, 21px), groupCallMembersBgOver }, + { "title_button_maximize", groupCallMembersFg, point(4px, 4px) }, +}; +groupCallTitleRestoreIcon: icon { + { "title_button_restore", groupCallMemberNotJoinedStatus, point(4px, 4px) }, +}; +groupCallTitleRestoreIconOver: icon { + { size(24px, 21px), groupCallMembersBgOver }, + { "title_button_restore", groupCallMembersFg, point(4px, 4px) }, +}; +groupCallTitleCloseIcon: icon { + { "title_button_close", groupCallMemberNotJoinedStatus, point(4px, 4px) }, +}; +groupCallTitleCloseIconOver: icon { + { size(24px, 21px), titleButtonCloseBgOver }, + { "title_button_close", titleButtonCloseFgOver, point(4px, 4px) }, +}; +groupCallTitle: WindowTitle(defaultWindowTitle) { + height: 0px; + bg: groupCallBg; + bgActive: groupCallBg; + fg: transparent; + fgActive: transparent; + minimize: IconButton(groupCallTitleButton) { + icon: groupCallTitleMinimizeIcon; + iconOver: groupCallTitleMinimizeIconOver; + } + minimizeIconActive: groupCallTitleMinimizeIcon; + minimizeIconActiveOver: groupCallTitleMinimizeIconOver; + maximize: IconButton(groupCallTitleButton) { + icon: groupCallTitleMaximizeIcon; + iconOver: groupCallTitleMaximizeIconOver; + } + maximizeIconActive: groupCallTitleMaximizeIcon; + maximizeIconActiveOver: groupCallTitleMaximizeIconOver; + restoreIcon: groupCallTitleRestoreIcon; + restoreIconOver: groupCallTitleRestoreIconOver; + restoreIconActive: groupCallTitleRestoreIcon; + restoreIconActiveOver: groupCallTitleRestoreIconOver; + close: IconButton(groupCallTitleButton) { + icon: groupCallTitleCloseIcon; + iconOver: groupCallTitleCloseIconOver; + } + closeIconActive: groupCallTitleCloseIcon; + closeIconActiveOver: groupCallTitleCloseIconOver; +} + callTopBarMuteCrossLine: CrossLineAnimation { fg: callBarFg; icon: icon {{ "calls/call_record_active", callBarFg }}; diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index fab99d7b60..b3132c43bc 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -217,7 +217,7 @@ GroupPanel::GroupPanel(not_null call) #ifdef Q_OS_WIN , _controls(std::make_unique( _window.get(), - st::callTitle)) + st::groupCallTitle)) #endif // Q_OS_WIN , _members(widget(), call) , _settings(widget(), st::groupCallSettings) diff --git a/Telegram/lib_ui b/Telegram/lib_ui index f24411cd96..577e8f94ab 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit f24411cd96b2e3503d572418a63d2df8bae90fc9 +Subproject commit 577e8f94ab538b3b4b2a1365a078293c92506616