leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Border radius support for buttons

Browse source
This commit is contained in:
Michael Aaron Murphy 2022-12-23 16:09:17 +01:00
parent a39a2518d0
commit d732f64fb8
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit 499367339dbc7036ac1ceaf6378a0cd7e2972158 Subproject commit fec3193836d9fbe57fb93d54f56ce5d73b23ee38

5
src/theme/mod.rs
View file

@ -10,6 +10,7 @@ use std::hash::Hasher;
pub use self::palette::Palette; pub use self::palette::Palette;
use cosmic_theme::Component; use cosmic_theme::Component;
use iced_core::BorderRadius;
use iced_style::application; use iced_style::application;
use iced_style::button; use iced_style::button;
use iced_style::checkbox; use iced_style::checkbox;
@ -175,8 +176,8 @@ impl button::StyleSheet for Theme {
button::Appearance { button::Appearance {
border_radius: match style { border_radius: match style {
Button::Link => 0.0, Button::Link => BorderRadius::from(0.0),
_ => 24.0, _ => BorderRadius::from(24.0),
}, },
background: match style { background: match style {
Button::Link | Button::Text => None, Button::Link | Button::Text => None,

3
src/widget/navigation/navbar.rs
View file

@ -6,6 +6,7 @@ use crate::widget::{icon, scrollable};
use crate::{theme, Renderer, Theme}; use crate::{theme, Renderer, Theme};
use derive_setters::Setters; use derive_setters::Setters;
use iced::{Background, Length}; use iced::{Background, Length};
use iced_core::BorderRadius;
use iced_lazy::Component; use iced_lazy::Component;
use iced_native::widget::{button, column, container, text}; use iced_native::widget::{button, column, container, text};
use iced_native::{row, Alignment, Element}; use iced_native::{row, Alignment, Element};
@ -230,7 +231,7 @@ pub fn section_button_style(theme: &Theme) -> Appearance {
Appearance { Appearance {
shadow_offset: iced::Vector::default(), shadow_offset: iced::Vector::default(),
background: Some(Background::Color(primary.base.into())), background: Some(Background::Color(primary.base.into())),
border_radius: 5.0, border_radius: BorderRadius::from(5.0),
border_width: 0.0, border_width: 0.0,
border_color: iced::Color::default(), border_color: iced::Color::default(),
text_color: iced::Color::default(), text_color: iced::Color::default(),