mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-27 12:17:24 +01:00
editor: Implement drag and drop where it makes sense
This commit is contained in:
parent
a13e406e99
commit
e47b7c2006
31 changed files with 888 additions and 87 deletions
|
|
@ -1,12 +1,15 @@
|
|||
use std::cell::{OnceCell, RefCell};
|
||||
|
||||
use adw::{prelude::*, subclass::prelude::*};
|
||||
use gtk::glib::{self, clone, subclass::Signal, Properties};
|
||||
use gtk::{
|
||||
gdk,
|
||||
glib::{self, clone, subclass::Signal, Properties},
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::{
|
||||
db::models::Composer, editor::role::RoleEditor, library::Library,
|
||||
selector::role::RoleSelectorPopover,
|
||||
selector::role::RoleSelectorPopover, util::drag_widget::DragWidget,
|
||||
};
|
||||
|
||||
mod imp {
|
||||
|
|
@ -50,8 +53,14 @@ mod imp {
|
|||
#[glib::derived_properties]
|
||||
impl ObjectImpl for WorkEditorComposerRow {
|
||||
fn signals() -> &'static [Signal] {
|
||||
static SIGNALS: Lazy<Vec<Signal>> =
|
||||
Lazy::new(|| vec![Signal::builder("remove").build()]);
|
||||
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
|
||||
vec![
|
||||
Signal::builder("remove").build(),
|
||||
Signal::builder("move")
|
||||
.param_types([super::WorkEditorComposerRow::static_type()])
|
||||
.build(),
|
||||
]
|
||||
});
|
||||
|
||||
SIGNALS.as_ref()
|
||||
}
|
||||
|
|
@ -59,6 +68,44 @@ mod imp {
|
|||
fn constructed(&self) {
|
||||
self.parent_constructed();
|
||||
|
||||
let drag_source = gtk::DragSource::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.content(&gdk::ContentProvider::for_value(&self.obj().to_value()))
|
||||
.build();
|
||||
|
||||
drag_source.connect_drag_begin(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
move |_, drag| {
|
||||
let icon = gtk::DragIcon::for_drag(drag);
|
||||
icon.set_child(Some(&DragWidget::new(&obj)));
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drag_source);
|
||||
|
||||
let drop_target = gtk::DropTarget::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.build();
|
||||
drop_target.set_types(&[Self::Type::static_type()]);
|
||||
|
||||
drop_target.connect_drop(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
#[upgrade_or]
|
||||
false,
|
||||
move |_, value, _, _| {
|
||||
if let Ok(row) = value.get::<Self::Type>() {
|
||||
obj.emit_by_name::<()>("move", &[&row]);
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drop_target);
|
||||
|
||||
let role_popover = RoleSelectorPopover::new(self.library.get().unwrap());
|
||||
|
||||
let obj = self.obj().to_owned();
|
||||
|
|
@ -114,6 +161,15 @@ impl WorkEditorComposerRow {
|
|||
obj
|
||||
}
|
||||
|
||||
pub fn connect_move<F: Fn(&Self, Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("move", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
let source = values[1].get::<Self>().unwrap();
|
||||
f(&obj, source);
|
||||
None
|
||||
})
|
||||
}
|
||||
|
||||
pub fn connect_remove<F: Fn(&Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("remove", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
|
|
|
|||
139
src/editor/work/instrument_row.rs
Normal file
139
src/editor/work/instrument_row.rs
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
use std::cell::OnceCell;
|
||||
|
||||
use adw::{prelude::*, subclass::prelude::*};
|
||||
use gtk::{
|
||||
gdk,
|
||||
glib::{self, clone, subclass::Signal},
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::{db::models::Instrument, util::drag_widget::DragWidget};
|
||||
|
||||
mod imp {
|
||||
use super::*;
|
||||
|
||||
#[derive(Debug, Default, gtk::CompositeTemplate)]
|
||||
#[template(file = "data/ui/editor/work/instrument_row.blp")]
|
||||
pub struct InstrumentRow {
|
||||
pub instrument: OnceCell<Instrument>,
|
||||
}
|
||||
|
||||
#[glib::object_subclass]
|
||||
impl ObjectSubclass for InstrumentRow {
|
||||
const NAME: &'static str = "MusicusWorkEditorInstrumentRow";
|
||||
type Type = super::InstrumentRow;
|
||||
type ParentType = adw::ActionRow;
|
||||
|
||||
fn class_init(klass: &mut Self::Class) {
|
||||
klass.bind_template();
|
||||
klass.bind_template_instance_callbacks();
|
||||
}
|
||||
|
||||
fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
|
||||
obj.init_template();
|
||||
}
|
||||
}
|
||||
|
||||
impl ObjectImpl for InstrumentRow {
|
||||
fn signals() -> &'static [Signal] {
|
||||
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
|
||||
vec![
|
||||
Signal::builder("remove").build(),
|
||||
Signal::builder("move")
|
||||
.param_types([super::InstrumentRow::static_type()])
|
||||
.build(),
|
||||
]
|
||||
});
|
||||
|
||||
SIGNALS.as_ref()
|
||||
}
|
||||
|
||||
fn constructed(&self) {
|
||||
self.parent_constructed();
|
||||
|
||||
let drag_source = gtk::DragSource::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.content(&gdk::ContentProvider::for_value(&self.obj().to_value()))
|
||||
.build();
|
||||
|
||||
drag_source.connect_drag_begin(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
move |_, drag| {
|
||||
let icon = gtk::DragIcon::for_drag(drag);
|
||||
icon.set_child(Some(&DragWidget::new(&obj)));
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drag_source);
|
||||
|
||||
let drop_target = gtk::DropTarget::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.build();
|
||||
drop_target.set_types(&[Self::Type::static_type()]);
|
||||
|
||||
drop_target.connect_drop(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
#[upgrade_or]
|
||||
false,
|
||||
move |_, value, _, _| {
|
||||
if let Ok(row) = value.get::<Self::Type>() {
|
||||
obj.emit_by_name::<()>("move", &[&row]);
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drop_target);
|
||||
}
|
||||
}
|
||||
|
||||
impl WidgetImpl for InstrumentRow {}
|
||||
impl ListBoxRowImpl for InstrumentRow {}
|
||||
impl PreferencesRowImpl for InstrumentRow {}
|
||||
impl ActionRowImpl for InstrumentRow {}
|
||||
}
|
||||
|
||||
glib::wrapper! {
|
||||
pub struct InstrumentRow(ObjectSubclass<imp::InstrumentRow>)
|
||||
@extends gtk::Widget, gtk::ListBoxRow, adw::PreferencesRow, adw::ActionRow;
|
||||
}
|
||||
|
||||
#[gtk::template_callbacks]
|
||||
impl InstrumentRow {
|
||||
pub fn new(instrument: Instrument) -> Self {
|
||||
let obj: Self = glib::Object::new();
|
||||
obj.set_title(&instrument.to_string());
|
||||
obj.imp().instrument.set(instrument).unwrap();
|
||||
obj
|
||||
}
|
||||
|
||||
pub fn connect_move<F: Fn(&Self, Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("move", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
let source = values[1].get::<Self>().unwrap();
|
||||
f(&obj, source);
|
||||
None
|
||||
})
|
||||
}
|
||||
|
||||
pub fn connect_remove<F: Fn(&Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("remove", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
f(&obj);
|
||||
None
|
||||
})
|
||||
}
|
||||
|
||||
pub fn instrument(&self) -> Instrument {
|
||||
self.imp().instrument.get().unwrap().clone()
|
||||
}
|
||||
|
||||
#[template_callback]
|
||||
fn remove(&self) {
|
||||
self.emit_by_name::<()>("remove", &[]);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,17 @@
|
|||
use std::cell::{OnceCell, RefCell};
|
||||
|
||||
use adw::{prelude::*, subclass::prelude::*};
|
||||
use gtk::glib::{self, clone, subclass::Signal, Properties};
|
||||
use gtk::{
|
||||
gdk,
|
||||
glib::{self, clone, subclass::Signal, Properties},
|
||||
};
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::{db::models::Work, editor::work::WorkEditor, library::Library};
|
||||
use crate::{
|
||||
db::models::Work, editor::work::WorkEditor, library::Library, util::drag_widget::DragWidget,
|
||||
};
|
||||
|
||||
mod imp {
|
||||
|
||||
use super::*;
|
||||
|
||||
#[derive(Properties, Debug, Default, gtk::CompositeTemplate)]
|
||||
|
|
@ -42,11 +46,59 @@ mod imp {
|
|||
#[glib::derived_properties]
|
||||
impl ObjectImpl for WorkEditorPartRow {
|
||||
fn signals() -> &'static [Signal] {
|
||||
static SIGNALS: Lazy<Vec<Signal>> =
|
||||
Lazy::new(|| vec![Signal::builder("remove").build()]);
|
||||
static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
|
||||
vec![
|
||||
Signal::builder("remove").build(),
|
||||
Signal::builder("move")
|
||||
.param_types([super::WorkEditorPartRow::static_type()])
|
||||
.build(),
|
||||
]
|
||||
});
|
||||
|
||||
SIGNALS.as_ref()
|
||||
}
|
||||
|
||||
fn constructed(&self) {
|
||||
self.parent_constructed();
|
||||
|
||||
let drag_source = gtk::DragSource::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.content(&gdk::ContentProvider::for_value(&self.obj().to_value()))
|
||||
.build();
|
||||
|
||||
drag_source.connect_drag_begin(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
move |_, drag| {
|
||||
let icon = gtk::DragIcon::for_drag(drag);
|
||||
icon.set_child(Some(&DragWidget::new(&obj)));
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drag_source);
|
||||
|
||||
let drop_target = gtk::DropTarget::builder()
|
||||
.actions(gdk::DragAction::MOVE)
|
||||
.build();
|
||||
drop_target.set_types(&[Self::Type::static_type()]);
|
||||
|
||||
drop_target.connect_drop(clone!(
|
||||
#[weak(rename_to = obj)]
|
||||
self.obj(),
|
||||
#[upgrade_or]
|
||||
false,
|
||||
move |_, value, _, _| {
|
||||
if let Ok(row) = value.get::<Self::Type>() {
|
||||
obj.emit_by_name::<()>("move", &[&row]);
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
));
|
||||
|
||||
self.obj().add_controller(drop_target);
|
||||
}
|
||||
}
|
||||
|
||||
impl WidgetImpl for WorkEditorPartRow {}
|
||||
|
|
@ -71,6 +123,15 @@ impl WorkEditorPartRow {
|
|||
obj
|
||||
}
|
||||
|
||||
pub fn connect_move<F: Fn(&Self, Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("move", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
let source = values[1].get::<Self>().unwrap();
|
||||
f(&obj, source);
|
||||
None
|
||||
})
|
||||
}
|
||||
|
||||
pub fn connect_remove<F: Fn(&Self) + 'static>(&self, f: F) -> glib::SignalHandlerId {
|
||||
self.connect_local("remove", true, move |values| {
|
||||
let obj = values[0].get::<Self>().unwrap();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue