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

feat: support for 'ironvar' dynamic variables

Browse source
This commit is contained in:
Jake Stanger 2023-06-22 23:07:40 +01:00
parent f5bdc5a027
commit ded50cca6f
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
17 changed files with 613 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/custom/button.rs
View file

@ -1,5 +1,5 @@
use super::{CustomWidget, CustomWidgetContext, ExecEvent};
use crate::dynamic_string::DynamicString;
use crate::dynamic_value::dynamic_string;
use crate::popup::Popup;
use crate::{build, try_send};
use gtk::prelude::*;
@ -25,7 +25,7 @@ impl CustomWidget for ButtonWidget {
label.set_use_markup(true);
button.add(&label);
DynamicString::new(&text, move |string| {
dynamic_string(&text, move |string| {
label.set_markup(&string);
Continue(true)
});

4
src/modules/custom/image.rs
View file

@ -1,6 +1,6 @@
use super::{CustomWidget, CustomWidgetContext};
use crate::build;
use crate::dynamic_string::DynamicString;
use crate::dynamic_value::dynamic_string;
use crate::image::ImageProvider;
use gtk::prelude::*;
use gtk::Image;
@ -29,7 +29,7 @@ impl CustomWidget for ImageWidget {
let gtk_image = gtk_image.clone();
let icon_theme = context.icon_theme.clone();
DynamicString::new(&self.src, move |src| {
dynamic_string(&self.src, move |src| {
ImageProvider::parse(&src, &icon_theme, self.size)
.map(|image| image.load_into_image(gtk_image.clone()));

4
src/modules/custom/label.rs
View file

@ -1,6 +1,6 @@
use super::{CustomWidget, CustomWidgetContext};
use crate::build;
use crate::dynamic_string::DynamicString;
use crate::dynamic_value::dynamic_string;
use gtk::prelude::*;
use gtk::Label;
use serde::Deserialize;
@ -22,7 +22,7 @@ impl CustomWidget for LabelWidget {
{
let label = label.clone();
DynamicString::new(&self.label, move |string| {
dynamic_string(&self.label, move |string| {
label.set_markup(&string);
Continue(true)
});

4
src/modules/custom/progress.rs
View file

@ -1,5 +1,5 @@
use super::{try_get_orientation, CustomWidget, CustomWidgetContext};
use crate::dynamic_string::DynamicString;
use crate::dynamic_value::dynamic_string;
use crate::modules::custom::set_length;
use crate::script::{OutputStream, Script, ScriptInput};
use crate::{build, send};
@ -69,7 +69,7 @@ impl CustomWidget for ProgressWidget {
let progress = progress.clone();
progress.set_show_text(true);
DynamicString::new(&text, move |string| {
dynamic_string(&text, move |string| {
progress.set_text(Some(&string));
Continue(true)
});

4
src/modules/label.rs
View file

@ -1,5 +1,5 @@
use crate::config::CommonConfig;
use crate::dynamic_string::DynamicString;
use crate::dynamic_value::dynamic_string;
use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
use crate::try_send;
use color_eyre::Result;
@ -31,7 +31,7 @@ impl Module<Label> for LabelModule {
tx: mpsc::Sender<ModuleUpdateEvent<Self::SendMessage>>,
_rx: mpsc::Receiver<Self::ReceiveMessage>,
) -> Result<()> {
DynamicString::new(&self.label, move |string| {
dynamic_string(&self.label, move |string| {
try_send!(tx, ModuleUpdateEvent::Update(string));
Continue(true)
});