diff --git a/Telegram/Resources/icons/chat/input_attach.png b/Telegram/Resources/icons/chat/input_attach.png new file mode 100644 index 000000000..cfc7ae195 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_attach.png differ diff --git a/Telegram/Resources/icons/chat/input_attach@2x.png b/Telegram/Resources/icons/chat/input_attach@2x.png new file mode 100644 index 000000000..19787fa84 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_attach@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_attach@3x.png b/Telegram/Resources/icons/chat/input_attach@3x.png new file mode 100644 index 000000000..d24e17ddf Binary files /dev/null and b/Telegram/Resources/icons/chat/input_attach@3x.png differ diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_1d.png b/Telegram/Resources/icons/chat/input_autodelete_1d.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_1d.png rename to Telegram/Resources/icons/chat/input_autodelete_1d.png diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_1d@2x.png b/Telegram/Resources/icons/chat/input_autodelete_1d@2x.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_1d@2x.png rename to Telegram/Resources/icons/chat/input_autodelete_1d@2x.png diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_1d@3x.png b/Telegram/Resources/icons/chat/input_autodelete_1d@3x.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_1d@3x.png rename to Telegram/Resources/icons/chat/input_autodelete_1d@3x.png diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_7d.png b/Telegram/Resources/icons/chat/input_autodelete_7d.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_7d.png rename to Telegram/Resources/icons/chat/input_autodelete_7d.png diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_7d@2x.png b/Telegram/Resources/icons/chat/input_autodelete_7d@2x.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_7d@2x.png rename to Telegram/Resources/icons/chat/input_autodelete_7d@2x.png diff --git a/Telegram/Resources/icons/chat/send_control_autodelete_7d@3x.png b/Telegram/Resources/icons/chat/input_autodelete_7d@3x.png similarity index 100% rename from Telegram/Resources/icons/chat/send_control_autodelete_7d@3x.png rename to Telegram/Resources/icons/chat/input_autodelete_7d@3x.png diff --git a/Telegram/Resources/icons/chat/input_bot_command.png b/Telegram/Resources/icons/chat/input_bot_command.png new file mode 100644 index 000000000..f9863a78a Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_command.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_command@2x.png b/Telegram/Resources/icons/chat/input_bot_command@2x.png new file mode 100644 index 000000000..11b5db90e Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_command@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_command@3x.png b/Telegram/Resources/icons/chat/input_bot_command@3x.png new file mode 100644 index 000000000..6116615c7 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_command@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard.png b/Telegram/Resources/icons/chat/input_bot_keyboard.png new file mode 100644 index 000000000..c39fed337 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard@2x.png b/Telegram/Resources/icons/chat/input_bot_keyboard@2x.png new file mode 100644 index 000000000..0d6b9e60d Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard@3x.png b/Telegram/Resources/icons/chat/input_bot_keyboard@3x.png new file mode 100644 index 000000000..3f85cd407 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard_hide.png b/Telegram/Resources/icons/chat/input_bot_keyboard_hide.png new file mode 100644 index 000000000..c76fed691 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard_hide.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard_hide@2x.png b/Telegram/Resources/icons/chat/input_bot_keyboard_hide@2x.png new file mode 100644 index 000000000..7540076dc Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard_hide@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_bot_keyboard_hide@3x.png b/Telegram/Resources/icons/chat/input_bot_keyboard_hide@3x.png new file mode 100644 index 000000000..83c00a7e1 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_bot_keyboard_hide@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_record.png b/Telegram/Resources/icons/chat/input_record.png new file mode 100644 index 000000000..35efc9b52 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record.png differ diff --git a/Telegram/Resources/icons/chat/input_record@2x.png b/Telegram/Resources/icons/chat/input_record@2x.png new file mode 100644 index 000000000..3bfefbbb1 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_record@3x.png b/Telegram/Resources/icons/chat/input_record@3x.png new file mode 100644 index 000000000..851e517bd Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled.png b/Telegram/Resources/icons/chat/input_scheduled.png new file mode 100644 index 000000000..054948651 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled@2x.png b/Telegram/Resources/icons/chat/input_scheduled@2x.png new file mode 100644 index 000000000..e080db29e Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled@3x.png b/Telegram/Resources/icons/chat/input_scheduled@3x.png new file mode 100644 index 000000000..cab04cfad Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled_dot.png b/Telegram/Resources/icons/chat/input_scheduled_dot.png new file mode 100644 index 000000000..30dc17fb0 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled_dot.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled_dot@2x.png b/Telegram/Resources/icons/chat/input_scheduled_dot@2x.png new file mode 100644 index 000000000..81abce9ab Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled_dot@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_scheduled_dot@3x.png b/Telegram/Resources/icons/chat/input_scheduled_dot@3x.png new file mode 100644 index 000000000..e67ec3123 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_scheduled_dot@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_silent.png b/Telegram/Resources/icons/chat/input_silent.png new file mode 100644 index 000000000..a3258b083 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_silent.png differ diff --git a/Telegram/Resources/icons/chat/input_silent@2x.png b/Telegram/Resources/icons/chat/input_silent@2x.png new file mode 100644 index 000000000..a66514ca8 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_silent@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_silent@3x.png b/Telegram/Resources/icons/chat/input_silent@3x.png new file mode 100644 index 000000000..05c56955e Binary files /dev/null and b/Telegram/Resources/icons/chat/input_silent@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_smile.png b/Telegram/Resources/icons/chat/input_smile.png new file mode 100644 index 000000000..c23f30d0a Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile.png differ diff --git a/Telegram/Resources/icons/chat/input_smile@2x.png b/Telegram/Resources/icons/chat/input_smile@2x.png new file mode 100644 index 000000000..89c9afb8c Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_smile@3x.png b/Telegram/Resources/icons/chat/input_smile@3x.png new file mode 100644 index 000000000..5af6ecc1d Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile@3x.png differ diff --git a/Telegram/Resources/icons/send_control_attach.png b/Telegram/Resources/icons/send_control_attach.png deleted file mode 100644 index a16628b77..000000000 Binary files a/Telegram/Resources/icons/send_control_attach.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_attach@2x.png b/Telegram/Resources/icons/send_control_attach@2x.png deleted file mode 100644 index 8b0c4d3e1..000000000 Binary files a/Telegram/Resources/icons/send_control_attach@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_attach@3x.png b/Telegram/Resources/icons/send_control_attach@3x.png deleted file mode 100644 index 73c7c8eba..000000000 Binary files a/Telegram/Resources/icons/send_control_attach@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_command.png b/Telegram/Resources/icons/send_control_bot_command.png deleted file mode 100644 index 34cc9d6eb..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_command.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_command@2x.png b/Telegram/Resources/icons/send_control_bot_command@2x.png deleted file mode 100644 index faaf97c16..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_command@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_command@3x.png b/Telegram/Resources/icons/send_control_bot_command@3x.png deleted file mode 100644 index 31d772e51..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_command@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard.png b/Telegram/Resources/icons/send_control_bot_keyboard.png deleted file mode 100644 index b9423a716..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard@2x.png b/Telegram/Resources/icons/send_control_bot_keyboard@2x.png deleted file mode 100644 index 482e40831..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard@3x.png b/Telegram/Resources/icons/send_control_bot_keyboard@3x.png deleted file mode 100644 index 423c86be4..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard_hide.png b/Telegram/Resources/icons/send_control_bot_keyboard_hide.png deleted file mode 100644 index ceaaccf73..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard_hide.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard_hide@2x.png b/Telegram/Resources/icons/send_control_bot_keyboard_hide@2x.png deleted file mode 100644 index 89cb528df..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard_hide@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png b/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png deleted file mode 100644 index f259f9edc..000000000 Binary files a/Telegram/Resources/icons/send_control_bot_keyboard_hide@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record.png b/Telegram/Resources/icons/send_control_record.png deleted file mode 100644 index 6dda533a1..000000000 Binary files a/Telegram/Resources/icons/send_control_record.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record@2x.png b/Telegram/Resources/icons/send_control_record@2x.png deleted file mode 100644 index 6bf9fa581..000000000 Binary files a/Telegram/Resources/icons/send_control_record@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record@3x.png b/Telegram/Resources/icons/send_control_record@3x.png deleted file mode 100644 index 2669a856d..000000000 Binary files a/Telegram/Resources/icons/send_control_record@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled.png b/Telegram/Resources/icons/send_control_scheduled.png deleted file mode 100644 index dfa00bdcd..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled@2x.png b/Telegram/Resources/icons/send_control_scheduled@2x.png deleted file mode 100644 index 12cba3777..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled@3x.png b/Telegram/Resources/icons/send_control_scheduled@3x.png deleted file mode 100644 index a37f1171e..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled_dot.png b/Telegram/Resources/icons/send_control_scheduled_dot.png deleted file mode 100644 index ce83855fc..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled_dot.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled_dot@2x.png b/Telegram/Resources/icons/send_control_scheduled_dot@2x.png deleted file mode 100644 index 7422c92d6..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled_dot@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_scheduled_dot@3x.png b/Telegram/Resources/icons/send_control_scheduled_dot@3x.png deleted file mode 100644 index b1f4a9852..000000000 Binary files a/Telegram/Resources/icons/send_control_scheduled_dot@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_silent_off.png b/Telegram/Resources/icons/send_control_silent_off.png deleted file mode 100644 index 8e25352d7..000000000 Binary files a/Telegram/Resources/icons/send_control_silent_off.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_silent_off@2x.png b/Telegram/Resources/icons/send_control_silent_off@2x.png deleted file mode 100644 index 4315d367d..000000000 Binary files a/Telegram/Resources/icons/send_control_silent_off@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_silent_off@3x.png b/Telegram/Resources/icons/send_control_silent_off@3x.png deleted file mode 100644 index 794c67ae1..000000000 Binary files a/Telegram/Resources/icons/send_control_silent_off@3x.png and /dev/null differ diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index c44b67773..60725698b 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -3996,7 +3996,7 @@ void HistoryWidget::moveFieldControls() { // (_botStart|_unblock|_joinChannel|_muteUnmute) auto buttonsBottom = bottom - _attachToggle->height(); - auto left = 0; + auto left = st::historySendRight; _attachToggle->moveToLeft(left, buttonsBottom); left += _attachToggle->width(); _field->moveToLeft(left, bottom - _field->height() - st::historySendPadding); auto right = st::historySendRight; diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp index e5fc9ce5e..dabc2afb5 100644 --- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp +++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp @@ -1047,6 +1047,7 @@ void ComposeControls::init() { } void ComposeControls::orderControls() { + _voiceRecordBar->raise(); _send->raise(); } @@ -1764,7 +1765,7 @@ void ComposeControls::updateControlsGeometry(QSize size) { const auto buttonsTop = size.height() - _attachToggle->height(); - auto left = 0; + auto left = st::historySendRight; _attachToggle->moveToLeft(left, buttonsTop); left += _attachToggle->width(); _field->moveToLeft( @@ -1844,6 +1845,7 @@ void ComposeControls::updateMessagesTTLShown() { updateControlsGeometry(_wrap->size()); } else if (shown && !_ttlInfo) { _ttlInfo = std::make_unique(_wrap.get(), peer); + orderControls(); updateControlsVisibility(); updateControlsGeometry(_wrap->size()); } diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 1d4538692..2dec590e4 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -281,22 +281,21 @@ historyContactStatusMinSkip: 16px; historySendIcon: icon {{ "send_control_send", historySendIconFg }}; historySendIconOver: icon {{ "send_control_send", historySendIconFgOver }}; -historySendIconPosition: point(11px, 11px); -historySendSize: size(46px, 46px); +historySendIconPosition: point(10px, 11px); +historySendSize: size(44px, 46px); historyScheduleIcon: icon {{ "send_control_schedule", historyComposeAreaBg }}; -historyScheduleIconPosition: point(8px, 8px); -historyEditSaveIcon: icon {{ "send_control_save", historySendIconFg, point(3px, 7px) }}; -historyEditSaveIconOver: icon {{ "send_control_save", historySendIconFgOver, point(3px, 7px) }}; +historyScheduleIconPosition: point(7px, 8px); +historyEditSaveIcon: icon {{ "send_control_save", historySendIconFg, point(2px, 7px) }}; +historyEditSaveIconOver: icon {{ "send_control_save", historySendIconFgOver, point(2px, 7px) }}; -historyAttach: IconButton { - width: 46px; +historyAttach: IconButton(defaultIconButton) { + width: 44px; height: 46px; - icon: icon {{ "send_control_attach", historyComposeIconFg }}; - iconOver: icon {{ "send_control_attach", historyComposeIconFgOver }}; - iconPosition: point(11px, 11px); + icon: icon {{ "chat/input_attach", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }}; - rippleAreaPosition: point(3px, 3px); + rippleAreaPosition: point(2px, 3px); rippleAreaSize: 40px; ripple: RippleAnimation(defaultRippleAnimation) { color: windowBgOver; @@ -306,15 +305,13 @@ historyAttach: IconButton { historyAttachEmoji: IconButton(historyAttach) { icon: icon {{ "send_control_emoji", historyComposeIconFg }}; iconOver: icon {{ "send_control_emoji", historyComposeIconFgOver }}; - iconPosition: point(-1px, -1px); } historyMessagesTTL: IconButton(historyAttach) { - icon: icon {{ "chat/send_control_autodelete_1d", historyComposeIconFg }}; - iconOver: icon {{ "chat/send_control_autodelete_1d", historyComposeIconFgOver }}; - iconPosition: point(-1px, -1px); + icon: icon {{ "chat/input_autodelete_1d", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_autodelete_1d", historyComposeIconFgOver }}; } -historyMessagesTTL2Icon: icon {{ "chat/send_control_autodelete_7d", historyComposeIconFg }}; -historyMessagesTTL2IconOver: icon {{ "chat/send_control_autodelete_7d", historyComposeIconFgOver }}; +historyMessagesTTL2Icon: icon {{ "chat/input_autodelete_7d", historyComposeIconFg }}; +historyMessagesTTL2IconOver: icon {{ "chat/input_autodelete_7d", historyComposeIconFgOver }}; historyAttachEmojiFgActive: windowActiveTextFg; historyAttachEmojiActive: icon {{ "send_control_emoji", historyAttachEmojiFgActive }}; historyAttachEmojiTooltipDelta: 4px; @@ -327,28 +324,26 @@ historyEmojiCircleFg: historyComposeIconFg; historyEmojiCircleFgOver: historyComposeIconFgOver; historyEmojiCirclePart: 3.5; historyBotKeyboardShow: IconButton(historyAttach) { - icon: icon {{ "send_control_bot_keyboard", historyComposeIconFg }}; - iconOver: icon {{ "send_control_bot_keyboard", historyComposeIconFgOver }}; + icon: icon {{ "chat/input_bot_keyboard", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_bot_keyboard", historyComposeIconFgOver }}; } historyBotKeyboardHide: IconButton(historyAttach) { - icon: icon {{ "send_control_bot_keyboard_hide", historyComposeIconFg }}; - iconOver: icon {{ "send_control_bot_keyboard_hide", historyComposeIconFgOver }}; - iconPosition: point(11px, 16px); + icon: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_bot_keyboard_hide", historyComposeIconFgOver }}; } historyBotCommandStart: IconButton(historyAttach) { - icon: icon {{ "send_control_bot_command", historyComposeIconFg }}; - iconOver: icon {{ "send_control_bot_command", historyComposeIconFgOver }}; + icon: icon {{ "chat/input_bot_command", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_bot_command", historyComposeIconFgOver }}; } historyScheduledToggle: IconButton(historyAttach) { icon: icon { - { "send_control_scheduled", historyComposeIconFg }, - { "send_control_scheduled_dot", attentionButtonFg } + { "chat/input_scheduled", historyComposeIconFg }, + { "chat/input_scheduled_dot", attentionButtonFg } }; iconOver: icon { - { "send_control_scheduled", historyComposeIconFgOver }, - { "send_control_scheduled_dot", attentionButtonFg } + { "chat/input_scheduled", historyComposeIconFgOver }, + { "chat/input_scheduled_dot", attentionButtonFg } }; - iconPosition: point(-1px, -1px); } historyRecordVoiceFg: historyComposeIconFg; @@ -358,8 +353,8 @@ historyRecordVoiceFgActive: windowBgActive; historyRecordVoiceFgActiveIcon: windowFgActive; historyRecordVoiceShowDuration: 120; historyRecordVoiceDuration: 120; -historyRecordVoice: icon {{ "send_control_record", historyRecordVoiceFg }}; -historyRecordVoiceOver: icon {{ "send_control_record", historyRecordVoiceFgOver }}; +historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }}; +historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }}; historyRecordVoiceActive: icon {{ "send_control_record_active", historyRecordVoiceFgActiveIcon }}; historyRecordSendIconPosition: point(2px, 0px); historyRecordVoiceRippleBgActive: lightButtonBgOver; @@ -410,6 +405,7 @@ historyRecordLockRippleMargin: margins(6px, 6px, 6px, 6px); historyRecordDelete: IconButton(historyAttach) { icon: icon {{ "info_media_delete", historyComposeIconFg }}; iconOver: icon {{ "info_media_delete", historyComposeIconFgOver }}; + iconPosition: point(10px, 11px); } historyRecordWaveformRightSkip: 10px; historyRecordWaveformBgMargins: margins(5px, 7px, 5px, 7px); @@ -422,13 +418,13 @@ historyRecordCancelButtonWidth: 100px; historyRecordCancelButtonFg: lightButtonFg; historySilentToggle: IconButton(historyBotKeyboardShow) { - icon: icon {{ "send_control_silent_off", historyComposeIconFg }}; - iconOver: icon {{ "send_control_silent_off", historyComposeIconFgOver }}; + icon: icon {{ "chat/input_silent", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_silent", historyComposeIconFgOver }}; } historySilentToggleCrossLine: CrossLineAnimation { fg: historyComposeIconFg; - icon: icon {{ "send_control_silent_off", historyComposeIconFg }}; + icon: icon {{ "chat/input_silent", historyComposeIconFg }}; startPosition: point(5px, 3px); endPosition: point(21px, 18px); stroke: 2px;