added text_input visibility option

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Unreleased
 
+Added:
+
+- Configuration option `new_buffer.input_visibility` to control input field visibility: always shown or following the focused buffer.
+
 Fixed:
 
 - Changes done in the config file are now properly applied to the old buffers
 
+
 # 2023.2 (2023-07-07)
 
 Added:

config.yaml

@@ -71,6 +71,11 @@ new_buffer:
  left: "["
  right: "]"
 
+ # Input visibility behaviour
+ # - Always: Show input at all times [default]
+ # - Focused: Only show input when the buffer is focused
+ input_visibility: Always
+
  # Channel buffer settings
  channel:
  # User list settings

data/src/buffer.rs

@@ -51,6 +51,13 @@ impl From<config::Buffer> for Settings {
  }
 }
 
+#[derive(Debug, Clone, Copy, Default, Deserialize)]
+pub enum InputVisibility {
+ Focused,
+ #[default]
+ Always,
+}
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct Timestamp {
  pub format: String,

data/src/config/buffer.rs

@@ -2,7 +2,7 @@ use chrono::{DateTime, Local, Utc};
 use serde::Deserialize;
 
 use super::Channel;
-use crate::buffer::{Color, Nickname, Timestamp};
+use crate::buffer::{Color, InputVisibility, Nickname, Timestamp};
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Buffer {
@@ -11,6 +11,8 @@ pub struct Buffer {
  #[serde(default)]
  pub nickname: Nickname,
  #[serde(default)]
+ pub input_visibility: InputVisibility,
+ #[serde(default)]
  pub channel: Channel,
 }
 
@@ -25,6 +27,7 @@ impl Default for Buffer {
  color: Color::Unique,
  brackets: Default::default(),
  },
+ input_visibility: InputVisibility::default(),
  channel: Channel::default(),
  }
  }

src/buffer/channel.rs

@@ -97,11 +97,20 @@ pub fn view<'a>(
  .width(Length::FillPortion(2))
  .height(Length::Fill);
 
- let spacing = is_focused.then_some(vertical_space(4));
  let users = clients.get_channel_users(&state.server, &state.channel);
  let nick_list = nick_list::view(users).map(Message::UserContext);
- let text_input = (is_focused && status.connected()).then(|| {
- input_view::view(&state.input_view, buffer, users, input_history).map(Message::InputView)
+
+ let show_text_input = match config.buffer.input_visibility {
+ data::buffer::InputVisibility::Focused => is_focused && status.connected(),
+ data::buffer::InputVisibility::Always => status.connected(),
+ };
+
+ let text_input = show_text_input.then(|| {
+ column![
+ vertical_space(4),
+ input_view::view(&state.input_view, buffer, users, input_history)
+ .map(Message::InputView)
+ ]
  });
 
  let content = match (settings.users.visible, config.buffer.channel.users.position) {
@@ -115,7 +124,6 @@ pub fn view<'a>(
  };
 
  let scrollable = column![container(content).height(Length::Fill)]
- .push_maybe(spacing)
  .push_maybe(text_input)
  .height(Length::Fill);
 

src/buffer/query.rs

@@ -83,13 +83,20 @@ pub fn view<'a>(
  .map(Message::ScrollView),
  )
  .height(Length::Fill);
- let spacing = is_focused.then_some(vertical_space(4));
- let text_input = (is_focused && status.connected()).then(|| {
- input_view::view(&state.input_view, buffer, &[], input_history).map(Message::InputView)
+
+ let show_text_input = match config.buffer.input_visibility {
+ data::buffer::InputVisibility::Focused => is_focused && status.connected(),
+ data::buffer::InputVisibility::Always => status.connected(),
+ };
+
+ let text_input = show_text_input.then(|| {
+ column![
+ vertical_space(4),
+ input_view::view(&state.input_view, buffer, &[], input_history).map(Message::InputView)
+ ]
  });
 
  let scrollable = column![messages]
- .push_maybe(spacing)
  .push_maybe(text_input)
  .height(Length::Fill);
 

src/buffer/server.rs

@@ -52,13 +52,20 @@ pub fn view<'a>(
  .map(Message::ScrollView),
  )
  .height(Length::Fill);
- let spacing = is_focused.then_some(vertical_space(4));
- let text_input = (is_focused && status.connected()).then(|| {
- input_view::view(&state.input_view, buffer, &[], input_history).map(Message::InputView)
+
+ let show_text_input = match config.buffer.input_visibility {
+ data::buffer::InputVisibility::Focused => is_focused && status.connected(),
+ data::buffer::InputVisibility::Always => status.connected(),
+ };
+
+ let text_input = show_text_input.then(|| {
+ column![
+ vertical_space(4),
+ input_view::view(&state.input_view, buffer, &[], input_history).map(Message::InputView)
+ ]
  });
 
  let scrollable = column![messages]
- .push_maybe(spacing)
  .push_maybe(text_input)
  .height(Length::Fill);