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

improv: set correct font sizes

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-01-27 04:46:32 +01:00
parent 19c1c20607
commit a396560fc2
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Cargo.lock generated
View file

@ -1441,7 +1441,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.6.0" 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 = [ dependencies = [
"iced_core", "iced_core",
"iced_dyrend", "iced_dyrend",
@ -1459,7 +1459,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.6.2" 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 = [ dependencies = [
"bitflags", "bitflags",
"palette", "palette",
@ -1469,7 +1469,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_dyrend" name = "iced_dyrend"
version = "0.1.0" 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 = [ dependencies = [
"iced_glow", "iced_glow",
"iced_graphics", "iced_graphics",
@ -1483,7 +1483,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.5.1" 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 = [ dependencies = [
"futures", "futures",
"log", "log",
@ -1494,7 +1494,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_glow" name = "iced_glow"
version = "0.5.1" 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 = [ dependencies = [
"bytemuck", "bytemuck",
"euclid", "euclid",
@ -1509,7 +1509,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.5.0" 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 = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -1529,7 +1529,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_lazy" name = "iced_lazy"
version = "0.3.0" 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 = [ dependencies = [
"iced_native", "iced_native",
"ouroboros 0.13.0", "ouroboros 0.13.0",
@ -1538,7 +1538,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_native" name = "iced_native"
version = "0.7.0" 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 = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -1551,7 +1551,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_softbuffer" name = "iced_softbuffer"
version = "0.1.0" 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 = [ dependencies = [
"cosmic-text", "cosmic-text",
"iced_graphics", "iced_graphics",
@ -1566,7 +1566,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.5.1" 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 = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -1576,7 +1576,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.7.0" 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 = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -1596,7 +1596,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.6.0" 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 = [ dependencies = [
"iced_futures", "iced_futures",
"iced_graphics", "iced_graphics",
@ -1765,7 +1765,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" 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 = [ dependencies = [
"apply", "apply",
"cosmic-theme", "cosmic-theme",

17
src/widget/mod.rs
View file

@ -23,7 +23,7 @@ pub fn search_header(pages: &page::Model, page: page::Entity) -> cosmic::Element
column_children.push( column_children.push(
text(parent_meta.title.as_str()) text(parent_meta.title.as_str())
.size(14) .size(16)
.apply(container) .apply(container)
.padding([0, 0, 0, 6]) .padding([0, 0, 0, 6])
.into(), .into(),
@ -45,7 +45,7 @@ pub fn search_header(pages: &page::Model, page: page::Entity) -> cosmic::Element
#[must_use] #[must_use]
pub fn search_page_link<Message: 'static>(title: &str) -> Button<Message, cosmic::Renderer> { pub fn search_page_link<Message: 'static>(title: &str) -> Button<Message, cosmic::Renderer> {
text(title) text(title)
.size(30) .size(32)
.horizontal_alignment(iced::alignment::Horizontal::Left) .horizontal_alignment(iced::alignment::Horizontal::Left)
.apply(button) .apply(button)
.style(cosmic::theme::Button::Link) .style(cosmic::theme::Button::Link)
@ -54,7 +54,7 @@ pub fn search_page_link<Message: 'static>(title: &str) -> Button<Message, cosmic
#[must_use] #[must_use]
pub fn page_title<Message: 'static>(page: &Meta) -> Element<Message> { pub fn page_title<Message: 'static>(page: &Meta) -> Element<Message> {
row!( row!(
text(page.title.as_str()).size(30), text(page.title.as_str()).size(32),
horizontal_space(Length::Fill) horizontal_space(Length::Fill)
) )
.into() .into()
@ -68,18 +68,19 @@ pub fn parent_page_button<'a, Message: Clone + 'static>(
) -> Element<'a, Message> { ) -> Element<'a, Message> {
column!( column!(
button(row!( button(row!(
icon("go-previous-symbolic", 16).style(theme::Svg::SymbolicLink), icon("go-previous-symbolic", 20).style(theme::Svg::SymbolicLink),
text(parent.title.as_str()).size(16), text(parent.title.as_str()).size(20),
)) ))
.padding(0) .padding(0)
.style(theme::Button::Link) .style(theme::Button::Link)
.on_press(on_press), .on_press(on_press),
row!( row!(
text(sub_page.title.as_str()).size(30), text(sub_page.title.as_str()).size(32),
horizontal_space(Length::Fill), horizontal_space(Length::Fill),
), )
.align_items(iced::alignment::Alignment::Center),
) )
.spacing(10) .spacing(6)
.into() .into()
} }