diff --git a/.github/ISSUE_TEMPLATE/email-rendering.yml b/.github/ISSUE_TEMPLATE/email-rendering.yml
new file mode 100644
index 00000000..b614e035
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/email-rendering.yml
@@ -0,0 +1,42 @@
+name: Email rendering issue
+description: An email looks wrong or part of it doesn't work in Flectar Mail.
+body:
+ - type: textarea
+ id: problem
+ attributes:
+ label: What looks wrong?
+ description: >-
+ Describe what's missing, broken or not working. A screenshot helps, and
+ one of the same email in another mail app helps even more.
+ validations:
+ required: true
+ - type: textarea
+ id: html
+ attributes:
+ label: Email HTML
+ description: >-
+ Report issue in Flectar Mail copies the email's HTML for you, or saves
+ it as a file when it's too long for GitHub. Paste it inside the code
+ block or attach the file. Replace names, email addresses and personal
+ links with placeholders first.
+ value: |
+ Email HTML
+
+ ```html
+
+ ```
+
+ {}
", "a".repeat(PASTE_LIMIT));
+ let saved = runtime.block_on(save_html(
+ None,
+ exports.clone(),
+ temp_dir.clone(),
+ html.clone(),
+ ));
+ assert_eq!(saved, Ok(true));
+ let exports = exports.0.lock().unwrap();
+ let [(path, content, name, dialog)] = exports.as_slice() else {
+ panic!("expected one export");
+ };
+ assert!(path.starts_with(&temp_dir), "{path:?}");
+ assert_eq!(content, &html);
+ assert_eq!(name, FILE_NAME);
+ assert_eq!(dialog.title, "Save email HTML");
+ assert_eq!(dialog.filter, Some(("HTML".to_owned(), &["html"][..])));
+ assert!(!path.exists(), "the staged copy is removed after saving");
+ }
+
+ /// A window with a clipboard and a clock the test moves.
+ struct Headless(
+ Rc,
+ Rc>,
+ Rc>,
+ );
+
+ impl Platform for Headless {
+ fn create_window_adapter(&self) -> Result, slint::PlatformError> {
+ Ok(self.0.clone())
+ }
+ fn set_clipboard_text(&self, text: &str, _: slint::platform::Clipboard) {
+ *self.1.borrow_mut() = text.to_owned();
+ }
+ fn duration_since_start(&self) -> Duration {
+ self.2.get()
+ }
+ }
+
+ const SOURCE: &str = "Download your data
";
+
+ /// Opens About email rendering in a window `width` wide and presses
+ /// Return, which activates Report issue. Returns the app, the addresses
+ /// it opened and the clipboard.
+ fn report_with_return(width: u32, single_pane: bool) -> (AppWindow, Vec, String) {
+ let window = MinimalSoftwareWindow::new(RepaintBufferType::NewBuffer);
+ let clipboard = Rc::new(RefCell::new(String::new()));
+ let clock = Rc::new(Cell::new(Duration::ZERO));
+ slint::platform::set_platform(Box::new(Headless(
+ window.clone(),
+ clipboard.clone(),
+ clock.clone(),
+ )))
+ .unwrap();
+ let app = AppWindow::new().unwrap();
+ app.set_startup_ready(true);
+ app.set_startup_hydrated(true);
+ app.set_connected_accounts(ModelRc::new(VecModel::from(vec![AccountRow {
+ id: 1,
+ ..Default::default()
+ }])));
+ app.set_active_view("mail".into());
+ app.window().set_size(slint::PhysicalSize::new(width, 900));
+ app.show().unwrap();
+ if single_pane {
+ // A tab with a conversation opens the single pane on the message.
+ app.global::().set_shown_conversation(true);
+ app.global::().set_shown(1);
+ slint::platform::update_timers_and_animations();
+ // Let the message slide in. The window drops keys aimed at
+ // elements that are still out of view.
+ clock.set(Duration::from_secs(1));
+ slint::platform::update_timers_and_animations();
+ }
+ app.set_selected_source(SOURCE.into());
+ app.set_remote_images_blocked(true);
+ app.global::().set_active("gpu".into());
+ app.global::().set_zoom(0.85);
+ app.global::().set_auto_fit(true);
+ app.global::().set_preference("dark".into());
+
+ let runtime = tokio::runtime::Builder::new_current_thread()
+ .enable_all()
+ .build()
+ .unwrap();
+ let opened = Arc::new(Mutex::new(Vec::::new()));
+ let recorded = opened.clone();
+ register(
+ &app,
+ || None,
+ runtime.handle(),
+ Arc::new(Exports::default()),
+ std::env::temp_dir(),
+ ExternalUrlOpener::new(move |url| {
+ recorded.lock().unwrap().push(url.to_owned());
+ Ok(())
+ }),
+ );
+
+ // The dialog selects Report issue when it opens.
+ app.set_rendering_info_open(true);
+ let key = slint::SharedString::from(slint::platform::Key::Return);
+ app.window()
+ .dispatch_event(WindowEvent::KeyPressed { text: key.clone() });
+ app.window()
+ .dispatch_event(WindowEvent::KeyReleased { text: key });
+ // The reading pane copies to the clipboard from a change handler.
+ slint::platform::update_timers_and_animations();
+ let opened = opened.lock().unwrap().clone();
+ let copied = clipboard.borrow().clone();
+ (app, opened, copied)
+ }
+
+ #[test]
+ fn report_issue_copies_the_html_and_opens_the_prefilled_form() {
+ let (app, opened, copied) = report_with_return(1280, false);
+ let [url] = opened.as_slice() else {
+ panic!("expected the issue form once, got {opened:?}");
+ };
+ let environment = url::Url::parse(url)
+ .unwrap()
+ .query_pairs()
+ .find(|(key, _)| key == "environment")
+ .unwrap()
+ .1
+ .into_owned();
+ assert!(
+ environment.starts_with(&format!("Flectar Mail {}", env!("CARGO_PKG_VERSION"))),
+ "{environment}"
+ );
+ assert!(
+ environment.ends_with(
+ "\nGPU renderer, 85% zoom (fit to width), dark message colors, remote images blocked"
+ ),
+ "{environment}"
+ );
+ assert_eq!(copied, SOURCE);
+ assert_eq!(
+ app.get_render_message().key,
+ "Copied HTML source. Paste it into the issue."
+ );
+ }
+
+ /// Both layouts hold the dialog. The hidden copy must not take the focus
+ /// from the one on screen.
+ #[test]
+ fn report_issue_answers_the_keyboard_in_the_single_pane_layout() {
+ let (_app, opened, copied) = report_with_return(900, true);
+ assert_eq!(opened.len(), 1, "{opened:?}");
+ assert_eq!(copied, SOURCE);
+ }
+}
diff --git a/ui/app.slint b/ui/app.slint
index 3966efdd..b3619e3f 100644
--- a/ui/app.slint
+++ b/ui/app.slint
@@ -310,6 +310,9 @@ export global I18n {
if (key == "The message you were writing was saved to Drafts.") { return @tr("The message you were writing was saved to Drafts."); }
if (key == "Files from links are never attached for you. Attach them yourself if you trust them: {}") { return @tr("Files from links are never attached for you. Attach them yourself if you trust them: {}", argument); }
if (key == "Copied HTML source") { return @tr("Copied HTML source"); }
+ if (key == "Copied HTML source. Paste it into the issue.") { return @tr("Copied HTML source. Paste it into the issue."); }
+ if (key == "Saved HTML source. Attach the file to the issue.") { return @tr("Saved HTML source. Attach the file to the issue."); }
+ if (key == "Could not save HTML source: {}") { return @tr("Could not save HTML source: {}", argument); }
if (key == "Copied selected text") { return @tr("Copied selected text"); }
if (key == "Copied email text") { return @tr("Copied email text"); }
if (key == "Copied link") { return @tr("Copied link"); }
@@ -744,6 +747,7 @@ export component AppWindow inherits Window {
callback cancel_storage_usage();
callback open_email_link(string);
callback copy_email_status(string);
+ callback report_rendering_issue();
callback email-pointer-event(float, float, string, bool, bool, bool, bool);
callback email-scroll(float, float);
callback email-key-event(string, bool, bool, bool, bool, bool, bool);
@@ -1650,6 +1654,7 @@ export component AppWindow inherits Window {
open_compose => { root.open_compose(); }
open_email_link(url) => { root.open_email_link(url); }
copy_email_status(status) => { root.copy_email_status(status); }
+ report_rendering_issue => { root.report_rendering_issue(); }
email-pointer-event(x, y, kind, control, shift, alt, meta) => {
root.email-pointer-event(x, y, kind, control, shift, alt, meta);
}
diff --git a/ui/dialogs/rendering-info-dialog.slint b/ui/dialogs/rendering-info-dialog.slint
index 11497d29..91c8e837 100644
--- a/ui/dialogs/rendering-info-dialog.slint
+++ b/ui/dialogs/rendering-info-dialog.slint
@@ -7,6 +7,10 @@ import { TypeScale } from "../typography.slint";
export component RenderingInfoDialog inherits Rectangle {
in-out property open: false;
in property compact: false;
+ // Mail view keeps a reading pane, and so this dialog, for each layout.
+ // Only the one on screen takes focus, since the window drops keys aimed
+ // at a hidden element.
+ in property shown: true;
in property accent;
in property accent-soft;
in property border;
@@ -38,10 +42,18 @@ export component RenderingInfoDialog inherits Rectangle {
}
}
+ function take-focus() {
+ if root.open && root.shown {
+ dialog-focus.focus();
+ }
+ }
+
+ changed shown => { root.take-focus(); }
+
changed open => {
if root.open {
root.selected-action = 2;
- dialog-focus.focus();
+ root.take-focus();
}
}
diff --git a/ui/views/mail-reading-pane.slint b/ui/views/mail-reading-pane.slint
index 8b633fa1..098cc785 100644
--- a/ui/views/mail-reading-pane.slint
+++ b/ui/views/mail-reading-pane.slint
@@ -285,6 +285,8 @@ export component MailReadingPane inherits FocusScope {
enabled: false;
in property compact: false;
in property full-width: false;
+ // Whether this pane is on screen. Mail view keeps one pane per layout.
+ in property shown: true;
private property attachment-menu-mode: root.height < 500px;
in property show-avatars: true;
// The title wrap width comes from the containing window, not this pane's
@@ -532,6 +534,7 @@ export component MailReadingPane inherits FocusScope {
callback open_message_in_browser();
callback open_email_link(string);
callback copy_email_status(string);
+ callback report_rendering_issue();
callback email-pointer-event(float, float, string, bool, bool, bool, bool);
callback email-scroll(float, float);
callback email-key-event(string, bool, bool, bool, bool, bool, bool);
@@ -2073,6 +2076,7 @@ export component MailReadingPane inherits FocusScope {
RenderingInfoDialog {
open <=> root.rendering_info_open;
+ shown: root.shown;
compact: root.compact;
x: 0px;
y: 0px;
@@ -2091,8 +2095,6 @@ export component MailReadingPane inherits FocusScope {
clipboard-source.copy();
root.copy_email_status("Copied HTML source");
}
- report-issue => {
- root.open_email_link("https://github.com/flectar/mail/issues/new?title=Email%20rendering%20issue&body=%23%23%20What%20looked%20wrong%3F%0A%0A%23%23%20Email%20HTML%20source%0A%3C!--%20Remove%20private%20information%20before%20pasting.%20--%3E%0A");
- }
+ report-issue => { root.report_rendering_issue(); }
}
}
diff --git a/ui/views/mail-view.slint b/ui/views/mail-view.slint
index 5113d9b8..4b7a47b3 100644
--- a/ui/views/mail-view.slint
+++ b/ui/views/mail-view.slint
@@ -172,6 +172,7 @@ export component MailView inherits FocusScope {
callback open_compose();
callback open_email_link(string);
callback copy_email_status(string);
+ callback report_rendering_issue();
callback email-pointer-event(float, float, string, bool, bool, bool, bool);
callback email-scroll(float, float);
callback email-key-event(string, bool, bool, bool, bool, bool, bool);
@@ -434,6 +435,7 @@ export component MailView inherits FocusScope {
}
desktop-reading-pane := MailReadingPane {
+ shown: !root.single-pane;
show-avatars: root.show-avatars;
// This is the flexible column. Explicit constraints prevent
// the subject's wrapping width from becoming a hard maximum,
@@ -507,6 +509,7 @@ export component MailView inherits FocusScope {
open_message_in_browser => { root.open_message_in_browser(); }
open_email_link(url) => { root.open_email_link(url); }
copy_email_status(status) => { root.copy_email_status(status); }
+ report_rendering_issue => { root.report_rendering_issue(); }
load-remote-images-for-message => { root.load-remote-images-for-message(); }
email-pointer-event(x, y, kind, control, shift, alt, meta) => {
root.email-pointer-event(x, y, kind, control, shift, alt, meta);
@@ -668,6 +671,7 @@ export component MailView inherits FocusScope {
full-width: true;
show-avatars: root.show-avatars;
visible: root.compact-page == "message";
+ shown: root.single-pane && self.visible;
x: root.single-pane-content-x
+ (root.compact-page == "message" ? 0px : root.page-transition-distance);
y: 0px;
@@ -743,6 +747,7 @@ export component MailView inherits FocusScope {
open_message_in_browser => { root.open_message_in_browser(); }
open_email_link(url) => { root.open_email_link(url); }
copy_email_status(status) => { root.copy_email_status(status); }
+ report_rendering_issue => { root.report_rendering_issue(); }
load-remote-images-for-message => { root.load-remote-images-for-message(); }
email-pointer-event(x, y, kind, control, shift, alt, meta) => {
root.email-pointer-event(x, y, kind, control, shift, alt, meta);