Add line spacing to readability tab, move word wrap there too

Author: trypsynth

Cargo.toml

@@ -36,7 +36,7 @@ wxdragon = { version = "0.9.14", features = ["webview"] }
 zip = { version = "8.5.0", default-features = false, features = ["deflate"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.62.2", features = ["Win32_UI_Accessibility", "Win32_System_Com", "Win32_UI_WindowsAndMessaging", "Win32_Foundation", "Win32_System_Ole", "Win32_System_Variant"] }
+windows = { version = "0.62.2", features = ["Win32_UI_Accessibility", "Win32_System_Com", "Win32_UI_WindowsAndMessaging", "Win32_Foundation", "Win32_System_Ole", "Win32_System_Variant", "Win32_UI_Controls_RichEdit"] }
 
 [build-dependencies]
 embed-manifest = "1.5.0"

po/paperback.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperback 0.8.5\n"
 "Report-Msgid-Bugs-To: https://github.com/trypsynth/paperback/issues\n"
-"POT-Creation-Date: 2026-04-06 18:55-0600\n"
+"POT-Creation-Date: 2026-04-06 19:19-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,6 +88,18 @@ msgstr ""
 msgid "&Reset to Default Font"
 msgstr ""
 
+msgid "&Line spacing:"
+msgstr ""
+
+msgid "Normal"
+msgstr ""
+
+msgid "1.5\\u{00d7}"
+msgstr ""
+
+msgid "Double"
+msgstr ""
+
 msgid "General"
 msgstr ""
 

src/config.rs

@@ -153,6 +153,8 @@ struct AppSettings {
 	font_underlined: bool,
 	#[serde(default = "default_reading_speed_wpm")]
 	reading_speed_wpm: i64,
+	#[serde(default)]
+	line_spacing: i64,
 }
 
 impl Default for AppSettings {
@@ -179,6 +181,7 @@ impl Default for AppSettings {
 			font_weight: 0,
 			font_underlined: false,
 			reading_speed_wpm: 150,
+			line_spacing: 0,
 		}
 	}
 }
@@ -442,6 +445,21 @@ impl ConfigManager {
 		self.dirty.set(true);
 	}
 
+	pub fn get_line_spacing(&self) -> i32 {
+		if !self.initialized {
+			return 0;
+		}
+		self.data.borrow().app.line_spacing.try_into().unwrap_or(0)
+	}
+
+	pub fn set_line_spacing(&self, value: i32) {
+		if !self.initialized {
+			return;
+		}
+		self.data.borrow_mut().app.line_spacing = i64::from(value);
+		self.dirty.set(true);
+	}
+
 	pub fn add_recent_document(&self, path: &str) {
 		if !self.initialized {
 			return;

src/ui/dialogs.rs

@@ -52,6 +52,7 @@ pub struct OptionsDialogResult {
 	pub language: String,
 	pub update_channel: crate::config::UpdateChannel,
 	pub readability_font: ReadabilityFont,
+	pub line_spacing: i32,
 }
 
 bitflags! {
@@ -92,6 +93,7 @@ struct OptionsDialogUi {
 	ok_button: Button,
 	cancel_button: Button,
 	readability_font: Rc<RefCell<ReadabilityFont>>,
+	line_spacing_ctrl: Choice,
 }
 
 pub fn show_options_dialog(parent: &Frame, config: &ConfigManager) -> Option<OptionsDialogResult> {
@@ -107,13 +109,15 @@ pub fn show_options_dialog(parent: &Frame, config: &ConfigManager) -> Option<Opt
 		_ => crate::config::UpdateChannel::Stable,
 	};
 	let readability_font = ui.readability_font.borrow().clone();
+	let line_spacing = ui.line_spacing_ctrl.get_selection().unwrap_or(0) as i32;
 	Some(OptionsDialogResult {
 		flags,
 		recent_documents_to_show: ui.recent_docs_ctrl.value(),
 		reading_speed_wpm: ui.reading_speed_ctrl.value(),
 		language,
 		update_channel,
 		readability_font,
+		line_spacing,
 	})
 }
 
@@ -122,11 +126,13 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 	let notebook = Notebook::builder(&dialog).with_style(NotebookStyle::Top).build();
 	let general_panel = Panel::builder(&notebook).build();
 	let reading_panel = Panel::builder(&notebook).build();
+	let readability_panel = Panel::builder(&notebook).build();
 	let general_sizer = BoxSizer::builder(Orientation::Vertical).build();
 	let reading_sizer = BoxSizer::builder(Orientation::Vertical).build();
+	let readability_sizer = BoxSizer::builder(Orientation::Vertical).build();
 	let restore_docs_check =
 		CheckBox::builder(&general_panel).with_label(&t("&Restore previously opened documents on startup")).build();
-	let word_wrap_check = CheckBox::builder(&reading_panel).with_label(&t("&Word wrap")).build();
+	let word_wrap_check = CheckBox::builder(&readability_panel).with_label(&t("&Word wrap")).build();
 	let minimize_to_tray_check = CheckBox::builder(&general_panel).with_label(&t("&Minimize to system tray")).build();
 	let start_maximized_check = CheckBox::builder(&general_panel).with_label(&t("&Start maximized")).build();
 	let compact_go_menu_check = CheckBox::builder(&reading_panel).with_label(&t("Show compact &go menu")).build();
@@ -139,7 +145,7 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 	for check in [&restore_docs_check, &start_maximized_check, &minimize_to_tray_check, &check_for_updates_check] {
 		general_sizer.add(check, 0, SizerFlag::All, option_padding);
 	}
-	for check in [&word_wrap_check, &navigation_wrap_check, &compact_go_menu_check, &bookmark_sounds_check] {
+	for check in [&navigation_wrap_check, &compact_go_menu_check, &bookmark_sounds_check] {
 		reading_sizer.add(check, 0, SizerFlag::All, option_padding);
 	}
 	let reading_speed_label =
@@ -180,8 +186,6 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 	general_sizer.add_sizer(&channel_sizer, 0, SizerFlag::All, option_padding);
 
 	// Readability tab
-	let readability_panel = Panel::builder(&notebook).build();
-	let readability_sizer = BoxSizer::builder(Orientation::Vertical).build();
 	let font_group_box = StaticBox::builder(&readability_panel).with_label(&t("Font")).build();
 	let font_group_sizer = StaticBoxSizerBuilder::new_with_box(&font_group_box, Orientation::Vertical).build();
 	let font_preview_label = StaticText::builder(&readability_panel).with_label("").build();
@@ -191,6 +195,16 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 	font_group_sizer.add(&choose_font_button, 0, SizerFlag::All, option_padding);
 	font_group_sizer.add(&reset_font_button, 0, SizerFlag::All, option_padding);
 	readability_sizer.add_sizer(&font_group_sizer, 0, SizerFlag::Expand | SizerFlag::All, option_padding);
+	let line_spacing_label = StaticText::builder(&readability_panel).with_label(&t("&Line spacing:")).build();
+	let line_spacing_ctrl = Choice::builder(&readability_panel).build();
+	line_spacing_ctrl.append(&t("Normal"));
+	line_spacing_ctrl.append(&t("1.5\u{00d7}"));
+	line_spacing_ctrl.append(&t("Double"));
+	let line_spacing_sizer = BoxSizer::builder(Orientation::Horizontal).build();
+	line_spacing_sizer.add(&line_spacing_label, 0, SizerFlag::AlignCenterVertical | SizerFlag::Right, DIALOG_PADDING);
+	line_spacing_sizer.add(&line_spacing_ctrl, 0, SizerFlag::AlignCenterVertical, 0);
+	readability_sizer.add(&word_wrap_check, 0, SizerFlag::All, option_padding);
+	readability_sizer.add_sizer(&line_spacing_sizer, 0, SizerFlag::All, option_padding);
 	readability_panel.set_sizer(readability_sizer, true);
 
 	general_panel.set_sizer(general_sizer, true);
@@ -228,6 +242,8 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 	let initial_font = config.get_readability_font();
 	font_preview_label.set_label(&font_description(&initial_font));
 	let readability_font = Rc::new(RefCell::new(initial_font));
+	let stored_line_spacing = config.get_line_spacing().clamp(0, 2) as u32;
+	line_spacing_ctrl.set_selection(stored_line_spacing);
 
 	// "Choose Font..." button handler
 	let font_state = Rc::clone(&readability_font);
@@ -273,6 +289,7 @@ fn build_options_dialog_ui(parent: &Frame, config: &ConfigManager) -> OptionsDia
 		ok_button,
 		cancel_button,
 		readability_font,
+		line_spacing_ctrl,
 	}
 }
 

src/ui/document_manager.rs

@@ -144,6 +144,7 @@ impl DocumentManager {
 		panel.set_sizer(sizer, true);
 		let content = session.content();
 		fill_text_ctrl(text_ctrl, &content);
+		apply_line_spacing_to_ctrl(text_ctrl, config.get_line_spacing());
 		self.notebook.add_page(&panel, &title, true, None);
 		let path_str = path.to_string_lossy();
 		let nav_history = config.get_navigation_history(&path_str);
@@ -410,7 +411,15 @@ impl DocumentManager {
 		}
 	}
 
+	pub fn apply_line_spacing(&self, line_spacing: i32) {
+		for tab in &self.tabs {
+			apply_line_spacing_to_ctrl(tab.text_ctrl, line_spacing);
+			tab.text_ctrl.refresh(true, None);
+		}
+	}
+
 	pub fn apply_word_wrap(&mut self, self_rc: &Rc<Mutex<Self>>, word_wrap: bool) {
+		let line_spacing = self.config.lock().unwrap().get_line_spacing();
 		for tab in &mut self.tabs {
 			let old_ctrl = tab.text_ctrl;
 			let current_pos = old_ctrl.get_insertion_point();
@@ -420,6 +429,7 @@ impl DocumentManager {
 			sizer.add(&text_ctrl, 1, SizerFlag::Expand | SizerFlag::All, 0);
 			tab.panel.set_sizer(sizer, true);
 			fill_text_ctrl(text_ctrl, &content);
+			apply_line_spacing_to_ctrl(text_ctrl, line_spacing);
 			let max_pos = text_ctrl.get_last_position();
 			let pos = current_pos.clamp(0, max_pos);
 			text_ctrl.set_insertion_point(pos);
@@ -529,6 +539,32 @@ fn fill_text_ctrl(text_ctrl: TextCtrl, content: &str) {
 	text_ctrl.set_value(content);
 }
 
+#[cfg(target_os = "windows")]
+pub fn apply_line_spacing_to_ctrl(text_ctrl: TextCtrl, line_spacing: i32) {
+	use windows::Win32::Foundation::{HWND, LPARAM, WPARAM};
+	use windows::Win32::UI::Controls::RichEdit::{PARAFORMAT2, PFM_LINESPACING};
+	use windows::Win32::UI::WindowsAndMessaging::SendMessageW;
+	const EM_SETSEL: u32 = 177;
+	const EM_SETPARAFORMAT: u32 = 1095;
+	let hwnd_ptr = text_ctrl.get_handle();
+	if hwnd_ptr.is_null() {
+		return;
+	}
+	let hwnd = HWND(hwnd_ptr);
+	unsafe {
+		SendMessageW(hwnd, EM_SETSEL, Some(WPARAM(0)), Some(LPARAM(-1_isize)));
+		let mut pf = PARAFORMAT2::default();
+		pf.Base.cbSize = std::mem::size_of::<PARAFORMAT2>() as u32;
+		pf.Base.dwMask = PFM_LINESPACING;
+		pf.bLineSpacingRule = line_spacing.clamp(0, 2) as u8;
+		SendMessageW(hwnd, EM_SETPARAFORMAT, None, Some(LPARAM(&raw const pf as isize)));
+		SendMessageW(hwnd, EM_SETSEL, Some(WPARAM(0)), Some(LPARAM(0)));
+	}
+}
+
+#[cfg(not(target_os = "windows"))]
+pub fn apply_line_spacing_to_ctrl(_text_ctrl: TextCtrl, _line_spacing: i32) {}
+
 pub fn build_font_from_readability(rf: &ReadabilityFont) -> Option<Font> {
 	if rf.is_default() {
 		return None;

src/ui/main_window.rs

@@ -1121,6 +1121,7 @@ impl MainWindow {
 					cfg.set_app_string("language", &options.language);
 					cfg.set_update_channel(options.update_channel);
 					cfg.set_readability_font(&options.readability_font);
+					cfg.set_line_spacing(options.line_spacing);
 					cfg.flush();
 					drop(cfg);
 					let options_word_wrap = options.flags.contains(OptionsDialogFlags::WORD_WRAP);
@@ -1137,6 +1138,7 @@ impl MainWindow {
 						let default_font = Font::new();
 						dm.lock().unwrap().apply_font(&default_font);
 					}
+					dm.lock().unwrap().apply_line_spacing(options.line_spacing);
 					let options_compact_menu = options.flags.contains(OptionsDialogFlags::COMPACT_GO_MENU);
 					if current_language != options.language || old_compact_menu != options_compact_menu {
 						if current_language != options.language {