From a396560fc2570231d524d250e8d05668f7a37a47 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Fri, 27 Jan 2023 04:46:32 +0100 Subject: [PATCH] improv: set correct font sizes --- Cargo.lock | 26 +++++++++++++------------- src/widget/mod.rs | 17 +++++++++-------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e7e1c8d..86a4f79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1441,7 +1441,7 @@ dependencies = [ [[package]] name = "iced" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_core", "iced_dyrend", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.6.2" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "bitflags", "palette", @@ -1469,7 +1469,7 @@ dependencies = [ [[package]] name = "iced_dyrend" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_glow", "iced_graphics", @@ -1483,7 +1483,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "futures", "log", @@ -1494,7 +1494,7 @@ dependencies = [ [[package]] name = "iced_glow" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "bytemuck", "euclid", @@ -1509,7 +1509,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.5.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "bitflags", "bytemuck", @@ -1529,7 +1529,7 @@ dependencies = [ [[package]] name = "iced_lazy" version = "0.3.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_native", "ouroboros 0.13.0", @@ -1538,7 +1538,7 @@ dependencies = [ [[package]] name = "iced_native" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_core", "iced_futures", @@ -1551,7 +1551,7 @@ dependencies = [ [[package]] name = "iced_softbuffer" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "cosmic-text", "iced_graphics", @@ -1566,7 +1566,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.5.1" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_core", "once_cell", @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.7.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "bitflags", "bytemuck", @@ -1596,7 +1596,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.6.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "iced_futures", "iced_graphics", @@ -1765,7 +1765,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#b49b0e20624ac07d1c8b0aca65aee96bfa6c622d" +source = "git+https://github.com/pop-os/libcosmic?branch=settings-improv#818e161f48181df6e2ac113c480225759f3e8d4c" dependencies = [ "apply", "cosmic-theme", diff --git a/src/widget/mod.rs b/src/widget/mod.rs index be68a50..5f8fb91 100644 --- a/src/widget/mod.rs +++ b/src/widget/mod.rs @@ -23,7 +23,7 @@ pub fn search_header(pages: &page::Model, page: page::Entity) -> cosmic::Element column_children.push( text(parent_meta.title.as_str()) - .size(14) + .size(16) .apply(container) .padding([0, 0, 0, 6]) .into(), @@ -45,7 +45,7 @@ pub fn search_header(pages: &page::Model, page: page::Entity) -> cosmic::Element #[must_use] pub fn search_page_link(title: &str) -> Button { text(title) - .size(30) + .size(32) .horizontal_alignment(iced::alignment::Horizontal::Left) .apply(button) .style(cosmic::theme::Button::Link) @@ -54,7 +54,7 @@ pub fn search_page_link(title: &str) -> Button(page: &Meta) -> Element { row!( - text(page.title.as_str()).size(30), + text(page.title.as_str()).size(32), horizontal_space(Length::Fill) ) .into() @@ -68,18 +68,19 @@ pub fn parent_page_button<'a, Message: Clone + 'static>( ) -> Element<'a, Message> { column!( button(row!( - icon("go-previous-symbolic", 16).style(theme::Svg::SymbolicLink), - text(parent.title.as_str()).size(16), + icon("go-previous-symbolic", 20).style(theme::Svg::SymbolicLink), + text(parent.title.as_str()).size(20), )) .padding(0) .style(theme::Button::Link) .on_press(on_press), row!( - text(sub_page.title.as_str()).size(30), + text(sub_page.title.as_str()).size(32), horizontal_space(Length::Fill), - ), + ) + .align_items(iced::alignment::Alignment::Center), ) - .spacing(10) + .spacing(6) .into() }