Fix tests and compile error for Wayland feat
Also fixes a deprecation error.
This commit is contained in:
parent
28b4dda7e0
commit
64a4cd4cf9
2 changed files with 3 additions and 7 deletions
|
|
@ -2991,7 +2991,7 @@ impl Application for App {
|
||||||
};
|
};
|
||||||
|
|
||||||
let (entity, command) = self.open_tab_entity(
|
let (entity, command) = self.open_tab_entity(
|
||||||
Location::Desktop(crate::desktop_dir(), display),
|
Location::Desktop(crate::desktop_dir(), display, self.config.desktop),
|
||||||
false,
|
false,
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
|
@ -4217,11 +4217,7 @@ pub(crate) mod test_utils {
|
||||||
|
|
||||||
// New tab with items
|
// New tab with items
|
||||||
let location = Location::Path(path.to_owned());
|
let location = Location::Path(path.to_owned());
|
||||||
let items = location.scan(
|
let items = location.scan(IconSizes::default());
|
||||||
DesktopConfig::default(),
|
|
||||||
Mounters::new(MounterMap::new()),
|
|
||||||
IconSizes::default(),
|
|
||||||
);
|
|
||||||
let mut tab = Tab::new(location, TabConfig::default());
|
let mut tab = Tab::new(location, TabConfig::default());
|
||||||
tab.set_items(items);
|
tab.set_items(items);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ impl Display for FormatTime {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
let date_time = chrono::DateTime::<chrono::Local>::from(self.0);
|
let date_time = chrono::DateTime::<chrono::Local>::from(self.0);
|
||||||
let now = chrono::Local::now();
|
let now = chrono::Local::now();
|
||||||
if date_time.date() == now.date() {
|
if date_time.date_naive() == now.date_naive() {
|
||||||
write!(
|
write!(
|
||||||
f,
|
f,
|
||||||
"{}, {}",
|
"{}, {}",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue