RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1978 from kpanuragh/master

pull/1722/head^2
Alex 2023-02-09 13:25:15 +01:00 committed by GitHub
parent 9049de583e 74a8464c09
commit 286a3c70f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/waybar-image.5.scd
View File

@ -13,7 +13,10 @@ The *image* module displays an image from a path.
*path*: ++ *path*: ++
typeof: string ++ typeof: string ++
The path to the image. The path to the image.
*exec*: ++
typeof: string ++
The path to the script, which should return image path file
it will only execute if the path is not set
*size*: ++ *size*: ++
typeof: integer ++ typeof: integer ++
The width/height to render the image. The width/height to render the image.

17
src/modules/image.cpp
View File

@ -11,7 +11,6 @@ waybar::modules::Image::Image(const std::string& id, const Json::Value& config)
dp.emit(); dp.emit();
path_ = config["path"].asString();
size_ = config["size"].asInt(); size_ = config["size"].asInt();
interval_ = config_["interval"].asInt(); interval_ = config_["interval"].asInt();
@ -42,8 +41,22 @@ void waybar::modules::Image::refresh(int sig) {
} }
auto waybar::modules::Image::update() -> void { auto waybar::modules::Image::update() -> void {
Glib::RefPtr<Gdk::Pixbuf> pixbuf; util::command::res output_;
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
if(config_["path"].isString())
{
path_ = config_["path"].asString();
}
else if(config_["exec"].isString())
{
output_ = util::command::exec(config_["exec"].asString());
path_ =output_.out;
}
else
{
path_="";
}
if (Glib::file_test(path_, Glib::FILE_TEST_EXISTS)) if (Glib::file_test(path_, Glib::FILE_TEST_EXISTS))
pixbuf = Gdk::Pixbuf::create_from_file(path_, size_, size_); pixbuf = Gdk::Pixbuf::create_from_file(path_, size_, size_);
else else