diff --git a/Telegram/Resources/icons/calls/calls_close_main.png b/Telegram/Resources/icons/calls/calls_close_main.png deleted file mode 100644 index 9fc9d04b24..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_main.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_close_main@2x.png b/Telegram/Resources/icons/calls/calls_close_main@2x.png deleted file mode 100644 index 6d4dbe21a0..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_main@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_close_main@3x.png b/Telegram/Resources/icons/calls/calls_close_main@3x.png deleted file mode 100644 index c5c3f16200..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_main@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_close_shadow.png b/Telegram/Resources/icons/calls/calls_close_shadow.png deleted file mode 100644 index 1d4bafdd82..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_shadow.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_close_shadow@2x.png b/Telegram/Resources/icons/calls/calls_close_shadow@2x.png deleted file mode 100644 index 8d3b45b991..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_shadow@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_close_shadow@3x.png b/Telegram/Resources/icons/calls/calls_close_shadow@3x.png deleted file mode 100644 index bb290a25ce..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_close_shadow@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_main.png b/Telegram/Resources/icons/calls/calls_maximize_main.png deleted file mode 100644 index 31d4ee719a..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_main.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_main@2x.png b/Telegram/Resources/icons/calls/calls_maximize_main@2x.png deleted file mode 100644 index 03075fc789..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_main@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_main@3x.png b/Telegram/Resources/icons/calls/calls_maximize_main@3x.png deleted file mode 100644 index 6ee23f39f0..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_main@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_shadow.png b/Telegram/Resources/icons/calls/calls_maximize_shadow.png deleted file mode 100644 index 65d6545719..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_shadow.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_shadow@2x.png b/Telegram/Resources/icons/calls/calls_maximize_shadow@2x.png deleted file mode 100644 index 254fdc01cb..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_shadow@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_maximize_shadow@3x.png b/Telegram/Resources/icons/calls/calls_maximize_shadow@3x.png deleted file mode 100644 index c767e8780d..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_maximize_shadow@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_main.png b/Telegram/Resources/icons/calls/calls_minimize_main.png deleted file mode 100644 index caf58d74bb..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_main.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_main@2x.png b/Telegram/Resources/icons/calls/calls_minimize_main@2x.png deleted file mode 100644 index b8afe8998d..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_main@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_main@3x.png b/Telegram/Resources/icons/calls/calls_minimize_main@3x.png deleted file mode 100644 index 9a837c92ad..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_main@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_shadow.png b/Telegram/Resources/icons/calls/calls_minimize_shadow.png deleted file mode 100644 index 820f59da75..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_shadow.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_shadow@2x.png b/Telegram/Resources/icons/calls/calls_minimize_shadow@2x.png deleted file mode 100644 index 86627c14b8..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_shadow@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_minimize_shadow@3x.png b/Telegram/Resources/icons/calls/calls_minimize_shadow@3x.png deleted file mode 100644 index d482e39370..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_minimize_shadow@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_main.png b/Telegram/Resources/icons/calls/calls_restore_main.png deleted file mode 100644 index 7fca94dc47..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_main.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_main@2x.png b/Telegram/Resources/icons/calls/calls_restore_main@2x.png deleted file mode 100644 index 89f87652f4..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_main@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_main@3x.png b/Telegram/Resources/icons/calls/calls_restore_main@3x.png deleted file mode 100644 index 4bbb6f22b4..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_main@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_shadow.png b/Telegram/Resources/icons/calls/calls_restore_shadow.png deleted file mode 100644 index a7b663976a..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_shadow.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_shadow@2x.png b/Telegram/Resources/icons/calls/calls_restore_shadow@2x.png deleted file mode 100644 index f34082769c..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_shadow@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/calls/calls_restore_shadow@3x.png b/Telegram/Resources/icons/calls/calls_restore_shadow@3x.png deleted file mode 100644 index 61e79f92a9..0000000000 Binary files a/Telegram/Resources/icons/calls/calls_restore_shadow@3x.png and /dev/null differ diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 6afa88cde9..189646d7d9 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -411,49 +411,45 @@ callBarSignalBars: CallSignalBars(callPanelSignalBars) { color: callBarFg; } -callTitleButton: IconButton { - width: 34px; - height: 30px; - iconPosition: point(0px, 0px); -} +callTitleButton: windowTitleButton; callTitleMinimizeIcon: icon { - { "calls/calls_minimize_shadow", windowShadowFg }, - { "calls/calls_minimize_main", callNameFg }, + { "title_shadow_minimize", windowShadowFg }, + { "title_button_minimize", callNameFg }, }; callTitleMinimizeIconOver: icon { - { size(34px, 30px), callBgButton }, - { size(34px, 30px), callMuteRipple }, - { "calls/calls_minimize_shadow", windowShadowFg }, - { "calls/calls_minimize_main", callNameFg }, + { windowTitleButtonSize, callBgButton }, + { windowTitleButtonSize, callMuteRipple }, + { "title_shadow_minimize", windowShadowFg }, + { "title_button_minimize", callNameFg }, }; callTitleMaximizeIcon: icon { - { "calls/calls_maximize_shadow", windowShadowFg }, - { "calls/calls_maximize_main", callNameFg }, + { "title_shadow_maximize", windowShadowFg }, + { "title_button_maximize", callNameFg }, }; callTitleMaximizeIconOver: icon { - { size(34px, 30px), callBgButton }, - { size(34px, 30px), callMuteRipple }, - { "calls/calls_maximize_shadow", windowShadowFg }, - { "calls/calls_maximize_main", callNameFg }, + { windowTitleButtonSize, callBgButton }, + { windowTitleButtonSize, callMuteRipple }, + { "title_shadow_maximize", windowShadowFg }, + { "title_button_maximize", callNameFg }, }; callTitleRestoreIcon: icon { - { "calls/calls_restore_shadow", windowShadowFg }, - { "calls/calls_restore_main", callNameFg }, + { "title_shadow_restore", windowShadowFg }, + { "title_button_restore", callNameFg }, }; callTitleRestoreIconOver: icon { - { size(34px, 30px), callBgButton }, - { size(34px, 30px), callMuteRipple }, - { "calls/calls_restore_shadow", windowShadowFg }, - { "calls/calls_restore_main", callNameFg }, + { windowTitleButtonSize, callBgButton }, + { windowTitleButtonSize, callMuteRipple }, + { "title_shadow_restore", windowShadowFg }, + { "title_button_restore", callNameFg }, }; callTitleCloseIcon: icon { - { "calls/calls_close_shadow", windowShadowFg }, - { "calls/calls_close_main", callNameFg }, + { "title_shadow_close", windowShadowFg }, + { "title_button_close", callNameFg }, }; callTitleCloseIconOver: icon { - { size(34px, 30px), titleButtonCloseBgOver }, - { "calls/calls_close_shadow", windowShadowFg }, - { "calls/calls_close_main", titleButtonCloseFgOver }, + { windowTitleButtonSize, titleButtonCloseBgOver }, + { "title_shadow_close", windowShadowFg }, + { "title_button_close", titleButtonCloseFgOver }, }; callTitle: WindowTitle(defaultWindowTitle) { height: 0px; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 45893ec223..e8f4f02131 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 45893ec22315ff728f6d3e05f6caa9092ae030c6 +Subproject commit e8f4f0213119295ac0ba5885d4e53dca7f71c6ac