From 889cb6078c05cdf3eb94f19f64db552fa2be32dc Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 3 Jan 2024 15:02:32 -0500 Subject: [PATCH] chore: add back the new group input label --- Cargo.lock | 40 ++++++++++++++++++++-------------------- src/app.rs | 9 ++++++--- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 25c8fea..aac1e5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -821,7 +821,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -839,7 +839,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "quote", "syn 1.0.109", @@ -869,7 +869,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.10.0" -source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#8fc93d90933ded737ea4f7ca63ab064a5331710d" +source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#6abf336e6df08771d80232b2d6853269be34ee28" dependencies = [ "bitflags 2.4.1", "fontdb", @@ -890,7 +890,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "almost", "cosmic-config", @@ -1864,7 +1864,7 @@ dependencies = [ [[package]] name = "glyphon" version = "0.3.0" -source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#cd704e6bd5d0ddb815d08358766ad205fd70fada" +source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#c28dc99c86b6b598633e6623096b21632f266976" dependencies = [ "cosmic-text", "etagere", @@ -2088,7 +2088,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "iced_accessibility", "iced_core", @@ -2103,7 +2103,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "accesskit", "accesskit_unix", @@ -2112,7 +2112,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2130,7 +2130,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "futures", "iced_core", @@ -2143,7 +2143,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2166,7 +2166,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2179,7 +2179,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "iced_accessibility", "iced_core", @@ -2191,7 +2191,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "enum-repr", "float-cmp", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "iced_core", "once_cell", @@ -2225,7 +2225,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "bytemuck", "cosmic-text", @@ -2243,7 +2243,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2263,7 +2263,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "iced_renderer", "iced_runtime", @@ -2514,7 +2514,7 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#5cb818a5f98e8060f393ae86c887a3fa214f9e07" +source = "git+https://github.com/pop-os/libcosmic/#481cd5a0cdb86661417918bebe8ca2029bc752ab" dependencies = [ "apply", "ashpd", @@ -5174,9 +5174,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.31" +version = "0.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" dependencies = [ "memchr", ] diff --git a/src/app.rs b/src/app.rs index 7fc9799..45f09d9 100644 --- a/src/app.rs +++ b/src/app.rs @@ -780,8 +780,7 @@ impl cosmic::Application for CosmicAppLibrary { .align_x(Horizontal::Left) .width(Length::Fixed(432.0)), text_input("", group_name) - // FIXME text input is a bit broken - // .label(&NEW_GROUP_PLACEHOLDER) + .label(&NEW_GROUP_PLACEHOLDER) .on_input(Message::NewGroup) .on_submit(Message::SubmitNewGroup) .width(Length::Fixed(432.0)) @@ -791,6 +790,7 @@ impl cosmic::Application for CosmicAppLibrary { row![ button( text(&CANCEL.as_str()) + .size(14.0) .horizontal_alignment(Horizontal::Center) .width(Length::Fill) ) @@ -799,6 +799,7 @@ impl cosmic::Application for CosmicAppLibrary { .width(142), button( text(&SAVE.as_str()) + .size(14.0) .horizontal_alignment(Horizontal::Center) .width(Length::Fill) ) @@ -1041,7 +1042,9 @@ impl cosmic::Application for CosmicAppLibrary { .height(Length::Fixed(group_icon_size)) ) .padding(spacing.space_xxs), - text("Add group").horizontal_alignment(Horizontal::Center) + text("Add group") + .size(14.0) + .horizontal_alignment(Horizontal::Center) ] .align_items(Alignment::Center) .width(Length::Fill),