R4.13: round 1 fixes; app language leads Han layout
- ely-ui passes its resolved locale to Windows text layout, so Chinese UI lays out as Chinese whatever the Windows region. - Component a4bf696: Find box, sort and filter builders and password tooltips read the catalog; stricter shipped-copy scan. - ElyMark deletes the right-clicked picture (delete_image(at)). Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
b714024d2b
commit
45ac9c6ec4
12 files changed
+81
-20
No files matched your search
@@ -46,8 +46,7 @@ actions!(
|
||||
Hyperlink,
|
||||
InsertImage,
|
||||
ClearFormat,
|
||||
DeleteBlock,
|
||||
DeleteImage
|
||||
DeleteBlock
|
||||
]
|
||||
);
|
||||
|
||||
@@ -230,7 +229,6 @@ impl Desk {
|
||||
InsertImage => |d, cx| d.format(F::Image, cx),
|
||||
ClearFormat => |d, cx| d.format(F::Clear, cx),
|
||||
DeleteBlock => |d, cx| d.block(B::Delete, cx),
|
||||
DeleteImage => |d, cx| d.delete_image(cx),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,16 +90,14 @@ impl MarkView {
|
||||
true => "mark.image.browser",
|
||||
false => "mark.image.location",
|
||||
};
|
||||
let view = view.clone();
|
||||
let (shown, dropped, at) = (view.clone(), view.clone(), target.at);
|
||||
rows =
|
||||
rows.row(MenuItem::new(said(key, cx)).on_click(move |_, cx| {
|
||||
view.update(cx, |view, cx| view.show_picture(&url, cx))
|
||||
shown.update(cx, |view, cx| view.show_picture(&url, cx))
|
||||
}))
|
||||
.row(MenuItem::new(said("mark.image.delete", cx)).on_click(move |_, cx| {
|
||||
dropped.update(cx, |view, cx| view.delete_image(at, cx))
|
||||
}))
|
||||
.row(run(
|
||||
said("mark.image.delete", cx),
|
||||
Box::new(b::DeleteImage),
|
||||
window,
|
||||
))
|
||||
.line();
|
||||
}
|
||||
if let Some(url) = &target.link {
|
||||
@@ -162,6 +160,14 @@ impl MarkView {
|
||||
rows.menu()
|
||||
}
|
||||
|
||||
/// Deletes the picture at byte `at`, or says why not.
|
||||
fn delete_image(&mut self, at: usize, cx: &mut Context<Self>) {
|
||||
let deleted = (self.document).update(cx, |document, cx| document.delete_image(at, cx));
|
||||
if let Err(why) = deleted {
|
||||
cx.emit(super::Refused(why));
|
||||
}
|
||||
}
|
||||
|
||||
/// Shows a local picture's file, or opens a web one.
|
||||
fn show_picture(&mut self, url: &str, cx: &mut Context<Self>) {
|
||||
if web(url) {
|
||||
|
||||
Reference in new issue
Block a user