diff --git a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 index 3447c62c..188d6c67 100644 --- a/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 +++ b/examples/styling/snapshots/catppuccin_frappé-tiny-skia.sha256 @@ -1 +1 @@ -3b1021606c376c7464e5a08c7837a70e78dd3f34cf406ef59fa32c19c9d078db \ No newline at end of file +e440e5e00db4fff0a79251aaf493c4af86241196a746d9147a895d14f01b1283 \ No newline at end of file diff --git a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 index f90fcc63..b72ceb65 100644 --- a/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 +++ b/examples/styling/snapshots/catppuccin_latte-tiny-skia.sha256 @@ -1 +1 @@ -243eebb06988f950845f0ecf1f633b072adb98a572f649d7414fdbcc9710a36c \ No newline at end of file +d81cf7c3974fc5b49251e8287c536fd3477c18e7afd3e9e42619364db7787fcc \ No newline at end of file diff --git a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 index 9dc26c58..2cca5768 100644 --- a/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 +++ b/examples/styling/snapshots/catppuccin_macchiato-tiny-skia.sha256 @@ -1 +1 @@ -ef5e170eb0131dec2325e381f8597148f2158e132a652da9e77cd398b3582dc8 \ No newline at end of file +ad4fbda3cc3d60209320dd713b7be6b0a5e6b55650689d70ac563a0a81f2eefc \ No newline at end of file diff --git a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 index 813010ec..4dd06594 100644 --- a/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 +++ b/examples/styling/snapshots/catppuccin_mocha-tiny-skia.sha256 @@ -1 +1 @@ -c595ecad47757b13052f1947400ead4cb2ede5c60966cfb45504409600d39a7d \ No newline at end of file +3863252d1f15750d7f5375bd23e8363c6a70d77ac9aac853e3515f7ff5170bce \ No newline at end of file diff --git a/examples/styling/snapshots/dark-tiny-skia.sha256 b/examples/styling/snapshots/dark-tiny-skia.sha256 index 0cfa406e..e8ae6200 100644 --- a/examples/styling/snapshots/dark-tiny-skia.sha256 +++ b/examples/styling/snapshots/dark-tiny-skia.sha256 @@ -1 +1 @@ -ac739a8276d62d868e963e9bd9022556ec45756b4f84dc5faf389cfc632b22ca \ No newline at end of file +c0bc58fcbde8e7ac4447ba4a454c5c2cb2c6d570e873897887c626b2dc07329b \ No newline at end of file diff --git a/examples/styling/snapshots/dracula-tiny-skia.sha256 b/examples/styling/snapshots/dracula-tiny-skia.sha256 index 2fa0c45e..4b48c1d2 100644 --- a/examples/styling/snapshots/dracula-tiny-skia.sha256 +++ b/examples/styling/snapshots/dracula-tiny-skia.sha256 @@ -1 +1 @@ -52665bd69812c2e5cd5ec6e03985c66446fdfc0d65647a2dec41e3f86e91484f \ No newline at end of file +1f17779b3291c133399f1eba9f7e517889108d60dbaa8d5b6cd024ad67ef1c8c \ No newline at end of file diff --git a/examples/styling/snapshots/ferra-tiny-skia.sha256 b/examples/styling/snapshots/ferra-tiny-skia.sha256 index 14c66d25..6ea26878 100644 --- a/examples/styling/snapshots/ferra-tiny-skia.sha256 +++ b/examples/styling/snapshots/ferra-tiny-skia.sha256 @@ -1 +1 @@ -6a7b0a66f0fcfea0f9e8d2480830badb7d0b9682205608c66fc6f7e736367edf \ No newline at end of file +51d7bfc1af8ba7503b9800ae7eaaa660047d9b16b0bdc1e8a3850df1d9901652 \ No newline at end of file diff --git a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 index 997af2ae..173efa4e 100644 --- a/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 +++ b/examples/styling/snapshots/gruvbox_dark-tiny-skia.sha256 @@ -1 +1 @@ -aa69552446a454b82c230cea86255be1d0a62c44dd30e2501aa4f73962384a12 \ No newline at end of file +5423fa06a1dc73f9cce42447f3134768114e8321c8f2367da1e04db4d4673f52 \ No newline at end of file diff --git a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 index 14b9e90a..b1b97fa5 100644 --- a/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 +++ b/examples/styling/snapshots/gruvbox_light-tiny-skia.sha256 @@ -1 +1 @@ -08df5615aefb4ed54f4586ff3bc17b02d2e7e5262a08b37b9c528962274d67f8 \ No newline at end of file +b7ea69b9ce1f73694cccb8b0bc9acab35fc4dcedd01795e3897215c416550fc2 \ No newline at end of file diff --git a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 index 0829e12f..3c6e8060 100644 --- a/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 +++ b/examples/styling/snapshots/kanagawa_dragon-tiny-skia.sha256 @@ -1 +1 @@ -dafe2b3b254b6bae8456fe25f2c6596ed935b0c7fbee8928041e88d0ff6ea66f \ No newline at end of file +fa43206adec5dce05c4181ec5d9c71d15067dd3b1d7f5b3267c452cf1de2ca95 \ No newline at end of file diff --git a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 index e5b854ae..84c64e60 100644 --- a/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 +++ b/examples/styling/snapshots/kanagawa_lotus-tiny-skia.sha256 @@ -1 +1 @@ -8fd6da3baf1e58fa8621b036d01a207c5b7c050b691107e62112ed2b6dc28cde \ No newline at end of file +5d7445700ff415428ae43d32ef30b279c38ddc6ffd0e3619ea28044b1d8c709b \ No newline at end of file diff --git a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 index 7b7247c6..b27cd469 100644 --- a/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 +++ b/examples/styling/snapshots/kanagawa_wave-tiny-skia.sha256 @@ -1 +1 @@ -52b37f151e27b79b6d797cc33c35ce60503d0d04fd9cb14e5879911850fe6f08 \ No newline at end of file +52d424e4dfa3ae9b1195e95f17eb655675e4507ec8fb4e36372612fd57a5d86d \ No newline at end of file diff --git a/examples/styling/snapshots/light-tiny-skia.sha256 b/examples/styling/snapshots/light-tiny-skia.sha256 index 4e03f63c..2c30b309 100644 --- a/examples/styling/snapshots/light-tiny-skia.sha256 +++ b/examples/styling/snapshots/light-tiny-skia.sha256 @@ -1 +1 @@ -9b151f4545cc6ce9c565072f4bed055d9dacb777eeda42adee22e7a8e5e21abb \ No newline at end of file +a0c84b36979f6a6f780af80689425b92a1b68743c39f8e519efcb11b46b9de42 \ No newline at end of file diff --git a/examples/styling/snapshots/moonfly-tiny-skia.sha256 b/examples/styling/snapshots/moonfly-tiny-skia.sha256 index f0da5364..377e0509 100644 --- a/examples/styling/snapshots/moonfly-tiny-skia.sha256 +++ b/examples/styling/snapshots/moonfly-tiny-skia.sha256 @@ -1 +1 @@ -233e1df72111c1b8688350699eefb86df8a1b20775bc7b1f6a7809987378b232 \ No newline at end of file +21820cf793f0a3af6fd339132b32cc77cbca52f1ca32f7ae334f74849a046ba8 \ No newline at end of file diff --git a/examples/styling/snapshots/nightfly-tiny-skia.sha256 b/examples/styling/snapshots/nightfly-tiny-skia.sha256 index 4b8a8691..a4a22ca2 100644 --- a/examples/styling/snapshots/nightfly-tiny-skia.sha256 +++ b/examples/styling/snapshots/nightfly-tiny-skia.sha256 @@ -1 +1 @@ -ec57eae43df3015ad94e55f5c6a43ae9aabdfda795d786fef01ba4ae8a3c3211 \ No newline at end of file +1ba92e64ddcc5f5fc6f841d5fde961382099e7698a253ac93670b900287ee55c \ No newline at end of file diff --git a/examples/styling/snapshots/nord-tiny-skia.sha256 b/examples/styling/snapshots/nord-tiny-skia.sha256 index 55faebe8..d1f4cf12 100644 --- a/examples/styling/snapshots/nord-tiny-skia.sha256 +++ b/examples/styling/snapshots/nord-tiny-skia.sha256 @@ -1 +1 @@ -b3aff5e06612b117b3e7d4041b052e615f46198529a18466c0edf203b465bf8a \ No newline at end of file +f6559f58f9acae81d929ee1aa5f8db33fca9d4ff49d21acf1e627d891ed77565 \ No newline at end of file diff --git a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 index d84bfe47..5cb7f75e 100644 --- a/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 +++ b/examples/styling/snapshots/oxocarbon-tiny-skia.sha256 @@ -1 +1 @@ -96629b00a5f840b3c9d62ab02cdc6cb7c93024362ec45246040da6a0fd90b073 \ No newline at end of file +d3d34b3b02b11156cb9a545d60cba078e78e4124c8f3ae61be66908a42799166 \ No newline at end of file diff --git a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 index c1acfed6..367d8198 100644 --- a/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 +++ b/examples/styling/snapshots/solarized_dark-tiny-skia.sha256 @@ -1 +1 @@ -bdd7394c25ede2c213305466c355c5898a3ad4623c1c9c04048e02fbef7d5ba0 \ No newline at end of file +3c983866c4feaa10ed34206c1a4c98933e87ba6239849bd7e1b7876f6c9596e7 \ No newline at end of file diff --git a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 b/examples/styling/snapshots/solarized_light-tiny-skia.sha256 index 565292b8..bf7fb05b 100644 --- a/examples/styling/snapshots/solarized_light-tiny-skia.sha256 +++ b/examples/styling/snapshots/solarized_light-tiny-skia.sha256 @@ -1 +1 @@ -49aa531f84f4423b84a122c54faab5f92aba65659f3639cb77a7bc7772b2e666 \ No newline at end of file +dc6fc66e651d938a42f0a9c642a99e33865b87aefc3fdeafa1848f6a3fab20c3 \ No newline at end of file diff --git a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 index b6a6a4a6..5685ce2f 100644 --- a/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 +++ b/examples/styling/snapshots/tokyo_night-tiny-skia.sha256 @@ -1 +1 @@ -5d58a7acbbb0f3c73a2a8dec64f6ec0b9752be093b4e3d332b4f6241665ed642 \ No newline at end of file +7104099471f9c712f00cd2ac80e150e10f7d21604d7edc6b13181e74d42eb877 \ No newline at end of file diff --git a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 index 6aa9cbeb..2efd8415 100644 --- a/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 +++ b/examples/styling/snapshots/tokyo_night_light-tiny-skia.sha256 @@ -1 +1 @@ -bf99f421d038972dee3081e162637601764e857399f00697da5d8fc77f324d74 \ No newline at end of file +263b5eb190d7db2ab0a67dc8b73778d9130755b07a8295345c758e158fb52881 \ No newline at end of file diff --git a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 index bb61f035..c8a8d1ed 100644 --- a/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 +++ b/examples/styling/snapshots/tokyo_night_storm-tiny-skia.sha256 @@ -1 +1 @@ -c75ce7c48720a210b9ad805396867ff153c5590c0e112953566a069e34ba2672 \ No newline at end of file +6fd5700c7a63ba004957601e0d91b02e8d08b710cff81710d3b8cd1cb668faa6 \ No newline at end of file diff --git a/widget/src/button.rs b/widget/src/button.rs index 6227f499..37c07169 100644 --- a/widget/src/button.rs +++ b/widget/src/button.rs @@ -688,7 +688,28 @@ pub fn text(theme: &Theme, status: Status) -> Style { } } -/// A subtle button using background shades. +/// A button using background shades. +pub fn background(theme: &Theme, status: Status) -> Style { + let palette = theme.extended_palette(); + let base = styled(palette.background.base); + + match status { + Status::Active => base, + Status::Pressed => Style { + background: Some(Background::Color( + palette.background.strong.color, + )), + ..base + }, + Status::Hovered => Style { + background: Some(Background::Color(palette.background.weak.color)), + ..base + }, + Status::Disabled => disabled(base), + } +} + +/// A subtle button using weak background shades. pub fn subtle(theme: &Theme, status: Status) -> Style { let palette = theme.extended_palette(); let base = styled(palette.background.weakest); diff --git a/widget/src/container.rs b/widget/src/container.rs index 84bb5237..ab332b32 100644 --- a/widget/src/container.rs +++ b/widget/src/container.rs @@ -712,7 +712,7 @@ pub fn bordered_box(theme: &Theme) -> Style { border: Border { width: 1.0, radius: 5.0.into(), - color: palette.background.strong.color, + color: palette.background.weak.color, }, ..Style::default() }