diff --git a/Telegram/Resources/icons/chat/input_edit.png b/Telegram/Resources/icons/chat/input_edit.png new file mode 100644 index 0000000000..28639bab22 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_edit.png differ diff --git a/Telegram/Resources/icons/chat/input_edit@2x.png b/Telegram/Resources/icons/chat/input_edit@2x.png new file mode 100644 index 0000000000..8e7bbf2eda Binary files /dev/null and b/Telegram/Resources/icons/chat/input_edit@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_edit@3x.png b/Telegram/Resources/icons/chat/input_edit@3x.png new file mode 100644 index 0000000000..7da15659a2 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_edit@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_forward.png b/Telegram/Resources/icons/chat/input_forward.png new file mode 100644 index 0000000000..c04e20ceb3 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_forward.png differ diff --git a/Telegram/Resources/icons/chat/input_forward@2x.png b/Telegram/Resources/icons/chat/input_forward@2x.png new file mode 100644 index 0000000000..c500804d00 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_forward@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_forward@3x.png b/Telegram/Resources/icons/chat/input_forward@3x.png new file mode 100644 index 0000000000..9df3f2369c Binary files /dev/null and b/Telegram/Resources/icons/chat/input_forward@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_record_filled.png b/Telegram/Resources/icons/chat/input_record_filled.png new file mode 100644 index 0000000000..48b9786b40 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record_filled.png differ diff --git a/Telegram/Resources/icons/chat/input_record_filled@2x.png b/Telegram/Resources/icons/chat/input_record_filled@2x.png new file mode 100644 index 0000000000..3ff966ba0c Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record_filled@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_record_filled@3x.png b/Telegram/Resources/icons/chat/input_record_filled@3x.png new file mode 100644 index 0000000000..481fbc14a3 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_record_filled@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_reply.png b/Telegram/Resources/icons/chat/input_reply.png new file mode 100644 index 0000000000..f20b997732 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_reply.png differ diff --git a/Telegram/Resources/icons/chat/input_reply@2x.png b/Telegram/Resources/icons/chat/input_reply@2x.png new file mode 100644 index 0000000000..e44f5f79eb Binary files /dev/null and b/Telegram/Resources/icons/chat/input_reply@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_reply@3x.png b/Telegram/Resources/icons/chat/input_reply@3x.png new file mode 100644 index 0000000000..97688789f3 Binary files /dev/null and b/Telegram/Resources/icons/chat/input_reply@3x.png differ diff --git a/Telegram/Resources/icons/chat/input_save.png b/Telegram/Resources/icons/chat/input_save.png new file mode 100644 index 0000000000..766d7585ae Binary files /dev/null and b/Telegram/Resources/icons/chat/input_save.png differ diff --git a/Telegram/Resources/icons/chat/input_save@2x.png b/Telegram/Resources/icons/chat/input_save@2x.png new file mode 100644 index 0000000000..f8314d4e2e Binary files /dev/null and b/Telegram/Resources/icons/chat/input_save@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_save@3x.png b/Telegram/Resources/icons/chat/input_save@3x.png new file mode 100644 index 0000000000..fb49ed6a5b Binary files /dev/null and b/Telegram/Resources/icons/chat/input_save@3x.png differ diff --git a/Telegram/Resources/icons/send_control_schedule.png b/Telegram/Resources/icons/chat/input_schedule.png similarity index 100% rename from Telegram/Resources/icons/send_control_schedule.png rename to Telegram/Resources/icons/chat/input_schedule.png diff --git a/Telegram/Resources/icons/send_control_schedule@2x.png b/Telegram/Resources/icons/chat/input_schedule@2x.png similarity index 100% rename from Telegram/Resources/icons/send_control_schedule@2x.png rename to Telegram/Resources/icons/chat/input_schedule@2x.png diff --git a/Telegram/Resources/icons/send_control_schedule@3x.png b/Telegram/Resources/icons/chat/input_schedule@3x.png similarity index 100% rename from Telegram/Resources/icons/send_control_schedule@3x.png rename to Telegram/Resources/icons/chat/input_schedule@3x.png diff --git a/Telegram/Resources/icons/send_control_send.png b/Telegram/Resources/icons/chat/input_send.png similarity index 100% rename from Telegram/Resources/icons/send_control_send.png rename to Telegram/Resources/icons/chat/input_send.png diff --git a/Telegram/Resources/icons/send_control_send@2x.png b/Telegram/Resources/icons/chat/input_send@2x.png similarity index 100% rename from Telegram/Resources/icons/send_control_send@2x.png rename to Telegram/Resources/icons/chat/input_send@2x.png diff --git a/Telegram/Resources/icons/send_control_send@3x.png b/Telegram/Resources/icons/chat/input_send@3x.png similarity index 100% rename from Telegram/Resources/icons/send_control_send@3x.png rename to Telegram/Resources/icons/chat/input_send@3x.png diff --git a/Telegram/Resources/icons/chat/input_smile.png b/Telegram/Resources/icons/chat/input_smile.png deleted file mode 100644 index c23f30d0ae..0000000000 Binary files a/Telegram/Resources/icons/chat/input_smile.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/input_smile@2x.png b/Telegram/Resources/icons/chat/input_smile@2x.png deleted file mode 100644 index 89c9afb8cc..0000000000 Binary files a/Telegram/Resources/icons/chat/input_smile@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/input_smile@3x.png b/Telegram/Resources/icons/chat/input_smile@3x.png deleted file mode 100644 index 5af6ecc1de..0000000000 Binary files a/Telegram/Resources/icons/chat/input_smile@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/chat/input_smile_face.png b/Telegram/Resources/icons/chat/input_smile_face.png new file mode 100644 index 0000000000..044bb0c44d Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile_face.png differ diff --git a/Telegram/Resources/icons/chat/input_smile_face@2x.png b/Telegram/Resources/icons/chat/input_smile_face@2x.png new file mode 100644 index 0000000000..a6386c056d Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile_face@2x.png differ diff --git a/Telegram/Resources/icons/chat/input_smile_face@3x.png b/Telegram/Resources/icons/chat/input_smile_face@3x.png new file mode 100644 index 0000000000..faac7bc86f Binary files /dev/null and b/Telegram/Resources/icons/chat/input_smile_face@3x.png differ diff --git a/Telegram/Resources/icons/history_action_edit.png b/Telegram/Resources/icons/history_action_edit.png deleted file mode 100644 index 27b1e77a91..0000000000 Binary files a/Telegram/Resources/icons/history_action_edit.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_edit@2x.png b/Telegram/Resources/icons/history_action_edit@2x.png deleted file mode 100644 index 13571d1b25..0000000000 Binary files a/Telegram/Resources/icons/history_action_edit@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_edit@3x.png b/Telegram/Resources/icons/history_action_edit@3x.png deleted file mode 100644 index 25e8201221..0000000000 Binary files a/Telegram/Resources/icons/history_action_edit@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_forward.png b/Telegram/Resources/icons/history_action_forward.png deleted file mode 100644 index b48285c295..0000000000 Binary files a/Telegram/Resources/icons/history_action_forward.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_forward@2x.png b/Telegram/Resources/icons/history_action_forward@2x.png deleted file mode 100644 index f3eae397ea..0000000000 Binary files a/Telegram/Resources/icons/history_action_forward@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_forward@3x.png b/Telegram/Resources/icons/history_action_forward@3x.png deleted file mode 100644 index 06145c061a..0000000000 Binary files a/Telegram/Resources/icons/history_action_forward@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_reply.png b/Telegram/Resources/icons/history_action_reply.png deleted file mode 100644 index 53f921e0f9..0000000000 Binary files a/Telegram/Resources/icons/history_action_reply.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_reply@2x.png b/Telegram/Resources/icons/history_action_reply@2x.png deleted file mode 100644 index 84fbad6470..0000000000 Binary files a/Telegram/Resources/icons/history_action_reply@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/history_action_reply@3x.png b/Telegram/Resources/icons/history_action_reply@3x.png deleted file mode 100644 index c6a3db9507..0000000000 Binary files a/Telegram/Resources/icons/history_action_reply@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_emoji.png b/Telegram/Resources/icons/send_control_emoji.png deleted file mode 100644 index 1405967277..0000000000 Binary files a/Telegram/Resources/icons/send_control_emoji.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_emoji@2x.png b/Telegram/Resources/icons/send_control_emoji@2x.png deleted file mode 100644 index 15ffcdd5f9..0000000000 Binary files a/Telegram/Resources/icons/send_control_emoji@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_emoji@3x.png b/Telegram/Resources/icons/send_control_emoji@3x.png deleted file mode 100644 index c3fd4cc403..0000000000 Binary files a/Telegram/Resources/icons/send_control_emoji@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record_active.png b/Telegram/Resources/icons/send_control_record_active.png deleted file mode 100644 index af937a2014..0000000000 Binary files a/Telegram/Resources/icons/send_control_record_active.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record_active@2x.png b/Telegram/Resources/icons/send_control_record_active@2x.png deleted file mode 100644 index f854549ac5..0000000000 Binary files a/Telegram/Resources/icons/send_control_record_active@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_record_active@3x.png b/Telegram/Resources/icons/send_control_record_active@3x.png deleted file mode 100644 index 1406aadc58..0000000000 Binary files a/Telegram/Resources/icons/send_control_record_active@3x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_save.png b/Telegram/Resources/icons/send_control_save.png deleted file mode 100644 index 199ab2b0c0..0000000000 Binary files a/Telegram/Resources/icons/send_control_save.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_save@2x.png b/Telegram/Resources/icons/send_control_save@2x.png deleted file mode 100644 index 5412d12966..0000000000 Binary files a/Telegram/Resources/icons/send_control_save@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/send_control_save@3x.png b/Telegram/Resources/icons/send_control_save@3x.png deleted file mode 100644 index e4961c0e2e..0000000000 Binary files a/Telegram/Resources/icons/send_control_save@3x.png and /dev/null differ diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 8b1f357ad0..25ae77ad8b 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -74,7 +74,7 @@ stickersFeaturedUnreadBg: msgFileInBg; stickersFeaturedUnreadSize: 5px; stickersFeaturedUnreadSkip: 5px; stickersFeaturedUnreadTop: 7px; -stickersFeaturedInstalled: icon {{ "send_control_save", lightButtonFg }}; +stickersFeaturedInstalled: icon {{ "chat/input_save", lightButtonFg }}; stickersMaxHeight: 320px; stickersPadding: margins(19px, 13px, 19px, 13px); diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 7b7e0475f1..f2b7ef7a99 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -279,14 +279,14 @@ historyContactStatusBlock: FlatButton(historyContactStatusButton) { } historyContactStatusMinSkip: 16px; -historySendIcon: icon {{ "send_control_send", historySendIconFg }}; -historySendIconOver: icon {{ "send_control_send", historySendIconFgOver }}; +historySendIcon: icon {{ "chat/input_send", historySendIconFg }}; +historySendIconOver: icon {{ "chat/input_send", historySendIconFgOver }}; historySendIconPosition: point(10px, 11px); historySendSize: size(44px, 46px); -historyScheduleIcon: icon {{ "send_control_schedule", historyComposeAreaBg }}; +historyScheduleIcon: icon {{ "chat/input_schedule", historyComposeAreaBg }}; historyScheduleIconPosition: point(7px, 8px); -historyEditSaveIcon: icon {{ "send_control_save", historySendIconFg, point(2px, 7px) }}; -historyEditSaveIconOver: icon {{ "send_control_save", historySendIconFgOver, point(2px, 7px) }}; +historyEditSaveIcon: icon {{ "chat/input_save", historySendIconFg }}; +historyEditSaveIconOver: icon {{ "chat/input_save", historySendIconFgOver }}; historyAttach: IconButton(defaultIconButton) { width: 44px; @@ -303,8 +303,8 @@ historyAttach: IconButton(defaultIconButton) { } historyAttachEmoji: IconButton(historyAttach) { - icon: icon {{ "send_control_emoji", historyComposeIconFg }}; - iconOver: icon {{ "send_control_emoji", historyComposeIconFgOver }}; + icon: icon {{ "chat/input_smile_face", historyComposeIconFg }}; + iconOver: icon {{ "chat/input_smile_face", historyComposeIconFgOver }}; } historyMessagesTTL: IconButton(historyAttach) { icon: icon {{ "chat/input_autodelete_1d", historyComposeIconFg }}; @@ -313,7 +313,7 @@ historyMessagesTTL: IconButton(historyAttach) { historyMessagesTTL2Icon: icon {{ "chat/input_autodelete_7d", historyComposeIconFg }}; historyMessagesTTL2IconOver: icon {{ "chat/input_autodelete_7d", historyComposeIconFgOver }}; historyAttachEmojiFgActive: windowActiveTextFg; -historyAttachEmojiActive: icon {{ "send_control_emoji", historyAttachEmojiFgActive }}; +historyAttachEmojiActive: icon {{ "chat/input_smile_face", historyAttachEmojiFgActive }}; historyAttachEmojiTooltipDelta: 4px; historyEmojiCircle: size(20px, 20px); historyEmojiCirclePeriod: 1500; @@ -355,7 +355,7 @@ historyRecordVoiceShowDuration: 120; historyRecordVoiceDuration: 120; historyRecordVoice: icon {{ "chat/input_record", historyRecordVoiceFg }}; historyRecordVoiceOver: icon {{ "chat/input_record", historyRecordVoiceFgOver }}; -historyRecordVoiceActive: icon {{ "send_control_record_active", historyRecordVoiceFgActiveIcon }}; +historyRecordVoiceActive: icon {{ "chat/input_record_filled", historyRecordVoiceFgActiveIcon }}; historyRecordSendIconPosition: point(2px, 0px); historyRecordVoiceRippleBgActive: lightButtonBgOver; historyRecordSignalRadius: 5px; @@ -425,8 +425,8 @@ historySilentToggle: IconButton(historyBotKeyboardShow) { historySilentToggleCrossLine: CrossLineAnimation { fg: historyComposeIconFg; icon: icon {{ "chat/input_silent", historyComposeIconFg }}; - startPosition: point(5px, 3px); - endPosition: point(21px, 18px); + startPosition: point(13px, 11px); + endPosition: point(29px, 26px); stroke: 2px; } @@ -435,10 +435,10 @@ historyReplyNameFg: windowActiveTextFg; historyReplyHeight: 49px; historyReplyTop: 8px; historyReplyBottom: 6px; -historyReplyIconPosition: point(13px, 13px); -historyReplyIcon: icon {{ "history_action_reply", historyReplyIconFg }}; -historyForwardIcon: icon {{ "history_action_forward", historyReplyIconFg }}; -historyEditIcon: icon {{ "history_action_edit", historyReplyIconFg }}; +historyReplyIconPosition: point(5px, 5px); +historyReplyIcon: icon {{ "chat/input_reply", historyReplyIconFg }}; +historyForwardIcon: icon {{ "chat/input_forward", historyReplyIconFg }}; +historyEditIcon: icon {{ "chat/input_edit", historyReplyIconFg }}; historyReplyCancel: IconButton { width: 49px; height: 49px; diff --git a/Telegram/SourceFiles/ui/controls/send_button.cpp b/Telegram/SourceFiles/ui/controls/send_button.cpp index d1c3c30800..3e2420fe98 100644 --- a/Telegram/SourceFiles/ui/controls/send_button.cpp +++ b/Telegram/SourceFiles/ui/controls/send_button.cpp @@ -127,7 +127,7 @@ void SendButton::paintSave(Painter &p, bool over) { const auto &saveIcon = over ? st::historyEditSaveIconOver : st::historyEditSaveIcon; - saveIcon.paint(p, st::historySendIconPosition, width()); + saveIcon.paintInCenter(p, rect()); } void SendButton::paintCancel(Painter &p, bool over) {