YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-01 17:15:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove extra getters, give names to gobjects

Browse source
This commit is contained in:
yggverse 2024-12-09 21:26:47 +02:00
parent ccbc82d2f5
commit ff3f064534
12 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/app/browser/window/tab/item/action/ident.rs
View file

@ -2,7 +2,7 @@ use gtk::{gio::SimpleAction, glib::uuid_string_random, prelude::ActionExt};
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Ident` action of `Item` group
pub struct Ident {
gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Ident {
@ -11,7 +11,7 @@ impl Ident {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(&uuid_string_random(), None),
simple_action: SimpleAction::new(&uuid_string_random(), None),
}
}
@ -20,7 +20,7 @@ impl Ident {
/// Emit [activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
/// with formatted for this action [Variant](https://docs.gtk.org/glib/struct.Variant.html) value
pub fn activate(&self) {
self.gobject.activate(None);
self.simple_action.activate(None);
}
// Events
@ -28,12 +28,6 @@ impl Ident {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn() + 'static) {
self.gobject.connect_activate(move |_, _| callback());
}
// Getters
pub fn gobject(&self) -> &SimpleAction {
&self.gobject
self.simple_action.connect_activate(move |_, _| callback());
}
}

8
src/app/browser/window/tab/item/action/load.rs
View file

@ -6,7 +6,7 @@ use gtk::{
/// [SimpleAction](https://docs.gtk.org/gio/class.SimpleAction.html) wrapper for `Load` action of `Item` group
pub struct Load {
gobject: SimpleAction,
pub simple_action: SimpleAction,
}
impl Load {
@ -15,7 +15,7 @@ impl Load {
/// Create new `Self`
pub fn new() -> Self {
Self {
gobject: SimpleAction::new(
simple_action: SimpleAction::new(
&uuid_string_random(),
Some(&<(String, bool)>::static_variant_type()),
),
@ -27,7 +27,7 @@ impl Load {
/// Emit [activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
/// with formatted for this action [Variant](https://docs.gtk.org/glib/struct.Variant.html) value
pub fn activate(&self, request: Option<&str>, is_history: bool) {
self.gobject.activate(Some(
self.simple_action.activate(Some(
&(
match request {
Some(value) => String::from(value),
@ -44,7 +44,7 @@ impl Load {
/// Define callback function for
/// [SimpleAction::activate](https://docs.gtk.org/gio/signal.SimpleAction.activate.html) signal
pub fn connect_activate(&self, callback: impl Fn(Option<GString>, bool) + 'static) {
self.gobject.connect_activate(move |_, this| {
self.simple_action.connect_activate(move |_, this| {
let (request, is_history) = this
.expect("Expected (`request`,`is_history`) variant")
.get::<(String, bool)>()