diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b8ad175..182f85f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to eww will be listed here, starting at changes since versio ## [Unreleased] ### Features +- Add `:icon` and `:icon-size` to the image widget (By: Adrian Perez de Castro) - Add `:namespace` window option - Default to building with x11 and wayland support simultaneously - Add `truncate-left` property on `label` widgets (By: kawaki-san) diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs index 07a081d3..d26ce244 100644 --- a/crates/eww/src/widgets/widget_definitions.rs +++ b/crates/eww/src/widgets/widget_definitions.rs @@ -507,6 +507,18 @@ fn build_gtk_button(bargs: &mut BuilderArgs) -> Result { Ok(gtk_widget) } +/// @var icon-size - "menu", "small-toolbar", "toolbar", "large-toolbar", "button", "dnd", "dialog" +fn parse_icon_size(o: &str) -> Result { + enum_parse! { "icon-size", o, + "menu" => gtk::IconSize::Menu, + "small-toolbar" | "toolbar" => gtk::IconSize::SmallToolbar, + "large-toolbar" => gtk::IconSize::LargeToolbar, + "button" => gtk::IconSize::Button, + "dnd" => gtk::IconSize::Dnd, + "dialog" => gtk::IconSize::Dialog, + } +} + const WIDGET_NAME_IMAGE: &str = "image"; /// @widget image /// @desc A widget displaying an image @@ -524,7 +536,12 @@ fn build_gtk_image(bargs: &mut BuilderArgs) -> Result { let pixbuf = gtk::gdk_pixbuf::Pixbuf::from_file_at_size(std::path::PathBuf::from(path), image_width, image_height)?; gtk_widget.set_from_pixbuf(Some(&pixbuf)); } - } + }, + // @prop icon - name of a theme icon + // @prop icon-size - size of the theme icon + prop(icon: as_string, icon_size: as_string = "button") { + gtk_widget.set_from_icon_name(Some(&icon), parse_icon_size(&icon_size)?); + }, }); Ok(gtk_widget) }