From 5c199e63ea939dd36fee3c533878d139c1de7544 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 24 Jun 2016 19:58:41 +0300 Subject: [PATCH] Main window position and size saving fixed in Windows. Dock and top bar hiding after photo view fixed in OS X. Some design improvements. Alpha version 0.9.55. --- Telegram/Patches/qtbase_5_6_0.diff | 32 ++++++++++++ Telegram/Resources/basic.style | 13 ++--- Telegram/Resources/basic_types.style | 2 + Telegram/Resources/langs/lang.strings | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 +-- Telegram/Resources/winrc/Updater.rc | 8 +-- Telegram/SourceFiles/application.cpp | 8 +-- Telegram/SourceFiles/application.h | 1 - Telegram/SourceFiles/core/version.h | 4 +- .../history/field_autocomplete.cpp | 4 +- .../SourceFiles/history/field_autocomplete.h | 2 +- Telegram/SourceFiles/historywidget.cpp | 18 +++++-- Telegram/SourceFiles/lang.cpp | 4 +- .../SourceFiles/profile/profile_cover.cpp | 51 ++++++++++++++++--- Telegram/SourceFiles/profile/profile_cover.h | 9 +++- Telegram/SourceFiles/ui/countryinput.cpp | 10 +++- Telegram/SourceFiles/ui/flatbutton.cpp | 10 +++- Telegram/SourceFiles/ui/flatcheckbox.cpp | 6 +-- Telegram/SourceFiles/ui/flatinput.cpp | 17 ++++--- Telegram/Telegram.xcodeproj/project.pbxproj | 4 +- Telegram/build/version | 6 +-- 21 files changed, 156 insertions(+), 63 deletions(-) diff --git a/Telegram/Patches/qtbase_5_6_0.diff b/Telegram/Patches/qtbase_5_6_0.diff index 7600ec504..dd4c477bf 100644 --- a/Telegram/Patches/qtbase_5_6_0.diff +++ b/Telegram/Patches/qtbase_5_6_0.diff @@ -400,6 +400,23 @@ index a4b5280..e2dffcb 100644 } else { LIBS += $$QMAKE_LIBS_XKBCOMMON QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON +diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp +index d1bea9a..f1f808d 100644 +--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp ++++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp +@@ -232,6 +232,12 @@ bool QComposeInputContext::checkComposeTable() + + void QComposeInputContext::commitText(uint character) const + { ++ // Crash fix when not focused widget still receives input events. ++ if (!m_focusObject) { ++ qWarning("QComposeInputContext::commitText: m_focusObject == nullptr, cannot commit text"); ++ return; ++ } ++ + QInputMethodEvent event; + event.setCommitString(QChar(character)); + QCoreApplication::sendEvent(m_focusObject, &event); diff --git a/src/plugins/platforminputcontexts/fcitx/fcitx.json b/src/plugins/platforminputcontexts/fcitx/fcitx.json new file mode 100644 index 0000000..6d2b389 @@ -11748,6 +11765,21 @@ index 9211fd1..283aabd 100644 void QWindowsXpFileDialogHelper::selectNameFilter(const QString &f) { m_data.setSelectedNameFilter(f); // Dialog cannot be updated at run-time. +diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp +index c5dff60..ce6c715 100644 +--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp ++++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp +@@ -1249,6 +1249,10 @@ QList QWindowsKeyMapper::possibleKeys(const QKeyEvent *e) const + { + QList result; + ++ // This must not happen, but there are crash reports on the next line. ++ if (e->nativeVirtualKey() > 0xFF) ++ return result; ++ + const KeyboardLayoutItem &kbItem = keyLayout[e->nativeVirtualKey()]; + if (!kbItem.exists) + return result; diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp index cc697ba..c72234f 100644 --- a/src/plugins/platforms/windows/qwindowsservices.cpp diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style index 27f407c81..36cd767e9 100644 --- a/Telegram/Resources/basic.style +++ b/Telegram/Resources/basic.style @@ -617,7 +617,7 @@ inpDefGray: flatInput(inpDefFlat) { bgColor: #f2f2f2; borderWidth: 2px; borderColor: #f2f2f2; - borderActive: #80cff9; + borderActive: #54c3f3; borderError: #ed8080; phColor: #808080; } @@ -662,6 +662,9 @@ scrollDef: flatScroll { duration: 150; hiding: 1000; } + +msgRadius: 3px; + scrollCountries: flatScroll(scrollDef) { topsh: 0px; bottomsh: -2px; @@ -729,6 +732,7 @@ btnIntroNext: flatButton(btnDefNext, btnDefBig) { overFont: font(17px); width: 300px; + radius: msgRadius; } boxShadow: sprite(363px, 50px, 15px, 15px); @@ -929,11 +933,6 @@ searchFlatInput: flatInput(inpDefGray) { phColor: #949494; phFocusColor: #a4a4a4; imgRect: sprite(227px, 21px, 24px, 24px); - - borderWidth: 2px; - borderColor: #f2f2f2; - borderActive: #80cff9; - borderError: #ed8080; } noContactsHeight: 100px; @@ -1036,8 +1035,6 @@ topBarActionSkip: 10px; activeFadeInDuration: 500; activeFadeOutDuration: 3000; -msgRadius: 3px; - msgMaxWidth: 430px; msgFont: font(fsize); msgNameFont: semiboldFont; diff --git a/Telegram/Resources/basic_types.style b/Telegram/Resources/basic_types.style index a5921d350..ca5392b13 100644 --- a/Telegram/Resources/basic_types.style +++ b/Telegram/Resources/basic_types.style @@ -66,6 +66,8 @@ flatButton { overFont: font; duration: int; cursor: cursor; + + radius: pixels; } iconedButton { diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index b834c91cc..9f87cedca 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -921,7 +921,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}"; "lng_new_version_minor" = "— Bug fixes and other minor improvements"; -"lng_new_version_text" = "— Introducing Drafts: Seamless syncing for unsent messages on all your devices. Drafts are now visible in your chats list.\n— Completely redesigned group and user profiles.\n— Unread messages counter on the 'Scroll to bottom' button.\n\nMore about this update: {link}"; +"lng_new_version_text" = "— Fixed photo viewer to handle screen resolution change correctly\n— Fixed forwarding photos via drag-n-drop\n— Various design improvements and other bug fixes"; "lng_menu_insert_unicode" = "Insert Unicode control character"; diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 1a71484ad..cc7c21be5 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,54,0 - PRODUCTVERSION 0,9,54,0 + FILEVERSION 0,9,55,0 + PRODUCTVERSION 0,9,55,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.9.54.0" + VALUE "FileVersion", "0.9.55.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.54.0" + VALUE "ProductVersion", "0.9.55.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index ff3c99beb..fa7b0058b 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,54,0 - PRODUCTVERSION 0,9,54,0 + FILEVERSION 0,9,55,0 + PRODUCTVERSION 0,9,55,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.9.54.0" + VALUE "FileVersion", "0.9.55.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.9.54.0" + VALUE "ProductVersion", "0.9.55.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index b9387b86b..212c50317 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -780,10 +780,6 @@ void AppClass::regPhotoUpdate(const PeerId &peer, const FullMsgId &msgId) { photoUpdates.insert(msgId, peer); } -void AppClass::clearPhotoUpdates() { - photoUpdates.clear(); -} - bool AppClass::isPhotoUpdating(const PeerId &peer) { for (QMap::iterator i = photoUpdates.begin(), e = photoUpdates.end(); i != e; ++i) { if (i.value() == peer) { @@ -1049,8 +1045,8 @@ void AppClass::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9054) { - versionFeatures = QString::fromUtf8("\xe2\x80\x94 Photo viewer handles screen resolution change\n\xe2\x80\x94 Forward photo by drag-n-drop fixed\n\xe2\x80\x94 Some design improvements and bug fixes"); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 9055) { + versionFeatures = QString::fromUtf8("\xe2\x80\x94 Main window position and size are saved between the launches in Windows\n\xe2\x80\x94 Dock and top bar hiding fixed in OS X\n\xe2\x80\x94 Various design improvements and other bug fixes"); // versionFeatures = langNewVersionText(); } else if (Local::oldMapVersion() < 9050) { versionFeatures = langNewVersionText(); diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index b7d595eed..4b6023131 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -159,7 +159,6 @@ public: FileUploader *uploader(); void uploadProfilePhoto(const QImage &tosend, const PeerId &peerId); void regPhotoUpdate(const PeerId &peer, const FullMsgId &msgId); - void clearPhotoUpdates(); bool isPhotoUpdating(const PeerId &peer); void cancelPhotoUpdate(const PeerId &peer); diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index deaeed2f4..3e698c0d2 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 9054; -constexpr str_const AppVersionStr = "0.9.54"; +constexpr int AppVersion = 9055; +constexpr str_const AppVersionStr = "0.9.55"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/history/field_autocomplete.cpp b/Telegram/SourceFiles/history/field_autocomplete.cpp index 7bc693a7f..7f3ff29f3 100644 --- a/Telegram/SourceFiles/history/field_autocomplete.cpp +++ b/Telegram/SourceFiles/history/field_autocomplete.cpp @@ -507,9 +507,9 @@ bool FieldAutocomplete::eventFilter(QObject *obj, QEvent *e) { return _inner->chooseSelected(ChooseMethod::ByEnter); } } - if (moderate && ev->key() >= Qt::Key_1 && ev->key() <= Qt::Key_9) { + if (moderate && (ev->key() >= Qt::Key_1 && ev->key() <= Qt::Key_9 || ev->key() == Qt::Key_Q)) { bool handled = false; - emit moderateKeyActivate(ev->key() - Qt::Key_1, &handled); + emit moderateKeyActivate(ev->key(), &handled); return handled; } } diff --git a/Telegram/SourceFiles/history/field_autocomplete.h b/Telegram/SourceFiles/history/field_autocomplete.h index 596034aaa..4dd85260b 100644 --- a/Telegram/SourceFiles/history/field_autocomplete.h +++ b/Telegram/SourceFiles/history/field_autocomplete.h @@ -85,7 +85,7 @@ signals: void botCommandChosen(QString command, FieldAutocomplete::ChooseMethod method) const; void stickerChosen(DocumentData *sticker, FieldAutocomplete::ChooseMethod method) const; - void moderateKeyActivate(int index, bool *outHandled) const; + void moderateKeyActivate(int key, bool *outHandled) const; public slots: diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index fecb23487..9ef08f7d3 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -2481,12 +2481,22 @@ void BotKeyboard::leaveEvent(QEvent *e) { clearSelection(); } -bool BotKeyboard::moderateKeyActivate(int index) { +bool BotKeyboard::moderateKeyActivate(int key) { if (auto item = App::histItemById(_wasForMsgId)) { if (auto markup = item->Get()) { - if (!markup->rows.isEmpty() && index >= 0 && index < markup->rows.front().size()) { - App::activateBotCommand(item, 0, index); - return true; + if (key >= Qt::Key_1 && key <= Qt::Key_9) { + int index = (key - Qt::Key_1); + if (!markup->rows.isEmpty() && index >= 0 && index < markup->rows.front().size()) { + App::activateBotCommand(item, 0, index); + return true; + } + } else if (key == Qt::Key_Q) { + if (auto user = item->history()->peer->asUser()) { + if (user->botInfo && item->from() == user) { + App::sendBotCommand(user, user, qsl("/translate")); + return true; + } + } } } } diff --git a/Telegram/SourceFiles/lang.cpp b/Telegram/SourceFiles/lang.cpp index 6f4fd78e8..59b648bf6 100644 --- a/Telegram/SourceFiles/lang.cpp +++ b/Telegram/SourceFiles/lang.cpp @@ -46,8 +46,8 @@ LangString langCounted(ushort key0, ushort tag, float64 value) { // current lang return lang(LangKey(key0)).tag(tag, sv); } -#define NEW_VER_TAG lt_link -#define NEW_VER_TAG_VALUE "https://telegram.org/blog/drafts" +//#define NEW_VER_TAG lt_link +//#define NEW_VER_TAG_VALUE "https://telegram.org/blog/drafts" QString langNewVersionText() { #ifdef NEW_VER_TAG diff --git a/Telegram/SourceFiles/profile/profile_cover.cpp b/Telegram/SourceFiles/profile/profile_cover.cpp index 431d00e08..9c58ddca0 100644 --- a/Telegram/SourceFiles/profile/profile_cover.cpp +++ b/Telegram/SourceFiles/profile/profile_cover.cpp @@ -26,6 +26,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "profile/profile_userpic_button.h" #include "ui/buttons/round_button.h" #include "ui/filedialog.h" +#include "ui/flatlabel.h" +#include "ui/flatbutton.h" #include "observer_peer.h" #include "boxes/confirmbox.h" #include "boxes/contactsbox.h" @@ -34,6 +36,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "mainwidget.h" #include "mainwindow.h" +#include "application.h" namespace Profile { namespace { @@ -59,8 +62,8 @@ CoverWidget::CoverWidget(QWidget *parent, PeerData *peer) : TWidget(parent) setAttribute(Qt::WA_OpaquePaintEvent); setAcceptDrops(true); - _name.setSelectable(true); - _name.setContextCopyText(lang(lng_profile_copy_fullname)); + _name->setSelectable(true); + _name->setContextCopyText(lang(lng_profile_copy_fullname)); auto observeEvents = ButtonsUpdateFlags | UpdateFlag::NameChanged @@ -68,6 +71,9 @@ CoverWidget::CoverWidget(QWidget *parent, PeerData *peer) : TWidget(parent) Notify::registerPeerObserver(observeEvents, this, &CoverWidget::notifyPeerUpdated); FileDialog::registerObserver(this, &CoverWidget::notifyFileQueryUpdated); + connect(App::app(), SIGNAL(peerPhotoDone(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId))); + connect(App::app(), SIGNAL(peerPhotoFail(PeerId)), this, SLOT(onPhotoUploadStatusChanged(PeerId))); + connect(_userpicButton, SIGNAL(clicked()), this, SLOT(onPhotoShow())); validatePhoto(); @@ -92,6 +98,13 @@ void CoverWidget::onPhotoShow() { } } +void CoverWidget::onCancelPhotoUpload() { + if (auto app = App::app()) { + app->cancelPhotoUpdate(_peer->id); + refreshStatusText(); + } +} + int CoverWidget::countPhotoLeft(int newWidth) const { int result = st::profilePhotoLeftMin; result += (newWidth - st::wndMinWidth) / 2; @@ -110,6 +123,9 @@ void CoverWidget::resizeToWidth(int newWidth) { int infoLeft = _userpicButton->x() + _userpicButton->width(); _statusPosition = QPoint(infoLeft + st::profileStatusLeft, _userpicButton->y() + st::profileStatusTop); + if (_cancelPhotoUpload) { + _cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) + st::profileStatusFont->spacew, _statusPosition.y()); + } moveAndToggleButtons(newWidth); @@ -135,8 +151,8 @@ void CoverWidget::refreshNameGeometry(int newWidth) { nameWidth -= st::profileVerifiedCheckPosition.x() + st::profileVerifiedCheck.width(); } int marginsAdd = st::profileNameLabel.margin.left() + st::profileNameLabel.margin.right(); - _name.resizeToWidth(qMin(nameWidth - marginsAdd, _name.naturalWidth()) + marginsAdd); - _name.moveToLeft(nameLeft, nameTop); + _name->resizeToWidth(qMin(nameWidth - marginsAdd, _name->naturalWidth()) + marginsAdd); + _name->moveToLeft(nameLeft, nameTop); } // A more generic solution would be allowing an optional icon button @@ -188,7 +204,7 @@ void CoverWidget::paintEvent(QPaintEvent *e) { p.drawTextLeft(_statusPosition.x(), _statusPosition.y(), width(), _statusText); if (_peer->isVerified()) { - st::profileVerifiedCheck.paint(p, QPoint(_name.x() + _name.width(), _name.y()) + st::profileVerifiedCheckPosition, width()); + st::profileVerifiedCheck.paint(p, QPoint(_name->x() + _name->width(), _name->y()) + st::profileVerifiedCheckPosition, width()); } paintDivider(p); @@ -322,11 +338,26 @@ void CoverWidget::notifyPeerUpdated(const Notify::PeerUpdate &update) { } void CoverWidget::refreshNameText() { - _name.setText(App::peerName(_peer)); + _name->setText(App::peerName(_peer)); refreshNameGeometry(width()); } void CoverWidget::refreshStatusText() { + if (auto app = App::app()) { + if (app->isPhotoUpdating(_peer->id)) { + _statusText = lang(lng_settings_uploading_photo); + if (!_cancelPhotoUpload) { + _cancelPhotoUpload = new LinkButton(this, lang(lng_cancel), st::btnDefLink); + connect(_cancelPhotoUpload, SIGNAL(clicked()), this, SLOT(onCancelPhotoUpload())); + _cancelPhotoUpload->show(); + _cancelPhotoUpload->moveToLeft(_statusPosition.x() + st::profileStatusFont->width(_statusText) + st::profileStatusFont->spacew, _statusPosition.y()); + } + update(); + return; + } + } + + _cancelPhotoUpload.destroy(); int currentTime = unixtime(); if (_peerUser) { _statusText = App::onlineText(_peerUser, currentTime, true); @@ -477,10 +508,16 @@ void CoverWidget::showSetPhotoBox(const QImage &img) { } auto box = new PhotoCropBox(img, _peer); - connect(box, SIGNAL(closed()), this, SLOT(onPhotoUpdateStart())); + connect(box, SIGNAL(closed()), this, SLOT(onPhotoUploadStatusChanged())); Ui::showLayer(box); } +void CoverWidget::onPhotoUploadStatusChanged(PeerId peerId) { + if (!peerId || peerId == _peer->id) { + refreshStatusText(); + } +} + void CoverWidget::onAddMember() { if (_peerChat) { if (_peerChat->count >= Global::ChatSizeMax() && _peerChat->amCreator()) { diff --git a/Telegram/SourceFiles/profile/profile_cover.h b/Telegram/SourceFiles/profile/profile_cover.h index ea92fe9da..768a77349 100644 --- a/Telegram/SourceFiles/profile/profile_cover.h +++ b/Telegram/SourceFiles/profile/profile_cover.h @@ -22,7 +22,9 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "core/observer.h" #include "ui/filedialog.h" -#include "ui/flatlabel.h" + +class FlatLabel; +class LinkButton; namespace Ui { class RoundButton; @@ -59,6 +61,8 @@ public slots: private slots: void onPhotoShow(); + void onPhotoUploadStatusChanged(PeerId peerId = 0); + void onCancelPhotoUpload(); void onSendMessage(); void onShareContact(); @@ -114,7 +118,8 @@ private: ChildWidget _userpicButton; ChildWidget _dropArea = { nullptr }; - FlatLabel _name; + ChildWidget _name; + ChildWidget _cancelPhotoUpload = { nullptr }; QPoint _statusPosition; QString _statusText; diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp index f1d8b99ef..49dd6b6d4 100644 --- a/Telegram/SourceFiles/ui/countryinput.cpp +++ b/Telegram/SourceFiles/ui/countryinput.cpp @@ -114,10 +114,16 @@ CountryInput::CountryInput(QWidget *parent, const style::countryInput &st) : QWi void CountryInput::paintEvent(QPaintEvent *e) { QPainter p(this); - p.fillRect(_inner, _st.bgColor->b); + p.setRenderHint(QPainter::HighQualityAntialiasing); + p.setBrush(_st.bgColor); + p.setPen(Qt::NoPen); + p.drawRoundedRect(_inner, st::msgRadius, st::msgRadius); + p.setRenderHint(QPainter::HighQualityAntialiasing, false); + p.drawPixmap(_arrowRect.x(), _arrowRect.top(), _arrow); - p.setFont(_st.font->f); + p.setFont(_st.font); + p.setPen(st::windowTextFg); p.drawText(rect().marginsRemoved(_st.textMrg), _text, QTextOption(_st.align)); } diff --git a/Telegram/SourceFiles/ui/flatbutton.cpp b/Telegram/SourceFiles/ui/flatbutton.cpp index 2ead5cbce..8443ba011 100644 --- a/Telegram/SourceFiles/ui/flatbutton.cpp +++ b/Telegram/SourceFiles/ui/flatbutton.cpp @@ -101,7 +101,15 @@ void FlatButton::paintEvent(QPaintEvent *e) { QRect r(0, height() - _st.height, width(), _st.height); p.setOpacity(_opacity); - p.fillRect(r, a_bg.current()); + if (_st.radius > 0) { + p.setRenderHint(QPainter::HighQualityAntialiasing); + p.setPen(Qt::NoPen); + p.setBrush(QBrush(a_bg.current())); + p.drawRoundedRect(r, _st.radius, _st.radius); + p.setRenderHint(QPainter::HighQualityAntialiasing, false); + } else { + p.fillRect(r, a_bg.current()); + } p.setFont((_state & StateOver) ? _st.overFont : _st.font); p.setRenderHint(QPainter::TextAntialiasing); diff --git a/Telegram/SourceFiles/ui/flatcheckbox.cpp b/Telegram/SourceFiles/ui/flatcheckbox.cpp index 6e082f890..8792f4b00 100644 --- a/Telegram/SourceFiles/ui/flatcheckbox.cpp +++ b/Telegram/SourceFiles/ui/flatcheckbox.cpp @@ -347,7 +347,7 @@ void Checkbox::paintEvent(QPaintEvent *e) { } else { p.setBrush(st::white); } - p.drawRoundedRect(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2, _st.thickness / 2, _st.thickness / 2, _st.thickness / 2)), st::msgRadius - (_st.thickness / 2), st::msgRadius - (_st.thickness / 2)); + p.drawRoundedRect(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2., _st.thickness / 2., _st.thickness / 2., _st.thickness / 2.)), st::msgRadius - (_st.thickness / 2.), st::msgRadius - (_st.thickness / 2.)); p.setRenderHint(QPainter::HighQualityAntialiasing, false); if (checked > 0) { @@ -485,9 +485,9 @@ void Radiobutton::paintEvent(QPaintEvent *e) { pen.setWidth(_st.thickness); p.setPen(pen); p.setBrush(Qt::NoBrush); - //int32 skip = qCeil(_st.thickness / 2); + //int32 skip = qCeil(_st.thickness / 2.); //p.drawEllipse(_checkRect.marginsRemoved(QMargins(skip, skip, skip, skip))); - p.drawEllipse(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2, _st.thickness / 2, _st.thickness / 2, _st.thickness / 2))); + p.drawEllipse(QRectF(_checkRect).marginsRemoved(QMarginsF(_st.thickness / 2., _st.thickness / 2., _st.thickness / 2., _st.thickness / 2.))); if (checked > 0) { p.setPen(Qt::NoPen); diff --git a/Telegram/SourceFiles/ui/flatinput.cpp b/Telegram/SourceFiles/ui/flatinput.cpp index dbb8f3006..da94c45a0 100644 --- a/Telegram/SourceFiles/ui/flatinput.cpp +++ b/Telegram/SourceFiles/ui/flatinput.cpp @@ -174,14 +174,15 @@ QRect FlatInput::getTextRect() const { void FlatInput::paintEvent(QPaintEvent *e) { Painter p(this); - p.fillRect(rect(), a_bgColor.current()); - if (_st.borderWidth) { - QBrush b(a_borderColor.current()); - p.fillRect(0, 0, width() - _st.borderWidth, _st.borderWidth, b); - p.fillRect(width() - _st.borderWidth, 0, _st.borderWidth, height() - _st.borderWidth, b); - p.fillRect(_st.borderWidth, height() - _st.borderWidth, width() - _st.borderWidth, _st.borderWidth, b); - p.fillRect(0, _st.borderWidth, _st.borderWidth, height() - _st.borderWidth, b); - } + + p.setRenderHint(QPainter::HighQualityAntialiasing); + auto pen = QPen(a_borderColor.current()); + pen.setWidth(_st.borderWidth); + p.setPen(pen); + p.setBrush(QBrush(a_bgColor.current())); + p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::msgRadius - (_st.borderWidth / 2.), st::msgRadius - (_st.borderWidth / 2.)); + p.setRenderHint(QPainter::HighQualityAntialiasing, false); + if (_st.imgRect.pxWidth()) { p.drawSprite(_st.imgPos, _st.imgRect); } diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 791bb84e4..d7742fd06 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -2375,7 +2375,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.54; + TDESKTOP_VERSION = 0.9.55; }; name = Release; }; @@ -2516,7 +2516,7 @@ SDKROOT = macosx; SYMROOT = ./../Mac; TDESKTOP_MAJOR_VERSION = 0.9; - TDESKTOP_VERSION = 0.9.54; + TDESKTOP_VERSION = 0.9.55; }; name = Debug; }; diff --git a/Telegram/build/version b/Telegram/build/version index 28606fe25..f0fc1980b 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 9054 +AppVersion 9055 AppVersionStrMajor 0.9 -AppVersionStrSmall 0.9.54 -AppVersionStr 0.9.54 +AppVersionStrSmall 0.9.55 +AppVersionStr 0.9.55 AlphaChannel 1 BetaVersion 0