XOR64/xmpd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Ui imporovemnts

Browse Source
This commit is contained in:
Gvidas Juknevičius
2024-11-14 02:56:50 +02:00
parent 9bcfcb9209
commit a384f45796
7 changed files with 152 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xmpd-gui/src/components/player.rs
View File

@@ -1,11 +1,12 @@
use egui::{Stroke, Vec2};
use egui::{Sense, Stroke, Vec2};
use super::{CompGetter, CompUi};
#[derive(Debug, Default)]
pub struct Player {
slider_progress: usize
slider_progress: usize,
is_playing: bool,
}
component_register!(Player);
@@ -29,23 +30,37 @@ impl CompUi for Player {
};
ui.style_mut().visuals.widgets.inactive.fg_stroke = s;
ui.style_mut().visuals.widgets.active.fg_stroke = s;
ui.style_mut().visuals.widgets.hovered.fg_stroke = s;
ui.add(slider);
ui.label("00:00");
}
});
ui.horizontal(|ui| {
ui.add_space((avail.x / 2.0) - 16.0 - 8.0 - ui.spacing().item_spacing.x);
let pp = if handle_error_ui!(Player::get()).is_playing {
crate::data::PAUSE_ICON
} else {
crate::data::PLAY_ICON
};
let prev = egui::Image::new(crate::data::PREV_ICON)
.tint(crate::data::C_ACCENT)
.sense(Sense::click())
.max_size(Vec2::new(16.0, 16.0));
let play = egui::Image::new(crate::data::PLAY_ICON)
let pp = egui::Image::new(pp)
.tint(crate::data::C_ACCENT)
.sense(Sense::click())
.max_size(Vec2::new(16.0, 16.0));
let next = egui::Image::new(crate::data::NEXT_ICON)
.tint(crate::data::C_ACCENT)
.sense(Sense::click())
.max_size(Vec2::new(16.0, 16.0));
if ui.add(prev).clicked() {}
if ui.add(play).clicked() {}
if ui.add(pp).clicked() {
let mut slf = handle_error_ui!(Player::get());
slf.is_playing = !slf.is_playing;
}
if ui.add(next).clicked() {}
});
ui.add_space(3.0);

14
xmpd-gui/src/components/song_list.rs
View File

@@ -1,4 +1,4 @@
use egui::{Color32, Vec2};
use egui::{Color32, RichText, Vec2};
use xmpd_manifest::store::BaseStore;
use super::CompUi;
@@ -13,6 +13,7 @@ impl CompUi for SongList {
fn draw(ui: &mut egui::Ui, state: &mut crate::GuiState) -> crate::Result<()> {
egui::ScrollArea::vertical().id_source("song_list").show(ui, |ui| {
ui.vertical(|ui| {
ui.add_space(3.0);
let songs = state.manifest.store().get_songs();
for (sid, song) in songs.iter() {
ui.horizontal(|ui| {
@@ -21,9 +22,14 @@ impl CompUi for SongList {
.tint(crate::data::C_ACCENT)
.fit_to_exact_size(Vec2::new(32.0, 32.0))
);
ui.label(song.author());
ui.strong(" - ");
ui.label(song.name());
ui.vertical(|ui| {
ui.label(song.name());
ui.monospace(
RichText::new(song.author())
.color(crate::data::C_TEXT_DIM)
.size(10.0)
);
});
});
ui.separator();
}

2
xmpd-gui/src/data.rs
View File

@@ -14,5 +14,5 @@ pub const C_ACCENT: egui::Color32 = egui::Color32::from_rgb(5, 102, 146); // #05
pub const C_PRIM_BG: egui::Color32 = egui::Color32::from_rgb(31, 34, 40); // #1F2228
pub const C_SEC_BG: egui::Color32 = egui::Color32::from_rgb(47, 53, 61); // #2f353d
pub const C_TEXT: egui::Color32 = egui::Color32::from_rgb(223, 223, 223); // #dfdfdf
pub const C_TEXT_DIM: egui::Color32 = egui::Color32::from_rgb(175, 175, 175 ); // #afafaf

9
xmpd-gui/src/main_window.rs
View File

@@ -13,15 +13,18 @@ pub fn draw(ui: &mut egui::Ui, state: &mut GuiState) -> crate::Result<()> {
handle_error_ui!(crate::components::top_nav::TopNav::draw(ui, state));
crate::utils::super_separator(ui, crate::data::C_ACCENT, avail.x, 2.0);
let avail = ui.available_size();
let main_height = avail.y * 0.91;
ui.horizontal(|ui| {
ui.set_height(avail.y);
ui.set_height(main_height);
ui.group(|ui| {
ui.set_height(avail.y);
ui.set_height(main_height);
ui.set_width(avail.x * 0.25);
handle_error_ui!(crate::components::left_nav::LeftNav::draw(ui, state));
});
handle_error_ui!(crate::components::song_list::SongList::draw(ui, state));
ui.group(|ui| {
handle_error_ui!(crate::components::song_list::SongList::draw(ui, state));
});
});
egui::TopBottomPanel::new(egui::panel::TopBottomSide::Bottom, "player")
.frame(