Centralize legacy document canvas bridge
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "app_core/app_status.h"
|
||||
#include "app_core/main_toolbar.h"
|
||||
#include "app_core/tools_menu.h"
|
||||
#include "legacy_document_canvas_services.h"
|
||||
#include "legacy_history_services.h"
|
||||
#include "settings.h"
|
||||
#include "serializer.h"
|
||||
@@ -140,33 +141,6 @@ bool apply_brush_preset_plan(App& app, const std::shared_ptr<Brush>& brush)
|
||||
return status.ok();
|
||||
}
|
||||
|
||||
class LegacyDocumentCanvasClearServices final : public pp::app::DocumentCanvasClearServices {
|
||||
public:
|
||||
explicit LegacyDocumentCanvasClearServices(App& app) noexcept
|
||||
: app_(app)
|
||||
{
|
||||
}
|
||||
|
||||
void clear_current_canvas(float r, float g, float b, float a) override
|
||||
{
|
||||
if (!app_.canvas || !app_.canvas->m_canvas)
|
||||
return;
|
||||
|
||||
app_.canvas->m_canvas->clear({ r, g, b, a });
|
||||
}
|
||||
|
||||
private:
|
||||
App& app_;
|
||||
};
|
||||
|
||||
void execute_document_canvas_clear_plan(App& app, const pp::app::DocumentCanvasClearPlan& plan)
|
||||
{
|
||||
LegacyDocumentCanvasClearServices services(app);
|
||||
const auto status = pp::app::execute_document_canvas_clear_plan(plan, services);
|
||||
if (!status.ok())
|
||||
LOG("Canvas clear failed: %s", status.message);
|
||||
}
|
||||
|
||||
void execute_document_layer_merge_plan(App& app, const pp::app::DocumentLayerMergePlan& plan);
|
||||
|
||||
bool apply_document_export_menu_plan(App& app, pp::app::DocumentExportMenuKind kind)
|
||||
@@ -420,7 +394,9 @@ public:
|
||||
|
||||
void clear_canvas(const pp::app::DocumentCanvasClearPlan& plan) override
|
||||
{
|
||||
execute_document_canvas_clear_plan(app_, plan);
|
||||
const auto status = pp::panopainter::execute_legacy_document_canvas_clear_plan(app_, plan);
|
||||
if (!status.ok())
|
||||
LOG("Canvas clear failed: %s", status.message);
|
||||
}
|
||||
|
||||
void show_message_box() override
|
||||
@@ -578,7 +554,9 @@ public:
|
||||
if (!plan)
|
||||
return;
|
||||
|
||||
execute_document_canvas_clear_plan(app_, plan.value());
|
||||
const auto status = pp::panopainter::execute_legacy_document_canvas_clear_plan(app_, plan.value());
|
||||
if (!status.ok())
|
||||
LOG("Canvas clear failed: %s", status.message);
|
||||
}
|
||||
|
||||
void show_rename_dialog() override
|
||||
|
||||
Reference in New Issue
Block a user