Added auto-load configuration options

Author: trypsynth

src/commands.rs

@@ -11,7 +11,7 @@ use crate::{
 	AppState,
 	accounts::{start_add_account_flow, start_streaming_for_timeline, switch_to_account, try_oob_oauth},
 	auth,
-	config::{self, Account, ContentWarningDisplay, SortOrder},
+	config::{self, Account, AutoloadMode, ContentWarningDisplay, SortOrder},
 	html, live_region,
 	mastodon::{MastodonClient, Status},
 	network::{self, NetworkCommand},
@@ -97,7 +97,7 @@ pub(crate) fn handle_ui_command(
 	suppress_selection: &Cell<bool>,
 	live_region: &StaticText,
 	quick_action_keys_enabled: &Cell<bool>,
-	autoload_enabled: &Cell<bool>,
+	autoload_mode: &Cell<AutoloadMode>,
 	sort_order_cell: &Cell<SortOrder>,
 	tray_hidden: &Cell<bool>,
 	ui_tx: &mpsc::Sender<UiCommand>,
@@ -423,7 +423,7 @@ pub(crate) fn handle_ui_command(
 					suppress_selection,
 					live_region,
 					quick_action_keys_enabled,
-					autoload_enabled,
+					autoload_mode,
 					sort_order_cell,
 					tray_hidden,
 					ui_tx,
@@ -504,7 +504,7 @@ pub(crate) fn handle_ui_command(
 					state.cw_expanded.clear();
 				}
 				quick_action_keys_enabled.set(quick_action_keys);
-				autoload_enabled.set(autoload);
+				autoload_mode.set(autoload);
 				sort_order_cell.set(sort_order);
 				if let Some(mb) = frame.get_menu_bar() {
 					update_menu_labels(&mb, state);
@@ -548,7 +548,7 @@ pub(crate) fn handle_ui_command(
 						suppress_selection,
 						live_region,
 						quick_action_keys_enabled,
-						autoload_enabled,
+						autoload_mode,
 						sort_order_cell,
 						tray_hidden,
 						ui_tx,
@@ -564,7 +564,7 @@ pub(crate) fn handle_ui_command(
 						suppress_selection,
 						live_region,
 						quick_action_keys_enabled,
-						autoload_enabled,
+						autoload_mode,
 						sort_order_cell,
 						tray_hidden,
 						ui_tx,
@@ -602,7 +602,7 @@ pub(crate) fn handle_ui_command(
 				suppress_selection,
 				live_region,
 				quick_action_keys_enabled,
-				autoload_enabled,
+				autoload_mode,
 				sort_order_cell,
 				tray_hidden,
 				ui_tx,
@@ -629,7 +629,7 @@ pub(crate) fn handle_ui_command(
 				suppress_selection,
 				live_region,
 				quick_action_keys_enabled,
-				autoload_enabled,
+				autoload_mode,
 				sort_order_cell,
 				tray_hidden,
 				ui_tx,
@@ -653,7 +653,7 @@ pub(crate) fn handle_ui_command(
 				suppress_selection,
 				live_region,
 				quick_action_keys_enabled,
-				autoload_enabled,
+				autoload_mode,
 				sort_order_cell,
 				tray_hidden,
 				ui_tx,
@@ -677,7 +677,7 @@ pub(crate) fn handle_ui_command(
 				suppress_selection,
 				live_region,
 				quick_action_keys_enabled,
-				autoload_enabled,
+				autoload_mode,
 				sort_order_cell,
 				tray_hidden,
 				ui_tx,
@@ -766,7 +766,7 @@ pub(crate) fn handle_ui_command(
 					suppress_selection,
 					live_region,
 					quick_action_keys_enabled,
-					autoload_enabled,
+					autoload_mode,
 					sort_order_cell,
 					tray_hidden,
 					ui_tx,
@@ -1032,7 +1032,7 @@ pub(crate) fn handle_ui_command(
 							suppress_selection,
 							live_region,
 							quick_action_keys_enabled,
-							autoload_enabled,
+							autoload_mode,
 							sort_order_cell,
 							tray_hidden,
 							ui_tx,

src/config.rs

@@ -22,8 +22,8 @@ pub struct Config {
 	pub always_show_link_dialog: bool,
 	#[serde(default = "default_quick_action_keys")]
 	pub quick_action_keys: bool,
-	#[serde(default = "default_autoload")]
-	pub autoload: bool,
+	#[serde(default, deserialize_with = "deserialize_autoload_mode")]
+	pub autoload: AutoloadMode,
 	#[serde(default = "default_fetch_limit")]
 	pub fetch_limit: u8,
 	#[serde(default)]
@@ -56,6 +56,14 @@ pub enum ContentWarningDisplay {
 	WarningOnly,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub enum AutoloadMode {
+	Never,
+	#[default]
+	AtEnd,
+	AtBoundary,
+}
+
 fn default_enter_to_send() -> bool {
 	true
 }
@@ -68,8 +76,22 @@ fn default_quick_action_keys() -> bool {
 	false
 }
 
-fn default_autoload() -> bool {
-	true
+fn deserialize_autoload_mode<'de, D>(deserializer: D) -> Result<AutoloadMode, D::Error>
+where
+	D: serde::Deserializer<'de>,
+{
+	use serde::de::Error;
+	let value = serde_json::Value::deserialize(deserializer)?;
+	match value {
+		serde_json::Value::Bool(b) => Ok(if b { AutoloadMode::AtBoundary } else { AutoloadMode::Never }),
+		serde_json::Value::String(s) => match s.as_str() {
+			"Never" => Ok(AutoloadMode::Never),
+			"AtEnd" => Ok(AutoloadMode::AtEnd),
+			"AtBoundary" => Ok(AutoloadMode::AtBoundary),
+			_ => Err(D::Error::custom(format!("unknown autoload mode: {}", s))),
+		},
+		_ => Err(D::Error::custom("expected bool or string for autoload")),
+	}
 }
 
 fn default_fetch_limit() -> u8 {
@@ -85,7 +107,7 @@ impl Default for Config {
 			enter_to_send: true,
 			always_show_link_dialog: false,
 			quick_action_keys: false,
-			autoload: true,
+			autoload: AutoloadMode::default(),
 			fetch_limit: default_fetch_limit(),
 			sort_order: SortOrder::default(),
 			timestamp_format: TimestampFormat::default(),

src/main.rs

@@ -102,7 +102,7 @@ fn drain_ui_commands(
 	suppress_selection: &Cell<bool>,
 	live_region: &StaticText,
 	quick_action_keys_enabled: &Cell<bool>,
-	autoload_enabled: &Cell<bool>,
+	autoload_mode: &Cell<config::AutoloadMode>,
 	sort_order_cell: &Cell<config::SortOrder>,
 	tray_hidden: &Cell<bool>,
 	ui_tx: &mpsc::Sender<UiCommand>,
@@ -117,7 +117,7 @@ fn drain_ui_commands(
 			suppress_selection,
 			live_region,
 			quick_action_keys_enabled,
-			autoload_enabled,
+			autoload_mode,
 			sort_order_cell,
 			tray_hidden,
 			ui_tx,
@@ -140,7 +140,7 @@ fn main() {
 		let store = config::ConfigStore::new();
 		let config = store.load();
 		let quick_action_keys_enabled = Rc::new(Cell::new(config.quick_action_keys));
-		let autoload_enabled = Rc::new(Cell::new(config.autoload));
+		let autoload_mode = Rc::new(Cell::new(config.autoload));
 		let sort_order_cell = Rc::new(Cell::new(config.sort_order));
 		let mut state = AppState::new(config);
 
@@ -172,7 +172,7 @@ fn main() {
 		let mut state = state;
 		let timer_tick = timer.clone();
 		let quick_action_keys_drain = quick_action_keys_enabled.clone();
-		let autoload_drain = autoload_enabled.clone();
+		let autoload_drain = autoload_mode.clone();
 		let sort_order_drain = sort_order_cell.clone();
 		let tray_hidden_drain = tray_hidden.clone();
 		let ui_tx_timer = ui_tx.clone();
@@ -239,7 +239,7 @@ fn main() {
 			is_shutting_down.clone(),
 			suppress_selection.clone(),
 			quick_action_keys_enabled.clone(),
-			autoload_enabled.clone(),
+			autoload_mode.clone(),
 			sort_order_cell.clone(),
 			timer.clone(),
 		);

src/responses.rs

@@ -4,7 +4,7 @@ use wxdragon::prelude::*;
 
 use crate::{
 	AppState, UiCommand,
-	config::SortOrder,
+	config::{AutoloadMode, SortOrder},
 	live_region,
 	mastodon::{Poll, Status},
 	network::{NetworkCommand, NetworkResponse, TimelineData},
@@ -100,7 +100,7 @@ pub(crate) fn process_network_responses(
 	suppress_selection: &Cell<bool>,
 	live_region: &StaticText,
 	quick_action_keys_enabled: &Cell<bool>,
-	autoload_enabled: &Cell<bool>,
+	autoload_mode: &Cell<AutoloadMode>,
 	sort_order_cell: &Cell<SortOrder>,
 	tray_hidden: &Cell<bool>,
 	ui_tx: &mpsc::Sender<UiCommand>,
@@ -218,7 +218,7 @@ pub(crate) fn process_network_responses(
 							suppress_selection,
 							live_region,
 							quick_action_keys_enabled,
-							autoload_enabled,
+							autoload_mode,
 							sort_order_cell,
 							tray_hidden,
 							ui_tx,

src/ui/dialogs.rs

@@ -4,7 +4,7 @@ use url::Url;
 use wxdragon::prelude::*;
 
 use crate::{
-	config::{Account, ContentWarningDisplay, SortOrder, TimestampFormat},
+	config::{Account, AutoloadMode, ContentWarningDisplay, SortOrder, TimestampFormat},
 	html::{self, Link},
 	mastodon::{Account as MastodonAccount, PollLimits, Status},
 	network::{NetworkCommand, ProfileUpdate},
@@ -656,12 +656,12 @@ pub fn prompt_for_options(
 	enter_to_send: bool,
 	always_show_link_dialog: bool,
 	quick_action_keys: bool,
-	autoload: bool,
+	autoload: AutoloadMode,
 	fetch_limit: u8,
 	content_warning_display: ContentWarningDisplay,
 	sort_order: SortOrder,
 	timestamp_format: TimestampFormat,
-) -> Option<(bool, bool, bool, bool, u8, ContentWarningDisplay, SortOrder, TimestampFormat)> {
+) -> Option<(bool, bool, bool, AutoloadMode, u8, ContentWarningDisplay, SortOrder, TimestampFormat)> {
 	let dialog = Dialog::builder(frame, "Options").with_size(400, 450).build();
 	let panel = Panel::builder(&dialog).build();
 	let main_sizer = BoxSizer::builder(Orientation::Vertical).build();
@@ -671,8 +671,20 @@ pub fn prompt_for_options(
 	link_checkbox.set_value(always_show_link_dialog);
 	let quick_action_checkbox = CheckBox::builder(&panel).with_label("Use &quick action keys in timelines").build();
 	quick_action_checkbox.set_value(quick_action_keys);
-	let autoload_checkbox = CheckBox::builder(&panel).with_label("&Autoload posts when scrolling").build();
-	autoload_checkbox.set_value(autoload);
+	let autoload_label = StaticText::builder(&panel).with_label("&Autoload posts:").build();
+	let autoload_choices =
+		vec!["Never".to_string(), "When reaching the end".to_string(), "When navigating past the end".to_string()];
+	let autoload_choice =
+		ComboBox::builder(&panel).with_choices(autoload_choices).with_style(ComboBoxStyle::ReadOnly).build();
+	let autoload_index = match autoload {
+		AutoloadMode::Never => 0,
+		AutoloadMode::AtEnd => 1,
+		AutoloadMode::AtBoundary => 2,
+	};
+	autoload_choice.set_selection(autoload_index);
+	let autoload_sizer = BoxSizer::builder(Orientation::Horizontal).build();
+	autoload_sizer.add(&autoload_label, 0, SizerFlag::AlignCenterVertical | SizerFlag::Right, 8);
+	autoload_sizer.add(&autoload_choice, 1, SizerFlag::Expand, 0);
 	let fetch_limit_label = StaticText::builder(&panel).with_label("Posts to &fetch when loading more:").build();
 	let fetch_limit_spin = SpinCtrl::builder(&panel).with_range(1, 40).with_initial_value(fetch_limit as i32).build();
 	let fetch_limit_sizer = BoxSizer::builder(Orientation::Horizontal).build();
@@ -704,7 +716,7 @@ pub fn prompt_for_options(
 	main_sizer.add(&enter_checkbox, 0, SizerFlag::Expand | SizerFlag::All, 8);
 	main_sizer.add(&link_checkbox, 0, SizerFlag::Expand | SizerFlag::All, 8);
 	main_sizer.add(&quick_action_checkbox, 0, SizerFlag::Expand | SizerFlag::All, 8);
-	main_sizer.add(&autoload_checkbox, 0, SizerFlag::Expand | SizerFlag::All, 8);
+	main_sizer.add_sizer(&autoload_sizer, 0, SizerFlag::Expand | SizerFlag::All, 8);
 	main_sizer.add_sizer(&fetch_limit_sizer, 0, SizerFlag::Expand | SizerFlag::All, 8);
 	main_sizer.add_sizer(&cw_sizer, 0, SizerFlag::Expand | SizerFlag::All, 8);
 	main_sizer.add(&timestamp_checkbox, 0, SizerFlag::Expand | SizerFlag::All, 8);
@@ -731,12 +743,18 @@ pub fn prompt_for_options(
 		Some(2) => ContentWarningDisplay::WarningOnly,
 		_ => content_warning_display,
 	};
+	let new_autoload = match autoload_choice.get_selection() {
+		Some(0) => AutoloadMode::Never,
+		Some(1) => AutoloadMode::AtEnd,
+		Some(2) => AutoloadMode::AtBoundary,
+		_ => autoload,
+	};
 	let new_fetch_limit = (fetch_limit_spin.value() as u8).clamp(1, 40);
 	Some((
 		enter_checkbox.get_value(),
 		link_checkbox.get_value(),
 		quick_action_checkbox.get_value(),
-		autoload_checkbox.get_value(),
+		new_autoload,
 		new_fetch_limit,
 		new_cw_display,
 		new_sort,

src/ui/window.rs

@@ -6,7 +6,9 @@ use crate::{
 	ID_BOOST, ID_CLOSE_TIMELINE, ID_DELETE_POST, ID_EDIT_POST, ID_EDIT_PROFILE, ID_FAVORITE, ID_FEDERATED_TIMELINE,
 	ID_LOAD_MORE, ID_LOCAL_TIMELINE, ID_MANAGE_ACCOUNTS, ID_NEW_POST, ID_OPEN_LINKS, ID_OPEN_USER_TIMELINE_BY_INPUT,
 	ID_OPTIONS, ID_REFRESH, ID_REPLY, ID_REPLY_AUTHOR, ID_VIEW_HASHTAGS, ID_VIEW_IN_BROWSER, ID_VIEW_MENTIONS,
-	ID_VIEW_PROFILE, ID_VIEW_THREAD, ID_VIEW_USER_TIMELINE, KEY_DELETE, UiCommand, config::SortOrder, live_region,
+	ID_VIEW_PROFILE, ID_VIEW_THREAD, ID_VIEW_USER_TIMELINE, KEY_DELETE, UiCommand,
+	config::{AutoloadMode, SortOrder},
+	live_region,
 	ui::menu::build_menu_bar,
 };
 
@@ -57,7 +59,7 @@ pub fn bind_input_handlers(
 	is_shutting_down: Rc<Cell<bool>>,
 	suppress_selection: Rc<Cell<bool>>,
 	quick_action_keys_enabled: Rc<Cell<bool>>,
-	autoload_enabled: Rc<Cell<bool>>,
+	autoload_mode: Rc<Cell<AutoloadMode>>,
 	sort_order_cell: Rc<Cell<SortOrder>>,
 	timer: Rc<Timer<Frame>>,
 ) {
@@ -120,7 +122,7 @@ pub fn bind_input_handlers(
 	let ui_tx_list_key = ui_tx.clone();
 	let shutdown_list_key = is_shutting_down.clone();
 	let quick_action_keys_list = quick_action_keys_enabled.clone();
-	let autoload_list = autoload_enabled.clone();
+	let autoload_mode_list = autoload_mode.clone();
 	let sort_order_list = sort_order_cell.clone();
 	timeline_list_state.bind_internal(EventType::KEY_DOWN, move |event| {
 		if shutdown_list_key.get() {
@@ -164,7 +166,7 @@ pub fn bind_input_handlers(
 					_ => {}
 				}
 
-				if autoload_list.get() {
+				if autoload_mode_list.get() == AutoloadMode::AtBoundary {
 					let sort_order = sort_order_list.get();
 					let selection = timeline_list_state.get_selection().map(|s| s as usize);
 					let count = timeline_list_state.get_count() as usize;
@@ -357,6 +359,8 @@ pub fn bind_input_handlers(
 		event.skip(true);
 	});
 
+	let autoload_mode_selection = autoload_mode.clone();
+	let sort_order_selection = sort_order_cell.clone();
 	timeline_list_state.on_selection_changed(move |event| {
 		if shutdown_list.get() {
 			return;
@@ -368,9 +372,20 @@ pub fn bind_input_handlers(
 			&& selection >= 0
 		{
 			let _ = ui_tx_list.send(UiCommand::TimelineEntrySelectionChanged(selection as usize));
+			if autoload_mode_selection.get() == AutoloadMode::AtEnd {
+				let count = timeline_list_state.get_count() as usize;
+				let index = selection as usize;
+				let sort_order = sort_order_selection.get();
+				let at_load_position = match sort_order {
+					SortOrder::NewestToOldest => index + 1 == count,
+					SortOrder::OldestToNewest => index == 0,
+				};
+				if at_load_position {
+					let _ = ui_tx_list.send(UiCommand::LoadMore);
+				}
+			}
 		}
 	});
-
 	let ui_tx_menu = ui_tx.clone();
 	let shutdown_menu = is_shutting_down.clone();
 	let frame_menu = parts.frame;