Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated iced #574

Merged
merged 3 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ windows_exe_info = "0.4"
members = ["data", "ipc", "irc", "irc/proto"]

[patch.crates-io]
iced = { git = "https://github.com/iced-rs/iced", rev = "9628dc20d5dab128b9fff2c4b73cc66b0071e149" }
iced_core = { git = "https://github.com/iced-rs/iced", rev = "9628dc20d5dab128b9fff2c4b73cc66b0071e149" }
iced = { git = "https://github.com/iced-rs/iced", rev = "8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" }
iced_core = { git = "https://github.com/iced-rs/iced", rev = "8fb939b5a920e0cd836dbdd24c948f8f2512fc7e" }
1 change: 1 addition & 0 deletions src/font.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ pub fn width_from_chars(len: usize, config: &config::Font) -> f32 {
horizontal_alignment: alignment::Horizontal::Right,
vertical_alignment: alignment::Vertical::Top,
shaping: text::Shaping::Basic,
wrapping: Default::default(),
})
.min_bounds()
.expand(Size::new(1.0, 0.0))
Expand Down
1 change: 0 additions & 1 deletion src/widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub mod context_menu;
pub mod decorate;
pub mod double_click;
pub mod double_pass;
pub mod hover;
pub mod key_press;
pub mod message_content;
pub mod modal;
Expand Down
245 changes: 0 additions & 245 deletions src/widget/hover.rs

This file was deleted.

3 changes: 3 additions & 0 deletions src/widget/selectable_rich_text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ where
horizontal_alignment: self.align_x,
vertical_alignment: self.align_y,
shaping: Shaping::Advanced,
wrapping: Default::default(),
};

// Check spoiler
Expand Down Expand Up @@ -755,6 +756,7 @@ where
horizontal_alignment,
vertical_alignment,
shaping: Shaping::Advanced,
wrapping: Default::default(),
};

if state.spans != spans {
Expand All @@ -780,6 +782,7 @@ where
horizontal_alignment,
vertical_alignment,
shaping: Shaping::Advanced,
wrapping: Default::default(),
}) {
text::Difference::None => {}
text::Difference::Bounds => {
Expand Down
Loading
Loading