diff --git a/Telegram/SourceFiles/base/optional.h b/Telegram/SourceFiles/base/optional.h index bfb6ec8a0..6f5ed9e1f 100644 --- a/Telegram/SourceFiles/base/optional.h +++ b/Telegram/SourceFiles/base/optional.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/variant.h" +#include // for Expects namespace base { diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp index 0c8266016..a969f483f 100644 --- a/Telegram/SourceFiles/boxes/share_box.cpp +++ b/Telegram/SourceFiles/boxes/share_box.cpp @@ -256,21 +256,22 @@ void ShareBox::onSelectedChanged() { void ShareBox::onMustScrollTo(int top, int bottom) { onScrollToY(top, bottom); - //auto scrollTop = scrollArea()->scrollTop(), scrollBottom = scrollTop + scrollArea()->height(); - //auto from = scrollTop, to = scrollTop; - //if (scrollTop > top) { - // to = top; - //} else if (scrollBottom < bottom) { - // to = bottom - (scrollBottom - scrollTop); - //} - //if (from != to) { - // _scrollAnimation.start([this]() { scrollAnimationCallback(); }, from, to, st::shareScrollDuration, anim::sineInOut); - //} + // auto scrollTop = scrollArea()->scrollTop(), scrollBottom = scrollTop + scrollArea()->height(); + // auto from = scrollTop, to = scrollTop; + // if (scrollTop > top) { + // to = top; + // } else if (scrollBottom < bottom) { + // to = bottom - (scrollBottom - scrollTop); + // } + // if (from != to) { + // _scrollAnimation.start([this]() { scrollAnimationCallback(); }, from, to, st::shareScrollDuration, + // anim::sineInOut); + // } } void ShareBox::scrollAnimationCallback() { - //auto scrollTop = std::round(_scrollAnimation.current(scrollArea()->scrollTop())); - //scrollArea()->scrollToY(scrollTop); + // auto scrollTop = std::round(_scrollAnimation.current(scrollArea()->scrollTop())); + // scrollArea()->scrollToY(scrollTop); } ShareBox::Inner::Inner(QWidget *parent, ShareBox::FilterCallback &&filterCallback) : TWidget(parent) diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index d800a25d8..668f7a7bf 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -186,8 +186,8 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, double dt, double o } // Draw corners - //paintCorner(_topLeft, _innerLeft, _innerTop); - //paintCorner(_topRight, _innerRight - _topRight.width, _innerTop); + // paintCorner(_topLeft, _innerLeft, _innerTop); + // paintCorner(_topRight, _innerRight - _topRight.width, _innerTop); paintCorner(_bottomLeft, _innerLeft, _innerBottom - _bottomLeft.height); paintCorner(_bottomRight, _innerRight - _bottomRight.width, _innerBottom - _bottomRight.height); @@ -250,17 +250,18 @@ void TabbedSelector::SlideAnimation::paintFrame(QPainter &p, double dt, double o } // Debug - //frameInts = _frameInts; - //auto pattern = anim::shifted((static_cast(0xFF) << 24) | (static_cast(0xFF) << 16) | (static_cast(0xFF) << 8) | static_cast(0xFF)); - //for (auto y = 0; y != _finalHeight; ++y) { - // for (auto x = 0; x != _finalWidth; ++x) { - // auto source = *frameInts; - // auto sourceAlpha = (source >> 24); - // *frameInts = anim::unshifted(anim::shifted(source) * 256 + pattern * (256 - sourceAlpha)); - // ++frameInts; + // frameInts = _frameInts; + // auto pattern = anim::shifted((static_cast(0xFF) << 24) | (static_cast(0xFF) << 16) | + // (static_cast(0xFF) << 8) | static_cast(0xFF)); + // for (auto y = 0; y != _finalHeight; ++y) { + // for (auto x = 0; x != _finalWidth; ++x) { + // auto source = *frameInts; + // auto sourceAlpha = (source >> 24); + // *frameInts = anim::unshifted(anim::shifted(source) * 256 + pattern * (256 - sourceAlpha)); + // ++frameInts; + // } + // frameInts += _frameIntsPerLineAdded; // } - // frameInts += _frameIntsPerLineAdded; - //} p.drawImage(outerLeft / cIntRetinaFactor(), outerTop / cIntRetinaFactor(), _frame, outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop); } diff --git a/Telegram/SourceFiles/codegen/emoji/data.cpp b/Telegram/SourceFiles/codegen/emoji/data.cpp index fb17be3a7..5f0e81d44 100644 --- a/Telegram/SourceFiles/codegen/emoji/data.cpp +++ b/Telegram/SourceFiles/codegen/emoji/data.cpp @@ -40,7 +40,7 @@ struct Replace { InputId code; const char *replace; }; - +// clang-format off Replace Replaces[] = { { { 0xD83DDE0AU }, ":-)" }, { { 0xD83DDE0DU }, "8-)" }, @@ -1696,7 +1696,7 @@ InputCategory Category7 = { { 0xD83CDDFFU, 0xD83CDDF2U, }, { 0xD83CDDFFU, 0xD83CDDFCU, }, }; - +// clang-format on constexpr auto kErrorBadData = 401; void append(Id &id, quint32 code) { diff --git a/Telegram/SourceFiles/data/data_abstract_structure.h b/Telegram/SourceFiles/data/data_abstract_structure.h index 559aa0f6d..a884a3b98 100644 --- a/Telegram/SourceFiles/data/data_abstract_structure.h +++ b/Telegram/SourceFiles/data/data_abstract_structure.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/assertion.h" namespace Data { // This module suggests a way to hold global data structures, that are diff --git a/Telegram/SourceFiles/layerwidget.cpp b/Telegram/SourceFiles/layerwidget.cpp index 83737483e..22172fe9e 100644 --- a/Telegram/SourceFiles/layerwidget.cpp +++ b/Telegram/SourceFiles/layerwidget.cpp @@ -752,8 +752,12 @@ void MediaPreviewWidget::paintEvent(QPaintEvent *e) { } } else { p.setOpacity(shown); -// w = std::max(std::round(w * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(w % 2), 1); -// h = std::max(std::round(h * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(h % 2), 1); + // w = std::max( + // std::round(w * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(w % 2), + // 1); + // h = std::max( + // std::round(h * (st::stickerPreviewMin + ((1. - st::stickerPreviewMin) * shown)) / 2.) * 2 + int(h % 2), + // 1); } p.fillRect(r, st::stickerPreviewBg); p.drawPixmap((width() - w) / 2, (height() - h) / 2, image); diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp index 5e87d3f87..7218e5645 100644 --- a/Telegram/SourceFiles/media/media_audio.cpp +++ b/Telegram/SourceFiles/media/media_audio.cpp @@ -1433,11 +1433,12 @@ public: trySet(_performer, dict, "artist"); trySet(_performer, dict, "performer"); trySet(_performer, dict, "album_artist"); - //for (AVDictionaryEntry *tag = av_dict_get(dict, "", 0, AV_DICT_IGNORE_SUFFIX); tag; tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX)) { - // const char *key = tag->key; - // const char *value = tag->value; - // QString tmp = QString::fromUtf8(value); - //} + // for (AVDictionaryEntry *tag = av_dict_get(dict, "", 0, AV_DICT_IGNORE_SUFFIX); tag; + // tag = av_dict_get(dict, "", tag, AV_DICT_IGNORE_SUFFIX)) { + // const char *key = tag->key; + // const char *value = tag->value; + // QString tmp = QString::fromUtf8(value); + // } } qint32 format() override { diff --git a/Telegram/SourceFiles/media/media_audio_capture.cpp b/Telegram/SourceFiles/media/media_audio_capture.cpp index 13006c1f7..5d82fb787 100644 --- a/Telegram/SourceFiles/media/media_audio_capture.cpp +++ b/Telegram/SourceFiles/media/media_audio_capture.cpp @@ -276,13 +276,17 @@ void Instance::Inner::onStart() { // Alloc source samples - d->srcSamples = (d->codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ? 10000 : d->codecContext->frame_size; - //if ((res = av_samples_alloc_array_and_samples(&d->srcSamplesData, 0, d->codecContext->channels, d->srcSamples, d->codecContext->sample_fmt, 0)) < 0) { - // LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2").arg(res).arg(av_make_error_string(err, sizeof(err), res))); - // onStop(false); - // emit error(); - // return; - //} + d->srcSamples = + (d->codecContext->codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ? 10000 : d->codecContext->frame_size; + // if ((res = av_samples_alloc_array_and_samples(&d->srcSamplesData, 0, d->codecContext->channels, d->srcSamples, + // d->codecContext->sample_fmt, 0)) < 0) { + // LOG(("Audio Error: Unable to av_samples_alloc_array_and_samples for capture, error %1, %2") + // .arg(res) + // .arg(av_make_error_string(err, sizeof(err), res))); + // onStop(false); + // emit error(); + // return; + // } // Using _captured directly // Prepare resampling diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h index 20c3234cd..f45947f87 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.h +++ b/Telegram/SourceFiles/media/player/media_player_panel.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "history/history_item.h" +#include "ui/twidget.h" namespace Ui { class ScrollArea; class Shadow; diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.h b/Telegram/SourceFiles/media/player/media_player_volume_controller.h index 78fd64327..b904ea1b3 100644 --- a/Telegram/SourceFiles/media/player/media_player_volume_controller.h +++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "ui/animation.h" +#include "ui/twidget.h" namespace Ui { class IconButton; class MediaSlider; diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h index 151c3869c..19d1ec838 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.h +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once #include "structs.h" +#include "base/observer.h" class AudioMsgId; diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.h b/Telegram/SourceFiles/media/view/media_clip_controller.h index 34cddf103..30315b24b 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.h +++ b/Telegram/SourceFiles/media/view/media_clip_controller.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" namespace Ui { class LabelSimple; class FadeAnimation; diff --git a/Telegram/SourceFiles/media/view/media_clip_volume_controller.h b/Telegram/SourceFiles/media/view/media_clip_volume_controller.h index afc4d9b6e..f912ed220 100644 --- a/Telegram/SourceFiles/media/view/media_clip_volume_controller.h +++ b/Telegram/SourceFiles/media/view/media_clip_volume_controller.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/animation.h" +#include "ui/twidget.h" namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index d5dc562d1..b0fd98bb2 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -1084,12 +1084,14 @@ void ConnectionPrivate::restart() { if (!sessionData->isCheckedKey()) { // No destroying in case of an error. // - //if (mayBeBadKey) { - // clearMessages(); - // keyId = kRecreateKeyId; -// retryTimeout = 1; // no ddos please - // LOG(("MTP Info: key may be bad and was not checked - but won't be destroyed, no log outs because of bad server right now...")); - //} + // if (mayBeBadKey) { + // clearMessages(); + // keyId = kRecreateKeyId; + // retryTimeout = 1; // no ddos please + // LOG( + // ("MTP Info: key may be bad and was not checked - but won't be destroyed, no log outs because of " + // "bad server right now...")); + // } } else { sessionData->setCheckedKey(false); } diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.cpp b/Telegram/SourceFiles/mtproto/mtp_instance.cpp index 524cf2535..cd93505a2 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp +++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp @@ -979,18 +979,20 @@ bool Instance::Private::onErrorDefault(mtpRequestId requestId, const RPCError &e // migrate not supported at this moment // this was not tested even once // - //DEBUG_LOG(("MTP Info: importing auth to dc %1").arg(newdcWithShift)); - //auto &waiters(_authWaiters[newdcWithShift]); - //if (waiters.empty()) { - // auto exportRequestId = _instance->send(MTPauth_ExportAuthorization(MTP_int(newdcWithShift)), rpcDone([this](const MTPauth_ExportedAuthorization &result, mtpRequestId requestId) { - // exportDone(result, requestId); - // }), rpcFail([this](const RPCError &error, mtpRequestId requestId) { - // return exportFail(error, requestId); - // })); - // _authExportRequests.emplace(exportRequestId, newdcWithShift); - //} - //waiters.push_back(requestId); - //return true; + // DEBUG_LOG(("MTP Info: importing auth to dc %1").arg(newdcWithShift)); + // auto &waiters(_authWaiters[newdcWithShift]); + // if (waiters.empty()) { + // auto exportRequestId = + // _instance->send(MTPauth_ExportAuthorization(MTP_int(newdcWithShift)), + // rpcDone([this](const MTPauth_ExportedAuthorization &result, + // mtpRequestId requestId) { exportDone(result, requestId); }), + // rpcFail([this](const RPCError &error, mtpRequestId requestId) { + // return exportFail(error, requestId); + // })); + // _authExportRequests.emplace(exportRequestId, newdcWithShift); + // } + // waiters.push_back(requestId); + // return true; } else { _instance->setMainDcId(newdcWithShift); } diff --git a/Telegram/SourceFiles/overviewwidget.h b/Telegram/SourceFiles/overviewwidget.h index 250d1179e..32e451eed 100644 --- a/Telegram/SourceFiles/overviewwidget.h +++ b/Telegram/SourceFiles/overviewwidget.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "history/history_item.h" +#include "history/history.h" +#include "ui/widgets/scroll_area.h" +#include "ui/widgets/tooltip.h" #include "window/section_widget.h" #include "window/top_bar_widget.h" #include "ui/widgets/tooltip.h" diff --git a/Telegram/SourceFiles/ui/effects/panel_animation.cpp b/Telegram/SourceFiles/ui/effects/panel_animation.cpp index d278e8dfb..5726ed5c1 100644 --- a/Telegram/SourceFiles/ui/effects/panel_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/panel_animation.cpp @@ -494,17 +494,18 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, doubl } // Debug - //frameInts = _frameInts; - //auto pattern = anim::shifted((static_cast(0xFF) << 24) | (static_cast(0xFF) << 16) | (static_cast(0xFF) << 8) | static_cast(0xFF)); - //for (auto y = 0; y != _finalHeight; ++y) { - // for (auto x = 0; x != _finalWidth; ++x) { - // auto source = *frameInts; - // auto sourceAlpha = (source >> 24); - // *frameInts = anim::unshifted(anim::shifted(source) * 256 + pattern * (256 - sourceAlpha)); - // ++frameInts; + // frameInts = _frameInts; + // auto pattern = anim::shifted((static_cast(0xFF) << 24) | (static_cast(0xFF) << 16) | + // (static_cast(0xFF) << 8) | static_cast(0xFF)); + // for (auto y = 0; y != _finalHeight; ++y) { + // for (auto x = 0; x != _finalWidth; ++x) { + // auto source = *frameInts; + // auto sourceAlpha = (source >> 24); + // *frameInts = anim::unshifted(anim::shifted(source) * 256 + pattern * (256 - sourceAlpha)); + // ++frameInts; + // } + // frameInts += _frameIntsPerLineAdded; // } - // frameInts += _frameIntsPerLineAdded; - //} p.drawImage(rtlpoint(x + (outerLeft / cIntRetinaFactor()), y + (outerTop / cIntRetinaFactor()), outerWidth), _frame, QRect(outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop)); } diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 1b899d708..f7668bda5 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -2546,30 +2546,33 @@ void Text::setMarkedText(const style::TextStyle &st, const TextWithEntities &tex clear(); { // utf codes of the text display for emoji extraction -// auto text = textWithEntities.text; -// auto newText = QString(); -// newText.reserve(8 * text.size()); -// newText.append("\t{ "); -// for (const QChar *ch = text.constData(), *e = ch + text.size(); ch != e; ++ch) { -// if (*ch == TextCommand) { -// break; -// } else if (chIsNewline(*ch)) { -// newText.append("},").append(*ch).append("\t{ "); -// } else { -// if (ch->isHighSurrogate() || ch->isLowSurrogate()) { -// if (ch->isHighSurrogate() && (ch + 1 != e) && ((ch + 1)->isLowSurrogate())) { -// newText.append("0x").append(QString::number((quint32(ch->unicode()) << 16) | quint32((ch + 1)->unicode()), 16).toUpper()).append("U, "); -// ++ch; -// } else { -// newText.append("BADx").append(QString::number(ch->unicode(), 16).toUpper()).append("U, "); -// } -// } else { -// newText.append("0x").append(QString::number(ch->unicode(), 16).toUpper()).append("U, "); -// } -// } -// } -// newText.append("},\n\n").append(text); -// TextParser parser(this, { newText, EntitiesInText() }, options); + // auto text = textWithEntities.text; + // auto newText = QString(); + // newText.reserve(8 * text.size()); + // newText.append("\t{ "); + // for (const QChar *ch = text.constData(), *e = ch + text.size(); ch != e; ++ch) { + // if (*ch == TextCommand) { + // break; + // } else if (chIsNewline(*ch)) { + // newText.append("},").append(*ch).append("\t{ "); + // } else { + // if (ch->isHighSurrogate() || ch->isLowSurrogate()) { + // if (ch->isHighSurrogate() && (ch + 1 != e) && ((ch + 1)->isLowSurrogate())) { + // newText.append("0x") + // .append(QString::number((quint32(ch->unicode()) << 16) | quint32((ch + 1)->unicode()), 16) + // .toUpper()) + // .append("U, "); + // ++ch; + // } else { + // newText.append("BADx").append(QString::number(ch->unicode(), 16).toUpper()).append("U, "); + // } + // } else { + // newText.append("0x").append(QString::number(ch->unicode(), 16).toUpper()).append("U, "); + // } + // } + // } + // newText.append("},\n\n").append(text); + // TextParser parser(this, {newText, EntitiesInText()}, options); TextParser parser(this, textWithEntities, options); } diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp index 28a20b000..0046eb852 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.cpp @@ -29,10 +29,8 @@ DropdownMenu::DropdownMenu(QWidget *parent, const style::DropdownMenu &st) : Inn } // Not ready with submenus yet. -//DropdownMenu::DropdownMenu(QWidget *parent, QMenu *menu, const style::DropdownMenu &st) : InnerDropdown(parent, st.wrap) -//, _st(st) { -// _menu = setOwnedWidget(object_ptr(this, menu, _st.menu)); -// init(); +// DropdownMenu::DropdownMenu(QWidget *parent, QMenu *menu, const style::DropdownMenu &st) : InnerDropdown(parent, +// st.wrap) , _st(st) { _menu = setOwnedWidget(object_ptr(this, menu, _st.menu)); init(); // // for (auto action : actions()) { // if (auto submenu = action->menu()) { @@ -110,7 +108,7 @@ void DropdownMenu::handleTriggered(QAction *action, int actionTop, TriggeredSour // Not ready with submenus yet. bool DropdownMenu::popupSubmenuFromAction(QAction *action, int actionTop, TriggeredSource source) { - //if (auto submenu = _submenus.value(action)) { + // if (auto submenu = _submenus.value(action)) { // if (_activeSubmenu == submenu) { // submenu->hideMenu(true); // } else { @@ -121,14 +119,15 @@ bool DropdownMenu::popupSubmenuFromAction(QAction *action, int actionTop, Trigge return false; } -//void DropdownMenu::popupSubmenu(SubmenuPointer submenu, int actionTop, TriggeredSource source) { +// void DropdownMenu::popupSubmenu(SubmenuPointer submenu, int actionTop, TriggeredSource source) { // if (auto currentSubmenu = base::take(_activeSubmenu)) { // currentSubmenu->hideMenu(true); // } // if (submenu) { // auto menuTopLeft = mapFromGlobal(_menu->mapToGlobal(QPoint(0, 0))); // auto menuBottomRight = mapFromGlobal(_menu->mapToGlobal(QPoint(_menu->width(), _menu->height()))); -// QPoint p(menuTopLeft.x() + (rtl() ? (width() - menuBottomRight.x()) : menuBottomRight.x()), menuTopLeft.y() + actionTop); +// QPoint p(menuTopLeft.x() + (rtl() ? (width() - menuBottomRight.x()) : menuBottomRight.x()), +// menuTopLeft.y() + actionTop); // _activeSubmenu = submenu; // _activeSubmenu->showMenu(geometry().topLeft() + p, this, source); // @@ -228,15 +227,15 @@ void DropdownMenu::hideFinish() { } // Not ready with submenus yet. -//void DropdownMenu::deleteOnHide(bool del) { +// void DropdownMenu::deleteOnHide(bool del) { // _deleteOnHide = del; //} - -//void DropdownMenu::popup(const QPoint &p) { +// +// void DropdownMenu::popup(const QPoint &p) { // showMenu(p, nullptr, TriggeredSource::Mouse); //} // -//void DropdownMenu::showMenu(const QPoint &p, DropdownMenu *parent, TriggeredSource source) { +// void DropdownMenu::showMenu(const QPoint &p, DropdownMenu *parent, TriggeredSource source) { // _parent = parent; // // auto menuTopLeft = mapFromGlobal(_menu->mapToGlobal(QPoint(0, 0))); @@ -244,7 +243,8 @@ void DropdownMenu::hideFinish() { // auto r = Sandbox::screenGeometry(p); // if (rtl()) { // if (w.x() - width() < r.x() - _padding.left()) { -// if (_parent && w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= r.x() + r.width()) { +// if (_parent && w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= +// r.x() + r.width()) { // w.setX(w.x() + _parent->width() - _padding.left() - _padding.right()); // } else { // w.setX(r.x() - _padding.left()); @@ -254,8 +254,10 @@ void DropdownMenu::hideFinish() { // } // } else { // if (w.x() + width() - _padding.right() > r.x() + r.width()) { -// if (_parent && w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= r.x() - _padding.left()) { -// w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() + _padding.right()); +// if (_parent && w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= +// r.x() - _padding.left()) { +// w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() + +// _padding.right()); // } else { // w.setX(r.x() + r.width() - width() + _padding.right()); // }