procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Replaced callback for box showing with dedicated class in photo editor.

Browse source
This commit is contained in:
23rd 2022-12-15 22:54:58 +03:00 committed by John Preston
parent 4518067f9c
commit a3a48a38c8
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/editor/controllers/controllers.h
View file

@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "editor/controllers/stickers_panel_controller.h"
#include "editor/controllers/undo_controller.h"
#include "ui/layers/box_content.h"
#include "ui/layers/show.h"
namespace Editor {
@ -17,17 +17,17 @@ struct Controllers final {
Controllers(
std::unique_ptr<StickersPanelController> stickersPanelController,
std::unique_ptr<UndoController> undoController,
Fn<void(object_ptr<Ui::BoxContent>)> showBox)
std::shared_ptr<Ui::Show> show)
: stickersPanelController(std::move(stickersPanelController))
, undoController(std::move(undoController))
, showBox(std::move(showBox)) {
, show(std::move(show)) {
}
~Controllers() {
};
const std::unique_ptr<StickersPanelController> stickersPanelController;
const std::unique_ptr<UndoController> undoController;
const Fn<void(object_ptr<Ui::BoxContent>)> showBox;
const std::shared_ptr<Ui::Show> show;
};
} // namespace Editor

2
Telegram/SourceFiles/editor/editor_paint.cpp
View file

@ -190,7 +190,7 @@ void Paint::handleMimeData(const QMimeData *data) {
return;
}
if (!Ui::ValidateThumbDimensions(image.width(), image.height())) {
_controllers->showBox(
_controllers->show->showBox(
Ui::MakeInformBox(tr::lng_edit_media_invalid_file()));
return;
}

3
Telegram/SourceFiles/editor/photo_editor.cpp
View file

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "editor/photo_editor_content.h"
#include "editor/photo_editor_controls.h"
#include "window/window_controller.h"
#include "window/window_session_controller.h"
#include "styles/style_editor.h"
namespace Editor {
@ -59,7 +60,7 @@ PhotoEditor::PhotoEditor(
controller->sessionController())
: nullptr,
std::make_unique<UndoController>(),
[=] (object_ptr<Ui::BoxContent> c) { controller->show(std::move(c)); }))
std::make_shared<Window::Show>(controller)))
, _content(base::make_unique_q<PhotoEditorContent>(
this,
photo,

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 4befce5a29d247fb17da3faafebb03578c5a989b
Subproject commit b178a5d15f4e422f4497e9c0334fe340df9d6046