lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

window: Use custom overlay visual for drop target

Browse source 
Closes #59

Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/258>
This commit is contained in:
FineFindus 2023-06-25 21:13:56 +02:00 • committed by Sophie Herold
parent 3111efdd94
commit 78b16518e5
6 changed files with 171 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/window.rs
View file

@ -35,7 +35,7 @@ use std::path::{Path, PathBuf};
use crate::config;
use crate::util::{self, Direction, Position};
use crate::widgets::{LpImage, LpImageView, LpPropertiesView};
use crate::widgets::{LpDragOverlay, LpImage, LpImageView, LpPropertiesView};
/// Show window after X milliseconds even if image dimensions are not known yet
const SHOW_WINDOW_AFTER: u64 = 2000;
@ -90,10 +90,9 @@ mod imp {
pub(super) properties_view: TemplateChild<LpPropertiesView>,
#[template_child]
pub(super) drop_area_overlay: TemplateChild<gtk::Overlay>,
pub(super) drag_overlay: TemplateChild<LpDragOverlay>,
#[template_child]
pub(super) drop_target: TemplateChild<gtk::DropTarget>,
pub(super) drop_area_highlight_widget: OnceCell<gtk::Widget>,
#[template_child]
pub(super) forward_click_gesture: TemplateChild<gtk::GestureClick>,
@ -378,40 +377,32 @@ mod imp {
self.drop_target.set_types(&[gdk::FileList::static_type()]);
// # Drag and drop stuff ---
// - Define widget used as a visual cue for users trying to drag-n-drop
self.drop_area_highlight_widget.set({
const MARGIN: i32 = 24;
gtk::Box::builder()
.margin_top(MARGIN).margin_bottom(MARGIN).margin_start(MARGIN).margin_end(MARGIN)
.css_classes(["lp-dragging-area-highlight"])
.can_target(false)
.build()
.upcast() // Upcasting to fit into the required `gtk::Widget` type
}).expect("Drop area highlight widget was defined twice");
// - Adds the widget on drag enter
self.drop_target.connect_enter(
clone!(@weak obj => @default-return gdk::DragAction::COPY, move |_drop_target, _x, _y| {
obj.toggle_drop_area_highlight(true);
gdk::DragAction::COPY
})
//only accept drops from out side the app
//https://gitlab.gnome.org/GNOME/Incubator/loupe/-/merge_requests/244#note_1788260
self.drop_target.connect_accept(
clone!(@weak obj => @default-return false, move |_drop_target, drop| {
//drag is between Loupe windows
if let Some(drop) = drop.drag() {
let file = drop
.content()
.value(gdk::FileList::static_type())
.ok()
.and_then(|value| value.get::<gdk::FileList>().ok())
.and_then(|files| files.files().first().and_then(|file| file.path()));
let current_image = obj.image_view().current_file().and_then(|file| file.path());
return file.ne(&current_image);
}
//drag from another window, should always be accepted
true
}),
);
// - Removes the widget on drag leave
self.drop_target.connect_leave(clone!(@weak obj => move |_drop_target| {
obj.toggle_drop_area_highlight(false);
}));
// For callbacks, you will want to reference the GTK docs on
// the relevant signal to see which parameters you need.
// In this case, we need only need the GValue,
// so we name it `value` then use `_` for the other spots.
self.drop_target.connect_drop(
clone!(@weak obj => @default-return false, move |_, value, _, _| {
// - Removes the widget on drag completion
obj.toggle_drop_area_highlight(false);
// Here we use a GValue, which is a dynamic object that can hold different types,
// e.g. strings, numbers, or in this case objects. In order to get the GdkFileList
@ -441,6 +432,7 @@ mod imp {
true
}),
);
self.drag_overlay.set_drop_target(&*self.drop_target);
}
}
@ -949,36 +941,6 @@ impl LpWindow {
&& (!self.is_headerbar_flat() || !self.imp().headerbar_events.contains_pointer())
}
/// Displays visual feedback for users trying to drag and drop
fn toggle_drop_area_highlight(&self, display: bool) {
let overlay = &self.imp().drop_area_overlay;
let widget = self.imp().drop_area_highlight_widget.get()
.expect("`drop_area_highlight_widget` needs to be defined before being toggled");
// Create fade in animation. Will be reversed to make a fade-out.
let animation = adw::TimedAnimation::new(
widget, 0.0, 1.0, 250, adw::PropertyAnimationTarget::new(widget, "opacity")
);
if display && widget.parent().is_none() {
// Overlay widget
overlay.add_overlay(widget);
// Hide controls to avoid messy superpositions
self.hide_controls()
} else if !display && widget.parent().is_some() {
// Reverse the fade-in animation
animation.set_reverse(true);
// Remove overlay after animation end
animation.connect_done(|animation| {
let widget = animation.widget();
let overlay = widget.parent().and_downcast::<gtk::Overlay>().unwrap();
overlay.remove_overlay(&widget);
});
};
animation.play();
}
#[template_callback]
fn on_fullscreened(&self) {
if !self.is_fullscreened() {