feat: add word wrap toggle functionality
Add the ability to toggle word wrap in the text editor with Alt+Z. Word wrap can be enabled or disabled, affecting how long lines are displayed in edit mode. Changes: - Add `is_word_wrap_on` state field with default value of false - Implement `toggle_word_wrap()` and `is_word_wrap_on()` methods - Add ToggleWordWrap variant to ViewAction enum - Bind Alt+Z keyboard shortcut to toggle word wrap - Refactor editor view to support dynamic wrapping behavior - Use responsive widget when wrap is enabled to constrain width - Apply Wrapping::WordOrGlyph when enabled, Wrapping::None otherwise - Update editor view signature to accept word wrap state parameter - Fix indentation inconsistencies in file.rs and state.rs
This commit is contained in:
+63
-36
@@ -2,58 +2,85 @@ use iced::{
|
||||
Background, Element, Length, Theme,
|
||||
border::{self},
|
||||
highlighter,
|
||||
widget::{container, markdown, row, scrollable, text_editor},
|
||||
widget::{container, markdown, responsive, row, scrollable, text::Wrapping, text_editor},
|
||||
};
|
||||
|
||||
use crate::{constants, file::File, message::Message, state::Mode};
|
||||
|
||||
pub fn view<'a>(file: &'a File, mode: Mode, font_size: u32) -> Element<'a, Message> {
|
||||
pub fn view<'a>(
|
||||
file: &'a File,
|
||||
mode: Mode,
|
||||
font_size: u32,
|
||||
is_word_wrap_on: bool,
|
||||
) -> Element<'a, Message> {
|
||||
match mode {
|
||||
Mode::Edit => {
|
||||
let editor = text_editor(file.content())
|
||||
.highlight(
|
||||
file.extension().unwrap_or("txt"),
|
||||
highlighter::Theme::Base16Ocean,
|
||||
)
|
||||
.padding(10)
|
||||
.size(font_size)
|
||||
.style(|theme: &Theme, status: text_editor::Status| {
|
||||
let base = text_editor::default(theme, status);
|
||||
let wrapping = if is_word_wrap_on {
|
||||
Wrapping::WordOrGlyph
|
||||
} else {
|
||||
Wrapping::None
|
||||
};
|
||||
|
||||
text_editor::Style {
|
||||
border: border::Border {
|
||||
width: 0.0,
|
||||
..Default::default()
|
||||
},
|
||||
..base
|
||||
}
|
||||
})
|
||||
.on_action(Message::Edit);
|
||||
let create_editor = move || {
|
||||
text_editor(file.content())
|
||||
.wrapping(wrapping)
|
||||
.highlight(
|
||||
file.extension().unwrap_or("txt"),
|
||||
highlighter::Theme::Base16Ocean,
|
||||
)
|
||||
.padding(10)
|
||||
.size(font_size)
|
||||
.style(|theme: &Theme, status: text_editor::Status| {
|
||||
let base = text_editor::default(theme, status);
|
||||
|
||||
scrollable(container(editor).height(Length::Fill))
|
||||
.auto_scroll(true)
|
||||
.direction(scrollable::Direction::Both {
|
||||
vertical: scrollable::Scrollbar::default(),
|
||||
horizontal: scrollable::Scrollbar::default(),
|
||||
text_editor::Style {
|
||||
border: border::Border {
|
||||
width: 0.0,
|
||||
..Default::default()
|
||||
},
|
||||
..base
|
||||
}
|
||||
})
|
||||
.on_action(Message::Edit)
|
||||
};
|
||||
|
||||
let create_scrollable = |content: Element<'a, Message>| {
|
||||
scrollable(content)
|
||||
.auto_scroll(true)
|
||||
.direction(scrollable::Direction::Both {
|
||||
vertical: scrollable::Scrollbar::default(),
|
||||
horizontal: scrollable::Scrollbar::default(),
|
||||
})
|
||||
.style(|theme: &Theme, status: scrollable::Status| {
|
||||
let mut style = scrollable::default(theme, status);
|
||||
style.horizontal_rail.background = Some(Background::Color(theme.palette().background));
|
||||
style.horizontal_rail.scroller.background = Background::Color(theme.palette().primary);
|
||||
style.vertical_rail.background = Some(Background::Color(theme.palette().background));
|
||||
style.vertical_rail.scroller.background = Background::Color(theme.palette().primary);
|
||||
style
|
||||
})
|
||||
.anchor_bottom()
|
||||
.height(Length::Fill)
|
||||
};
|
||||
|
||||
if is_word_wrap_on {
|
||||
responsive(move |size| {
|
||||
let editor = create_editor();
|
||||
create_scrollable(container(editor).width(size.width).into()).into()
|
||||
})
|
||||
.style(|theme: &Theme, status: scrollable::Status| {
|
||||
let mut style = scrollable::default(theme, status);
|
||||
style.horizontal_rail.background = Some(Background::Color(theme.palette().background));
|
||||
style.horizontal_rail.scroller.background = Background::Color(theme.palette().primary);
|
||||
style.vertical_rail.background = Some(Background::Color(theme.palette().background));
|
||||
style.vertical_rail.scroller.background = Background::Color(theme.palette().primary);
|
||||
style
|
||||
})
|
||||
.anchor_bottom()
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
} else {
|
||||
let editor = create_editor();
|
||||
create_scrollable(container(editor).height(Length::Fill).into())
|
||||
.width(Length::Fill)
|
||||
.into()
|
||||
}
|
||||
}
|
||||
Mode::Preview => {
|
||||
let mut style: markdown::Style = Theme::Dark.into();
|
||||
style.font = constants::CUSTOM_FONT;
|
||||
|
||||
let settings = markdown::Settings::with_text_size(font_size, style);
|
||||
|
||||
let markdown_preview = markdown::view(file.markdown(), settings).map(Message::LinkClicked);
|
||||
|
||||
scrollable(row![markdown_preview].padding(10))
|
||||
|
||||
Reference in New Issue
Block a user