starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-01-11 22:12:53 +01:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

feat(bar): add basic widget config opts

Browse Source
This commit is contained in:
LGUG2Z
2024-08-10 17:07:12 -07:00
parent bc2f4a172e
commit ca6bf69ac7
5 changed files with 158 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
komorebi-bar/src/date.rs
View File

@@ -1,5 +1,6 @@
use crate::widget::BarWidget;
#[derive(Copy, Clone, Debug)]
pub enum DateFormat {
MonthDateYear,
YearMonthDate,
@@ -27,15 +28,15 @@ impl DateFormat {
}
}
#[derive(Copy, Clone, Debug)]
pub struct Date {
pub enable: bool,
pub format: DateFormat,
}
impl Default for Date {
fn default() -> Self {
Self {
format: DateFormat::MonthDateYear,
}
impl Date {
pub fn new(enable: bool, format: DateFormat) -> Self {
Self { enable, format }
}
}

83
komorebi-bar/src/main.rs
View File

@@ -5,8 +5,12 @@ mod time;
mod widget;
use crate::date::Date;
use crate::date::DateFormat;
use crate::memory::Memory;
use crate::memory::MemoryConfig;
use crate::storage::Storage;
use crate::storage::StorageConfig;
use crate::time::TimeFormat;
use crate::widget::BarWidget;
use crossbeam_channel::Receiver;
use eframe::egui;
@@ -31,20 +35,20 @@ pub struct Position {
y: f32,
}
impl Into<Vec2> for Position {
fn into(self) -> Vec2 {
Vec2 {
x: self.x,
y: self.y,
impl From<Position> for Vec2 {
fn from(value: Position) -> Self {
Self {
x: value.x,
y: value.y,
}
}
}
impl Into<Pos2> for Position {
fn into(self) -> Pos2 {
Pos2 {
x: self.x,
y: self.y,
impl From<Position> for Pos2 {
fn from(value: Position) -> Self {
Self {
x: value.x,
y: value.y,
}
}
}
@@ -57,6 +61,10 @@ pub struct Config {
transparent: bool,
monitor_index: usize,
monitor_work_area_offset: Option<komorebi_client::Rect>,
time: Time,
date: Date,
storage: StorageConfig,
memory: MemoryConfig,
}
fn main() -> eframe::Result<()> {
@@ -72,6 +80,10 @@ fn main() -> eframe::Result<()> {
right: 0,
bottom: 40,
}),
time: Time::new(true, TimeFormat::TwentyFourHour),
date: Date::new(true, DateFormat::DayDateMonthYear),
storage: StorageConfig { enable: true },
memory: MemoryConfig { enable: true },
};
// TODO: ensure that config.monitor_index represents a valid komorebi monitor index
@@ -165,6 +177,8 @@ struct Komobar {
config: Config,
state_receiver: Receiver<komorebi_client::Notification>,
selected_workspace: String,
focused_window_title: String,
workspace_layout: String,
workspaces: Vec<String>,
time: Time,
date: Date,
@@ -184,14 +198,16 @@ impl Komobar {
// for e.g. egui::PaintCallback.
Self {
config: *config.as_ref(),
config: *config,
state_receiver: rx,
selected_workspace: String::new(),
focused_window_title: String::new(),
workspace_layout: String::new(),
workspaces: vec![],
time: Time::default(),
date: Date::default(),
memory: Memory::default(),
storage: Storage::default(),
time: config.time,
date: config.date,
memory: Memory::from(config.memory),
storage: Storage::from(config.storage),
}
}
}
@@ -199,10 +215,10 @@ impl Komobar {
impl Komobar {
fn handle_komorebi_notification(&mut self) {
if let Ok(notification) = self.state_receiver.try_recv() {
self.workspaces = {
let mut workspaces = vec![];
let monitor = &notification.state.monitors.elements()[self.config.monitor_index];
let focused_workspace_idx = monitor.focused_workspace_idx();
let mut workspaces = vec![];
self.selected_workspace = monitor.workspaces()[focused_workspace_idx]
.name()
.to_owned()
@@ -212,7 +228,19 @@ impl Komobar {
workspaces.push(ws.name().to_owned().unwrap_or_else(|| format!("{}", i + 1)));
}
workspaces
self.workspaces = workspaces;
self.workspace_layout = match monitor.workspaces()[focused_workspace_idx].layout() {
komorebi_client::Layout::Default(layout) => layout.to_string(),
komorebi_client::Layout::Custom(_) => String::from("Custom"),
};
if let Some(container) = monitor.workspaces()[focused_workspace_idx].focused_container()
{
if let Some(window) = container.focused_window() {
if let Ok(title) = window.title() {
self.focused_window_title.clone_from(&title);
}
}
}
}
}
@@ -267,11 +295,19 @@ impl eframe::App for Komobar {
komorebi_client::send_message(&SocketMessage::Retile).unwrap();
}
}
ui.label(&self.workspace_layout);
ui.add_space(10.0);
ui.label(&self.focused_window_title);
ui.add_space(10.0);
});
// TODO: make the order configurable
// TODO: make each widget optional??
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
if self.time.enable {
for time in self.time.output() {
ctx.request_repaint();
if ui
@@ -279,28 +315,30 @@ impl eframe::App for Komobar {
.on_hover_cursor(CursorIcon::default())
.clicked()
{
// TODO: make default format configurable
self.time.format.toggle()
}
}
// TODO: make spacing configurable
ui.add_space(10.0);
}
if self.date.enable {
for date in self.date.output() {
if ui
.label(format!("📅 {}", date))
.on_hover_cursor(CursorIcon::default())
.clicked()
{
// TODO: make default format configurable
self.date.format.next()
};
}
// TODO: make spacing configurable
ui.add_space(10.0);
}
if self.memory.enable {
for ram in self.memory.output() {
if ui
// TODO: make label configurable??
@@ -317,7 +355,9 @@ impl eframe::App for Komobar {
}
ui.add_space(10.0);
}
if self.storage.enable {
for disk in self.storage.output() {
if ui
// TODO: Make emoji configurable??
@@ -339,6 +379,7 @@ impl eframe::App for Komobar {
ui.add_space(10.0);
}
}
})
})
});

11
komorebi-bar/src/memory.rs
View File

@@ -3,12 +3,19 @@ use sysinfo::RefreshKind;
use sysinfo::System;
pub struct Memory {
pub enable: bool,
system: System,
}
impl Default for Memory {
fn default() -> Self {
#[derive(Copy, Clone, Debug)]
pub struct MemoryConfig {
pub enable: bool,
}
impl From<MemoryConfig> for Memory {
fn from(value: MemoryConfig) -> Self {
Self {
enable: value.enable,
system: System::new_with_specifics(
RefreshKind::default().without_cpu().without_processes(),
),

15
komorebi-bar/src/storage.rs
View File

@@ -1,18 +1,25 @@
use crate::widget::BarWidget;
use sysinfo::Disks;
pub struct Storage {
disks: Disks,
#[derive(Copy, Clone, Debug)]
pub struct StorageConfig {
pub enable: bool,
}
impl Default for Storage {
fn default() -> Self {
impl From<StorageConfig> for Storage {
fn from(value: StorageConfig) -> Self {
Self {
enable: value.enable,
disks: Disks::new_with_refreshed_list(),
}
}
}
pub struct Storage {
pub enable: bool,
disks: Disks,
}
impl BarWidget for Storage {
fn output(&mut self) -> Vec<String> {
self.disks.refresh();

11
komorebi-bar/src/time.rs
View File

@@ -1,5 +1,6 @@
use crate::widget::BarWidget;
#[derive(Copy, Clone, Debug)]
pub enum TimeFormat {
TwelveHour,
TwentyFourHour,
@@ -21,15 +22,15 @@ impl TimeFormat {
}
}
#[derive(Copy, Clone, Debug)]
pub struct Time {
pub enable: bool,
pub format: TimeFormat,
}
impl Default for Time {
fn default() -> Self {
Self {
format: TimeFormat::TwelveHour,
}
impl Time {
pub fn new(enable: bool, format: TimeFormat) -> Self {
Self { enable, format }
}
}