diff --git a/Telegram/Resources/icons/title_button_close.png b/Telegram/Resources/icons/title_button_close.png deleted file mode 100644 index 22cfe520c4..0000000000 Binary files a/Telegram/Resources/icons/title_button_close.png and /dev/null differ 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 e43b4d8a7f..0000000000 Binary files a/Telegram/Resources/icons/title_button_close@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_close@3x.png b/Telegram/Resources/icons/title_button_close@3x.png deleted file mode 100644 index 18c8496e15..0000000000 Binary files a/Telegram/Resources/icons/title_button_close@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_maximize.png b/Telegram/Resources/icons/title_button_maximize.png deleted file mode 100644 index 2759b3f41f..0000000000 Binary files a/Telegram/Resources/icons/title_button_maximize.png and /dev/null differ 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 00daaae190..0000000000 Binary files a/Telegram/Resources/icons/title_button_maximize@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_maximize@3x.png b/Telegram/Resources/icons/title_button_maximize@3x.png deleted file mode 100644 index 4d8073fd5a..0000000000 Binary files a/Telegram/Resources/icons/title_button_maximize@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_minimize.png b/Telegram/Resources/icons/title_button_minimize.png deleted file mode 100644 index 85934ddde8..0000000000 Binary files a/Telegram/Resources/icons/title_button_minimize.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_minimize@2x.png b/Telegram/Resources/icons/title_button_minimize@2x.png deleted file mode 100644 index d70a497345..0000000000 Binary files a/Telegram/Resources/icons/title_button_minimize@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_minimize@3x.png b/Telegram/Resources/icons/title_button_minimize@3x.png deleted file mode 100644 index 93e36c271d..0000000000 Binary files a/Telegram/Resources/icons/title_button_minimize@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_restore.png b/Telegram/Resources/icons/title_button_restore.png deleted file mode 100644 index c9f276b517..0000000000 Binary files a/Telegram/Resources/icons/title_button_restore.png and /dev/null differ diff --git a/Telegram/Resources/icons/title_button_restore@2x.png b/Telegram/Resources/icons/title_button_restore@2x.png deleted file mode 100644 index 63c3e1b1e0..0000000000 Binary files a/Telegram/Resources/icons/title_button_restore@2x.png and /dev/null differ 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 44b93232b2..0000000000 Binary files a/Telegram/Resources/icons/title_button_restore@3x.png and /dev/null differ 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