alterwain/ILoader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: src/theme.rs

Browse Source 
modified:   src/widget.rs
This commit is contained in:
Michael Wain 2024-12-12 03:43:38 +03:00
parent d151a73b97
commit 2c671f6228
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/theme.rs
View File

@ -5,11 +5,8 @@ use iced::Length::Fill;
use iced::{widget::container, window, Theme, Element, Settings, Task as Command}; use iced::{widget::container, window, Theme, Element, Settings, Task as Command};
use iced::widget::{button, column, pick_list, radio, text, Column, Container, scrollable}; use iced::widget::{button, column, pick_list, radio, text, Column, Container, scrollable};
pub const SF_FONT: Font = Font { pub const SF_FONT = Font::External {
family: iced::font::Family::Name("SF Pro Text"),
weight: iced::font::Weight::Medium,
stretch: iced::font::Stretch::Normal,
style: iced::font::Style::Normal
}; };
pub fn get_default_theme() -> Theme { pub fn get_default_theme() -> Theme {
@ -24,8 +21,8 @@ pub fn get_default_theme() -> Theme {
pub fn basic_button_theme(theme: &Theme, _status: Status) -> Style { pub fn basic_button_theme(theme: &Theme, _status: Status) -> Style {
Style { Style {
background: Some(Background::Color(Color::from_rgb8(0, 122, 255))), background: Some(Background::Color(Color::from_rgb8(0, 0, 0))),
text_color: theme.palette().text, text_color: Color::from_rgb8(255, 255, 255), // theme.palette().text
border: Border { border: Border {
color: Color::TRANSPARENT, color: Color::TRANSPARENT,
width: 0.0, width: 0.0,

5
src/widget.rs
View File

@ -3,6 +3,7 @@ use iced::{widget::{button, container, text}, Length::Fill};
use crate::{theme, Message}; use crate::{theme, Message};
pub fn basic_btn(str: &str) -> button::Button<Message> { pub fn basic_btn(s: &str) -> button::Button<Message> {
button(text(str).center().font(theme::SF_FONT).size(13.0).line_height(16.)).width(109).height(22).style(theme::basic_button_theme) //button(text(str).center().font(theme::SF_FONT).size(13.0).line_height(16.)).width(109).height(22).style(theme::basic_button_theme)
button(text(s).center().font(theme::SF_FONT).size(13.0).line_height(1.6)).width(109).style(theme::basic_button_theme)
} }