pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding the GtkRevealer widget (#194)

Browse source 
* widgets: new gtk_releaver builder

* correcting notes

* re: review

* re:re: using utils

* re:re:re:indent 🙏

Co-authored-by: Bryan Ndjeutcha <ndjeutcha@gmail.com>
This commit is contained in:
snakedye 2021-06-22 14:51:51 -04:00 • committed by GitHub
parent 61e42c9c8a
commit 9865e4ff9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/widgets/widget_definitions.rs
View file

@ -1,6 +1,6 @@
#![allow(clippy::option_map_unit_fn)]
use super::{run_command, BuilderArgs};
use crate::{config, eww_state, resolve_block, value::AttrVal, widgets::widget_node};
use crate::{config, eww_state, resolve_block, value::AttrVal, widgets::widget_node, util::parse_duration};
use anyhow::*;
use gdk::WindowExt;
use glib;
@ -28,6 +28,7 @@ pub(super) fn widget_to_gtk_widget(bargs: &mut BuilderArgs) -> Result<Option<gtk
"color-chooser" => build_gtk_color_chooser(bargs)?.upcast(),
"combo-box-text" => build_gtk_combo_box_text(bargs)?.upcast(),
"checkbox" => build_gtk_checkbox(bargs)?.upcast(),
"revealer" => build_gtk_revealer(bargs)?.upcast(),
"if-else" => build_if_else(bargs)?.upcast(),
_ => return Ok(None),
};
@ -260,10 +261,25 @@ fn build_gtk_combo_box_text(bargs: &mut BuilderArgs) -> Result<gtk::ComboBoxText
fn build_gtk_expander(bargs: &mut BuilderArgs) -> Result<gtk::Expander> {
let gtk_widget = gtk::Expander::new(None);
resolve_block!(bargs, gtk_widget, {
// @prop name - name of the expander
prop(name: as_string) {gtk_widget.set_label(Some(&name));},
// @prop expanded - sets if the tree is expanded
prop(expanded: as_bool) { gtk_widget.set_expanded(expanded); }
// @prop name - name of the expander
prop(name: as_string) {gtk_widget.set_label(Some(&name));},
// @prop expanded - sets if the tree is expanded
prop(expanded: as_bool) { gtk_widget.set_expanded(expanded); }
});
Ok(gtk_widget)
}
/// @widget revealer extends container
/// @desc A widget that can reveal a child with an animation.
fn build_gtk_revealer(bargs: &mut BuilderArgs) -> Result<gtk::Revealer> {
let gtk_widget = gtk::Revealer::new();
resolve_block!(bargs, gtk_widget, {
// @prop transition - the name of the transition. Possible values: $transition
prop(transition: as_string) { gtk_widget.set_transition_type(parse_transition(&transition)?); },
// @prop reveal - sets if the child is revealed or not
prop(reveal: as_bool) { gtk_widget.set_reveal_child(reveal); },
// @prop duration - the duration of the reveal transition
prop(duration: as_string) { gtk_widget.set_transition_duration(parse_duration(&duration)?.as_millis() as u32); },
});
Ok(gtk_widget)
}
@ -559,6 +575,19 @@ fn parse_orientation(o: &str) -> Result<gtk::Orientation> {
})
}
/// @var transition - "slideright", "slideleft", "slideup", "slidedown", "crossfade", "none"
fn parse_transition(t: &str) -> Result<gtk::RevealerTransitionType> {
Ok(match t {
"slideright" => gtk::RevealerTransitionType::SlideRight,
"slideleft" => gtk::RevealerTransitionType::SlideLeft,
"slideup" => gtk::RevealerTransitionType::SlideUp,
"slidedown" => gtk::RevealerTransitionType::SlideDown,
"crossfade" => gtk::RevealerTransitionType::Crossfade,
"none" => gtk::RevealerTransitionType::None,
_ => bail!(r#"Couldn't parse transition: '{}'. Possible values are "slideright", "slideleft", "slideup", "slidedown", "crossfade" and "none" "#, t),
})
}
/// @var alignment - "fill", "baseline", "center", "start", "end"
fn parse_align(o: &str) -> Result<gtk::Align> {
Ok(match o {