mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-02 17:45:28 +00:00
remove deprecated members
This commit is contained in:
parent
f9207997f3
commit
45e8824a2e
1 changed files with 5 additions and 19 deletions
|
|
@ -3,7 +3,7 @@ mod syntax;
|
||||||
|
|
||||||
use gtk::{
|
use gtk::{
|
||||||
Align, Box, Button, Label, Orientation, PolicyType, ScrolledWindow, Separator, TextBuffer,
|
Align, Box, Button, Label, Orientation, PolicyType, ScrolledWindow, Separator, TextBuffer,
|
||||||
TextSearchFlags, TextTag, TextTagTable, TextView, WrapMode,
|
TextSearchFlags, TextTagTable, TextView, WrapMode,
|
||||||
gdk::Display,
|
gdk::Display,
|
||||||
glib::{ControlFlow, GString, idle_add_local, uuid_string_random},
|
glib::{ControlFlow, GString, idle_add_local, uuid_string_random},
|
||||||
prelude::{
|
prelude::{
|
||||||
|
|
@ -21,22 +21,11 @@ struct Entry {
|
||||||
data: String,
|
data: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Code {
|
pub struct Code(HashMap<GString, Entry>);
|
||||||
index: HashMap<GString, Entry>,
|
|
||||||
alt: TextTag,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Code {
|
impl Code {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self(HashMap::new())
|
||||||
index: HashMap::new(),
|
|
||||||
alt: TextTag::builder()
|
|
||||||
.pixels_above_lines(4)
|
|
||||||
.pixels_below_lines(8)
|
|
||||||
.weight(500)
|
|
||||||
.wrap_mode(WrapMode::None)
|
|
||||||
.build(),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Collect all code blocks into `Self.index` (to prevent formatting)
|
/// Collect all code blocks into `Self.index` (to prevent formatting)
|
||||||
|
|
@ -64,7 +53,7 @@ impl Code {
|
||||||
|
|
||||||
buffer.insert_with_tags(&mut start_iter, &id, &[]);
|
buffer.insert_with_tags(&mut start_iter, &id, &[]);
|
||||||
assert!(
|
assert!(
|
||||||
self.index
|
self.0
|
||||||
.insert(
|
.insert(
|
||||||
id,
|
id,
|
||||||
Entry {
|
Entry {
|
||||||
|
|
@ -82,10 +71,7 @@ impl Code {
|
||||||
let buffer = text_view.buffer();
|
let buffer = text_view.buffer();
|
||||||
let syntax = Syntax::new();
|
let syntax = Syntax::new();
|
||||||
let copied = Rc::new(Cell::new(None));
|
let copied = Rc::new(Cell::new(None));
|
||||||
|
for (k, v) in self.0.iter() {
|
||||||
assert!(buffer.tag_table().add(&self.alt));
|
|
||||||
|
|
||||||
for (k, v) in self.index.iter() {
|
|
||||||
while let Some((mut m_start, mut m_end)) =
|
while let Some((mut m_start, mut m_end)) =
|
||||||
buffer
|
buffer
|
||||||
.start_iter()
|
.start_iter()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue