leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update libcosmic and other dependencies

Browse source
This commit is contained in:
Jeremy Soller 2023-12-05 10:38:24 -07:00
parent ec52d17303
commit 958b9298f3
3 changed files with 257 additions and 232 deletions
Download patch file Download diff file Expand all files Collapse all files

466
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

12
src/main.rs
View file

@ -693,9 +693,11 @@ impl App {
fn project_search(&self) -> Element<Message> { fn project_search(&self) -> Element<Message> {
let spacing = self.core().system_theme().cosmic().spacing; let spacing = self.core().system_theme().cosmic().spacing;
let search_input = let search_input = widget::text_input::search_input(
widget::text_input::search_input(&fl!("project-search"), &self.project_search_value) fl!("project-search"),
.id(self.project_search_id.clone()); self.project_search_value.clone(),
)
.id(self.project_search_id.clone());
let items = match &self.project_search_result { let items = match &self.project_search_result {
Some(project_search_result) => { Some(project_search_result) => {
@ -1421,7 +1423,7 @@ impl Application for App {
} }
Message::Quit => { Message::Quit => {
//TODO: prompt for save? //TODO: prompt for save?
return window::close(); return window::close(window::Id::MAIN);
} }
Message::Redo => match self.active_tab() { Message::Redo => match self.active_tab() {
Some(Tab::Editor(tab)) => { Some(Tab::Editor(tab)) => {
@ -1819,7 +1821,7 @@ impl Application for App {
struct ThemeSubscription; struct ThemeSubscription;
subscription::Subscription::batch([ subscription::Subscription::batch([
subscription::events_with(|event, _status| match event { event::listen_with(|event, _status| match event {
event::Event::Keyboard(keyboard::Event::KeyPressed { event::Event::Keyboard(keyboard::Event::KeyPressed {
modifiers, modifiers,
key_code, key_code,

11
src/text_box.rs
View file

@ -215,7 +215,12 @@ where
Length::Fill Length::Fill
} }
fn layout(&self, _renderer: &Renderer, limits: &layout::Limits) -> layout::Node { fn layout(
&self,
_tree: &mut widget::Tree,
_renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
let limits = limits.width(Length::Fill).height(Length::Fill); let limits = limits.width(Length::Fill).height(Length::Fill);
let mut editor = self.editor.lock().unwrap(); let mut editor = self.editor.lock().unwrap();
@ -447,8 +452,7 @@ where
// This code comes from cosmic_text::LayoutRunIter // This code comes from cosmic_text::LayoutRunIter
let glyph_height = max_ascent + max_descent; let glyph_height = max_ascent + max_descent;
let centering_offset = let centering_offset = (metrics.line_height - glyph_height) / 2.0;
(metrics.line_height - glyph_height) / 2.0;
let line_y = run.line_top + centering_offset + max_ascent; let line_y = run.line_top + centering_offset + max_ascent;
for layout_glyph in layout_line.glyphs.iter() { for layout_glyph in layout_line.glyphs.iter() {
@ -542,6 +546,7 @@ where
image::Renderer::draw( image::Renderer::draw(
renderer, renderer,
handle.clone(), handle.clone(),
image::FilterMethod::Nearest,
Rectangle::new( Rectangle::new(
image_position, image_position,
Size::new( Size::new(