leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix drag selecting from empty area in grid view

Browse source 
This seems to have been broken by the latest libcosmic update.
This commit is contained in:
Jason Rodney Hansen 2024-05-30 18:36:57 -06:00 • committed by Jeremy Soller
parent 53b9336b2d
commit 077c30b7e4
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tab.rs
View file

@ -1933,6 +1933,8 @@ impl Tab {
let mut drag_e_i = 0; let mut drag_e_i = 0;
let mut drag_s_i = 0; let mut drag_s_i = 0;
let mut children = Vec::new();
if let Some(items) = self.column_sort() { if let Some(items) = self.column_sort() {
let mut count = 0; let mut count = 0;
let mut col = 0; let mut col = 0;
@ -2063,6 +2065,8 @@ impl Tab {
return (None, self.empty_view(hidden > 0), false); return (None, self.empty_view(hidden > 0), false);
} }
children.push(grid.into());
//TODO: HACK If we don't reach the bottom of the view, go ahead and add a spacer to do that //TODO: HACK If we don't reach the bottom of the view, go ahead and add a spacer to do that
{ {
let mut max_bottom = 0; let mut max_bottom = 0;
@ -2078,10 +2082,10 @@ impl Tab {
.checked_sub(max_bottom + 2 * (space_xxs as usize)) .checked_sub(max_bottom + 2 * (space_xxs as usize))
.unwrap_or(0); .unwrap_or(0);
if spacer_height > 0 { if spacer_height > 0 {
if col != 0 { children.push(
grid = grid.insert_row(); widget::container(vertical_space(Length::Fixed(spacer_height as f32)))
} .into(),
grid = grid.push(widget::vertical_space(Length::Fixed(spacer_height as f32))); )
} }
} }
} }
@ -2138,7 +2142,7 @@ impl Tab {
Element::from(dnd_grid) Element::from(dnd_grid)
.map(|m| cosmic::app::Message::App(crate::app::Message::TabMessage(None, m))) .map(|m| cosmic::app::Message::App(crate::app::Message::TabMessage(None, m)))
}), }),
mouse_area::MouseArea::new(grid) mouse_area::MouseArea::new(widget::column::with_children(children))
.on_press(|_| Message::Click(None)) .on_press(|_| Message::Click(None))
.on_drag(Message::Drag) .on_drag(Message::Drag)
.on_drag_end(|_| Message::DragEnd(None)) .on_drag_end(|_| Message::DragEnd(None))