feat: add highlighting to editor
This commit is contained in:
@@ -0,0 +1 @@
|
||||
tab_spaces = 2
|
||||
+23
-23
@@ -1,32 +1,32 @@
|
||||
use iced::{
|
||||
Element, Length, Theme,
|
||||
widget::{container, markdown, row, text_editor},
|
||||
Element, Length, Theme, highlighter,
|
||||
widget::{container, markdown, row, 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> {
|
||||
match mode {
|
||||
Mode::Edit => {
|
||||
let editor = text_editor(file.content())
|
||||
.size(font_size)
|
||||
.height(Length::Fill)
|
||||
.on_action(Message::Edit);
|
||||
match mode {
|
||||
Mode::Edit => {
|
||||
let editor = text_editor(file.content())
|
||||
.highlight(file.extension().unwrap_or("txt"), highlighter::Theme::Base16Ocean)
|
||||
.size(font_size)
|
||||
.height(Length::Fill)
|
||||
.on_action(Message::Edit);
|
||||
|
||||
container(row![editor]).height(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);
|
||||
|
||||
container(row![markdown_preview])
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
}
|
||||
container(row![editor]).height(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);
|
||||
|
||||
container(row![markdown_preview])
|
||||
.height(Length::Fill)
|
||||
.into()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+8
-1
@@ -1,4 +1,4 @@
|
||||
use std::path::PathBuf;
|
||||
use std::{ffi, path::{Path, PathBuf}};
|
||||
|
||||
use iced::widget::{markdown, text_editor};
|
||||
|
||||
@@ -58,6 +58,13 @@ impl File {
|
||||
self.path = path;
|
||||
}
|
||||
|
||||
pub fn extension(&self) -> Option<&str> {
|
||||
self.path
|
||||
.as_deref()
|
||||
.and_then(Path::extension)
|
||||
.and_then(ffi::OsStr::to_str)
|
||||
}
|
||||
|
||||
pub fn display_name(&self) -> &str {
|
||||
self.path
|
||||
.as_deref()
|
||||
|
||||
Reference in New Issue
Block a user