Take the row run, and catch the makeover-webview pin up
quasi's `Row` is an inline run as of quasi@c80e473, so the three sites that
pushed onto `row.actions` chain `act` instead and the one that read
`row.primary` calls it.
The pins were the reason the workspace did not build at all: quasi-webview
moved to makeover-webview 0.32.0 when `.link` was published, and that crate
carries `links`, so two versions in one graph is a resolver error rather than
a warning. makeover-build goes to 0.25.0 with it.
4 files changed,
+14 insertions,
-18 deletions
| 3398 |
3398 |
|
|
| 3399 |
3399 |
|
[[package]]
|
| 3400 |
3400 |
|
name = "makeover-build"
|
| 3401 |
|
- |
version = "0.24.0"
|
|
3401 |
+ |
version = "0.25.0"
|
| 3402 |
3402 |
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 3403 |
|
- |
checksum = "12bcb5bc04026df9a5f4007e2a0f17ed34d8671573ea6445b4d17d7f44280d69"
|
|
3403 |
+ |
checksum = "82681b81f022c342cb764142eb2475430d882e132aa143c6c7fc6871c492e4f8"
|
| 3404 |
3404 |
|
dependencies = [
|
| 3405 |
3405 |
|
"makeover",
|
| 3406 |
3406 |
|
"makeover-geometry",
|
| 3442 |
3442 |
|
|
| 3443 |
3443 |
|
[[package]]
|
| 3444 |
3444 |
|
name = "makeover-webview"
|
| 3445 |
|
- |
version = "0.31.0"
|
|
3445 |
+ |
version = "0.32.0"
|
| 3446 |
3446 |
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 3447 |
|
- |
checksum = "f9f97c1694d50160ed5c980a17c96b1c8d007dbdb2d6b9472a2a5270e28cb4fd"
|
|
3447 |
+ |
checksum = "9ccc45dfb72ca709785ced43eb8b30644df0ef59a618aca9fc6c6ab8553c77de"
|
| 3448 |
3448 |
|
dependencies = [
|
| 3449 |
3449 |
|
"makeover-geometry",
|
| 3450 |
3450 |
|
"makeover-layout",
|
| 18 |
18 |
|
# Materialises all three generated files: themes/, geometry.css, layout.css,
|
| 19 |
19 |
|
# and holds both drift checks this build.rs used to carry itself: touch density
|
| 20 |
20 |
|
# as of 0.17, breakpoints as of 0.18.
|
| 21 |
|
- |
makeover-build = "0.24.0"
|
|
21 |
+ |
makeover-build = "0.25.0"
|
| 22 |
22 |
|
# The table CSS is generated here too: the columns are this app's, so the
|
| 23 |
23 |
|
# shared helper cannot know them, but the tracks and the narrowing rules come
|
| 24 |
24 |
|
# from the description rather than from hand-written nth-child cuts.
|
| 25 |
|
- |
makeover-webview = "0.31.0"
|
|
25 |
+ |
makeover-webview = "0.32.0"
|
| 26 |
26 |
|
makeover-layout = "0.16.0"
|
| 27 |
27 |
|
# Width. Direct rather than through makeover-webview, because the narrow table
|
| 28 |
28 |
|
# pass keys off SizeClass::Compact and a boundary reached transitively is a
|
| 112 |
112 |
|
# The forms emitter and the description it renders. Runtime deps, not build:
|
| 113 |
113 |
|
# form markup depends on the value, the error and the options at the moment a
|
| 114 |
114 |
|
# modal opens, so it cannot be materialised the way the stylesheet is.
|
| 115 |
|
- |
makeover-webview = "0.31.0"
|
|
115 |
+ |
makeover-webview = "0.32.0"
|
| 116 |
116 |
|
makeover-layout = "0.16.0"
|
| 117 |
117 |
|
# Browser opening
|
| 118 |
118 |
|
open = { workspace = true }
|
| 261 |
261 |
|
// The address is a place to go rather than a fact about the entry, so it is
|
| 262 |
262 |
|
// a control and not trailing text.
|
| 263 |
263 |
|
if let Some(url) = url {
|
| 264 |
|
- |
row.actions.push(Act::new("Open", Action::external(url)));
|
|
264 |
+ |
row = row.act(Act::new("Open", Action::external(url)));
|
| 265 |
265 |
|
}
|
| 266 |
266 |
|
|
| 267 |
|
- |
row.actions
|
| 268 |
|
- |
.push(Act::new("Remove", remove).tone(makeover_layout::Tone::Danger));
|
| 269 |
|
- |
row
|
|
267 |
+ |
row.act(Act::new("Remove", remove).tone(makeover_layout::Tone::Danger))
|
| 270 |
268 |
|
}
|
| 271 |
269 |
|
|
| 272 |
270 |
|
/// A sub-collection as a titled list, or a line saying it is empty.
|
| 328 |
326 |
|
if !meta.is_empty() {
|
| 329 |
327 |
|
row = row.meta(meta);
|
| 330 |
328 |
|
}
|
| 331 |
|
- |
row.actions.push(
|
|
329 |
+ |
row.act(
|
| 332 |
330 |
|
Act::new(
|
| 333 |
331 |
|
"Remove",
|
| 334 |
332 |
|
Action::post(format!("/contacts/{id}/email/{}/delete", email.id)),
|
| 335 |
333 |
|
)
|
| 336 |
334 |
|
.tone(makeover_layout::Tone::Danger),
|
| 337 |
|
- |
);
|
| 338 |
|
- |
row
|
|
335 |
+ |
)
|
| 339 |
336 |
|
})
|
| 340 |
337 |
|
.collect();
|
| 341 |
338 |
|
|
| 354 |
351 |
|
if !meta.is_empty() {
|
| 355 |
352 |
|
row = row.meta(meta);
|
| 356 |
353 |
|
}
|
| 357 |
|
- |
row.actions.push(
|
|
354 |
+ |
row.act(
|
| 358 |
355 |
|
Act::new(
|
| 359 |
356 |
|
"Remove",
|
| 360 |
357 |
|
Action::post(format!("/contacts/{id}/phone/{}/delete", phone.id)),
|
| 361 |
358 |
|
)
|
| 362 |
359 |
|
.tone(makeover_layout::Tone::Danger),
|
| 363 |
|
- |
);
|
| 364 |
|
- |
row
|
|
360 |
+ |
)
|
| 365 |
361 |
|
})
|
| 366 |
362 |
|
.collect();
|
| 367 |
363 |
|
|
| 238 |
238 |
|
));
|
| 239 |
239 |
|
|
| 240 |
240 |
|
assert_eq!(listed.len(), 1);
|
| 241 |
|
- |
assert_eq!(listed[0].primary, "Filed away");
|
|
241 |
+ |
assert_eq!(listed[0].primary(), "Filed away");
|
| 242 |
242 |
|
|
| 243 |
243 |
|
// Opening it stays in the folder, and so does everything the row offers.
|
| 244 |
244 |
|
// A control that dropped the filter is a view you fall out of by using it.
|