diff --git a/src/main.rs b/src/main.rs index bc44c6e..809f6c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ mod utils; use file_format::FileFormat; use ::image::{DynamicImage, ImageReader}; use iced::{ - alignment::Vertical::{Bottom, Top}, border, font::{self, Family, Stretch, Weight}, gradient, mouse::{self, Interaction}, wgpu::naga::back, widget::{button, center, column, container, image, mouse_area, opaque, row, stack, text, Column, Space}, window::{self, icon, Settings}, Alignment::Center, Color, Element, Font, Length::{self, Fill}, Point, Renderer, Size, Subscription, Task, Theme + alignment::Vertical::{Bottom, Top}, border, font::{self, Family, Stretch, Weight}, gradient, mouse::{self, Interaction}, wgpu::naga::back, widget::{button, center, column, container, image, mouse_area, opaque, row, stack, text, Column, Space}, window::{self, icon, Settings}, Alignment::Center, Color, Element, Font, Length::{self, Fill}, Padding, Point, Renderer, Size, Subscription, Task, Theme }; use iced_video_player::{Video, VideoPlayer}; use serde::{Deserialize, Serialize}; @@ -273,6 +273,10 @@ impl Launcher { let mut font = Font::with_name("Quodlibet Sans"); font.weight = Weight::Normal; font.stretch = Stretch::Normal; + + let mut bolded_font = Font::with_name("Quodlibet Sans"); + bolded_font.weight = Weight::Bold; + bolded_font.stretch = Stretch::Normal; println!("Rerender triggered!"); match self { Launcher::Loading => center(text("Loading...").size(50)).into(), @@ -289,10 +293,9 @@ impl Launcher { ].spacing(20) ].align_y(Center).padding(4), state.get_game_icon_row(), - ] ) - .padding(5) + .padding(Padding { top: 5.0, right: 10.0, bottom: 5.0, left: 10.0 }) .align_y(Top) .align_x(Center) .width(Length::Fill) @@ -307,10 +310,10 @@ impl Launcher { ]; let bottom_bar = container(row![ - text("The quick brown fox jumped over the lazy dog.").size(25).font(font).align_y(Bottom), + text("The quick brown fox jumped over the lazy dog.").size(25).font(font), Space::new(Length::Fill, Length::Fixed(0.0)), - opaque(mouse_area(button(text("Launch").size(25)) - .padding(10) + opaque(mouse_area(button(text("Start").size(25).font(bolded_font).align_x(Center)) + .padding(Padding { top: 10.0, right: 70.0, bottom: 10.0, left: 70.0 }) .style(move |_, _| { button::Style { text_color: Color::from_rgba8(0, 0, 0, 1.0), @@ -318,7 +321,9 @@ impl Launcher { border: border::rounded(5), ..button::Style::default() } - })).interaction(Interaction::Pointer)) + })) + .interaction(Interaction::Pointer) + ) ]) .align_y(Bottom) .width(Length::Fill) diff --git a/src/utils/img_utils.rs b/src/utils/img_utils.rs index 96cec38..1efd616 100644 --- a/src/utils/img_utils.rs +++ b/src/utils/img_utils.rs @@ -1,6 +1,4 @@ -use std::io::Cursor; - -use image::{DynamicImage, GenericImageView, ImageBuffer, ImageReader, Rgba}; +use image::{DynamicImage, GenericImageView, ImageBuffer, Rgba}; pub fn is_in_rounded_rect(x: u32, y: u32, width: u32, height: u32, radius: f32) -> bool { let x = x as f32; diff --git a/src/utils/visual_helper.rs b/src/utils/visual_helper.rs index 74c5783..f352f72 100644 --- a/src/utils/visual_helper.rs +++ b/src/utils/visual_helper.rs @@ -3,7 +3,7 @@ use std::{io::{Cursor, Write}, sync::Arc}; use file_format::FileFormat; use iced_video_player::Video; use ::image::{DynamicImage, ImageReader}; -use iced::{gradient, widget::{container, image}, Color}; +use iced::{gradient, widget::container, Color}; use tempfile::NamedTempFile; use crate::{Assets, LauncherBackground, PossibleGames, State};