zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-02 03:01:04 +02:00
Code Activity

refactor: split bar/top-level config structs

Browse source 
This allows for some options which are not actually bar-level to be separated, which makes some work moving forward a little easier and keeps things cleaner.
This commit is contained in:
Jake Stanger 2024-03-29 21:48:44 +00:00
parent 4aab6d5061
commit 706e040e25
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
5 changed files with 81 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/bar.rs
View file

@ -1,9 +1,9 @@
use crate::config::{BarPosition, MarginConfig, ModuleConfig};
use crate::config::{BarConfig, BarPosition, MarginConfig, ModuleConfig};
use crate::modules::{
create_module, set_widget_identifiers, wrap_widget, ModuleInfo, ModuleLocation,
};
use crate::popup::Popup;
use crate::{Config, Ironbar};
use crate::Ironbar;
use color_eyre::Result;
use glib::Propagation;
use gtk::gdk::Monitor;
@ -16,7 +16,7 @@ use tracing::{debug, info};
#[derive(Debug, Clone)]
enum Inner {
New { config: Option<Config> },
New { config: Option<BarConfig> },
Loaded { popup: Rc<Popup> },
}
@ -43,7 +43,7 @@ impl Bar {
pub fn new(
app: &Application,
monitor_name: String,
config: Config,
config: BarConfig,
ironbar: Rc<Ironbar>,
) -> Self {
let window = ApplicationWindow::builder()
@ -245,7 +245,7 @@ impl Bar {
}
/// Loads the configured modules onto a bar.
fn load_modules(&self, config: Config, monitor: &Monitor) -> Result<BarLoadResult> {
fn load_modules(&self, config: BarConfig, monitor: &Monitor) -> Result<BarLoadResult> {
let icon_theme = IconTheme::new();
if let Some(ref theme) = config.icon_theme {
icon_theme.set_custom_theme(Some(theme));
@ -408,7 +408,7 @@ pub fn create_bar(
app: &Application,
monitor: &Monitor,
monitor_name: String,
config: Config,
config: BarConfig,
ironbar: Rc<Ironbar>,
) -> Result<Bar> {
let bar = Bar::new(app, monitor_name, config, ironbar);