2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00

Use layers and boxes from lib_ui.

This commit is contained in:
John Preston
2019-09-18 14:19:05 +03:00
parent 860353824b
commit a6c84c36c0
209 changed files with 586 additions and 3349 deletions

View File

@@ -16,7 +16,6 @@ class MainWindow;
class MainWidget;
class FileUploader;
class Translator;
class BoxContent;
namespace Storage {
class Databases;
@@ -43,6 +42,7 @@ namespace Ui {
namespace Animations {
class Manager;
} // namespace Animations
class BoxContent;
} // namespace Ui
namespace MTP {
@@ -273,7 +273,7 @@ private:
const std::unique_ptr<ChatHelpers::EmojiKeywords> _emojiKeywords;
std::unique_ptr<Lang::Translator> _translator;
base::Observable<void> _passcodedChanged;
QPointer<BoxContent> _badProxyDisableBox;
QPointer<Ui::BoxContent> _badProxyDisableBox;
const std::unique_ptr<Media::Audio::Instance> _audio;
const QImage _logo;

View File

@@ -58,7 +58,7 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
tr::lng_open_this_link(tr::now) + qsl("\n\n") + displayUrl,
tr::lng_open_link(tr::now),
[=] { Ui::hideLayer(); open(); }),
LayerOption::KeepOther);
Ui::LayerOption::KeepOther);
} else {
open();
}

View File

@@ -341,7 +341,7 @@ bool HandleUnknown(
Api::EntitiesFromMTP(result.ventities().value_or_empty())
};
if (result.is_update_app()) {
const auto box = std::make_shared<QPointer<BoxContent>>();
const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
const auto callback = [=] {
Core::UpdateApplication();
if (*box) (*box)->closeBox();

View File

@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "info/settings/info_settings_widget.h"
#include "window/window_session_controller.h"
#include "settings/settings_intro.h"
#include "ui/layers/box_content.h"
#include "app.h"
#include <QtCore/QJsonDocument>