copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Started work on drag dropping URL images

Browse source
This commit is contained in:
Yousef Khadadeh 2025-10-09 16:16:39 +03:00
parent f972fd5024
commit 32a654b731
5 changed files with 75 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/DrawingProgram/DrawingProgram.cpp
View file

@ -19,6 +19,8 @@
#include <include/core/SkSurface.h>
#include "../World.hpp"
#include "../MainProgram.hpp"
#include "Helpers/FileDownloader.hpp"
#include "Helpers/StringHelpers.hpp"
#include "LassoSelectTool.hpp"
#include <Helpers/Logger.hpp>
#include <Helpers/Parallel.hpp>
@ -362,6 +364,7 @@ void DrawingProgram::update() {
check_delayed_update_timers();
check_updateable_components();
update_downloading_dropped_files();
if(drawTool->get_type() == DrawingProgramToolType::ERASER) {
EraserTool* eraserTool = static_cast<EraserTool*>(drawTool.get());
@ -432,10 +435,59 @@ void DrawingProgram::drag_drop_update() {
add_file_to_canvas_by_path(droppedItem.droppedData, droppedItem.pos, true);
#endif
}
else if(!droppedItem.isFile && is_valid_http_url(droppedItem.droppedData)) {
auto img(std::make_shared<DrawImage>());
img->coords = world.drawData.cam.c;
img->commit_update(*this);
uint64_t placement = components.client_list().size();
auto objAdd = components.client_insert(placement, img);
img->client_send_place(*this);
add_undo_place_component(objAdd);
droppedDownloadingFiles.emplace_back(objAdd, world.main.window.size.cast<float>(), FileDownloader::download_data_from_url(droppedItem.droppedData));
Vector2f imDim = Vector2f{100.0f, 100.0f};
img->d.p1 = droppedItem.pos - imDim;
img->d.p2 = droppedItem.pos + imDim;
img->d.imageID = {0, 0};
}
}
}
}
void DrawingProgram::update_downloading_dropped_files() {
std::erase_if(droppedDownloadingFiles, [&](auto& downFile) {
switch(downFile.downData->status) {
case FileDownloader::DownloadData::Status::SUCCESS: {
std::shared_ptr<DrawImage> img = std::static_pointer_cast<DrawImage>(downFile.comp->obj);
Vector2f dropPos = (img->d.p1 + img->d.p2) * 0.5f;
ResourceData newResource;
newResource.data = std::make_shared<std::string>(downFile.downData->str);
newResource.name = "downloaded file";
ServerClientID imageID = world.rMan.add_resource(newResource);
std::shared_ptr<ResourceDisplay> display = world.rMan.get_display_data(imageID);
Vector2f imTrueDim = display->get_dimensions();
float imWidth = imTrueDim.x() / (imTrueDim.x() + imTrueDim.y());
float imHeight = imTrueDim.y() / (imTrueDim.x() + imTrueDim.y());
Vector2f imDim = Vector2f{downFile.windowSizeWhenDropped.x() * imWidth, downFile.windowSizeWhenDropped.x() * imHeight} * display->get_dimension_scale();
img->d.p1 = dropPos - imDim;
img->d.p2 = dropPos + imDim;
img->d.imageID = imageID;
img->commit_update(*this);
img->client_send_update(*this, true);
return true;
}
case FileDownloader::DownloadData::Status::FAILURE:
client_erase_set({downFile.comp});
return true;
case FileDownloader::DownloadData::Status::IN_PROGRESS:
return false;
}
return false;
});
}
void DrawingProgram::add_file_to_canvas_by_path(const std::string& filePath, Vector2f dropPos, bool addInSameThread) {
if(addInSameThread)
add_file_to_canvas_by_path_execute(filePath, dropPos);

10
src/DrawingProgram/DrawingProgram.hpp
View file

@ -15,6 +15,7 @@
#include "DrawingProgramSelection.hpp"
#include "../CollabList.hpp"
#include "DrawingProgramToolBase.hpp"
#include <Helpers/FileDownloader.hpp>
class World;
@ -120,6 +121,15 @@ class DrawingProgram {
std::unique_ptr<DrawingProgramToolBase> drawTool;
uint32_t nextID = 0;
struct DroppedDownloadingFile {
CollabListType::ObjectInfoPtr comp;
Vector2f windowSizeWhenDropped;
std::shared_ptr<FileDownloader::DownloadData> downData;
};
std::vector<DroppedDownloadingFile> droppedDownloadingFiles;
void update_downloading_dropped_files();
friend class EyeDropperTool;
friend class RectDrawTool;