Merge: master at 0.13.6, with the drag-ghost file and the shared model lookup ported into the split modules
This commit is contained in:
@@ -19,7 +19,10 @@ use crate::library;
|
||||
use crate::{AppWindow, Collections};
|
||||
|
||||
use super::controller::{decide_drop, CollectionsController, Drop};
|
||||
use super::drag::{arm_hold, arm_spring, collapse_spring_opened, compose_drag_image};
|
||||
use super::drag::{
|
||||
arm_hold, arm_spring, collapse_spring_opened, compose_drag_image, drag_image_via_file,
|
||||
forget_drag_image_file,
|
||||
};
|
||||
use super::press::select_row;
|
||||
use super::rename_menu::unique_name;
|
||||
use super::trash::{drain_trash, start_restore, start_trash};
|
||||
@@ -603,7 +606,7 @@ fn wire_drag(
|
||||
.map(|c| c.thumbnail)
|
||||
.collect()
|
||||
};
|
||||
w.set_library_drag_image(compose_drag_image(&thumbs));
|
||||
w.set_library_drag_image(drag_image_via_file(compose_drag_image(&thumbs)));
|
||||
|
||||
*ctl.dragging.borrow_mut() = carried.clone();
|
||||
sync_selection(&w, &ctl, &ids);
|
||||
@@ -763,6 +766,7 @@ fn wire_drag(
|
||||
// released — it holds a copy of every thumbnail it composited.
|
||||
sync_lifted(&w, &[], &visible());
|
||||
w.set_library_drag_image(slint::Image::default());
|
||||
forget_drag_image_file();
|
||||
|
||||
if landed.is_some() {
|
||||
let borrow = catalog.borrow();
|
||||
|
||||
Reference in New Issue
Block a user