Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

subclass/widget: Implement default handling for parent events #921

Merged
merged 2 commits into from
Dec 7, 2019
Merged

subclass/widget: Implement default handling for parent events #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea45775
subclass/{widget, application, dialog, window, container}: Implement …
alatiera Dec 3, 2019
c38889e
subclass/window: widget in set_focus should be Nullable
alatiera Dec 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/subclass/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ impl<T: GtkApplicationImpl + ObjectImpl> GtkApplicationImplExt for T {
let data = self.get_type_data();
let parent_class =
data.as_ref().get_parent_class() as *mut gtk_sys::GtkApplicationClass;
let f = (*parent_class)
.window_added
.expect("No parent class implementation for \"window_added\"");
f(application.to_glib_none().0, window.to_glib_none().0)
if let Some(f) = (*parent_class).window_added {
f(application.to_glib_none().0, window.to_glib_none().0)
}
}
}

Expand All @@ -43,10 +42,9 @@ impl<T: GtkApplicationImpl + ObjectImpl> GtkApplicationImplExt for T {
let data = self.get_type_data();
let parent_class =
data.as_ref().get_parent_class() as *mut gtk_sys::GtkApplicationClass;
let f = (*parent_class)
.window_removed
.expect("No parent class implementation for \"window_added\"");
f(application.to_glib_none().0, window.to_glib_none().0)
if let Some(f) = (*parent_class).window_removed {
f(application.to_glib_none().0, window.to_glib_none().0)
}
}
}
}
Expand Down
37 changes: 17 additions & 20 deletions src/subclass/container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,54 +51,51 @@ impl<T: ContainerImpl + ObjectImpl> ContainerImplExt for T {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkContainerClass;
let f = (*parent_class)
.add
.expect("No parent class impl for \"add\"");
f(container.to_glib_none().0, widget.to_glib_none().0)
if let Some(f) = (*parent_class).add {
f(container.to_glib_none().0, widget.to_glib_none().0)
}
}
}

fn parent_remove(&self, container: &Container, widget: &Widget) {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkContainerClass;
let f = (*parent_class)
.remove
.expect("No parent class impl for \"remove\"");
f(container.to_glib_none().0, widget.to_glib_none().0)
if let Some(f) = (*parent_class).remove {
f(container.to_glib_none().0, widget.to_glib_none().0)
}
}
}

fn parent_check_resize(&self, container: &Container) {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkContainerClass;
let f = (*parent_class)
.check_resize
.expect("No parent class impl for \"check_resize\"");
f(container.to_glib_none().0)
if let Some(f) = (*parent_class).check_resize {
f(container.to_glib_none().0)
}
}
}

fn parent_set_focus_child(&self, container: &Container, widget: Option<&Widget>) {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkContainerClass;
let f = (*parent_class)
.set_focus_child
.expect("No parent class impl for \"set_focus_child\"");
f(container.to_glib_none().0, widget.to_glib_none().0)
if let Some(f) = (*parent_class).set_focus_child {
f(container.to_glib_none().0, widget.to_glib_none().0)
}
}
}

fn parent_child_type(&self, container: &Container) -> glib::Type {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkContainerClass;
let f = (*parent_class)
.child_type
.expect("No parent class impl for \"child_type\"");
from_glib(f(container.to_glib_none().0))
if let Some(f) = (*parent_class).child_type {
from_glib(f(container.to_glib_none().0))
alatiera marked this conversation as resolved.
Show resolved Hide resolved
} else {
glib::Type::Unit
}
}
}

Expand Down
14 changes: 6 additions & 8 deletions src/subclass/dialog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,19 @@ impl<T: DialogImpl + ObjectImpl> DialogImplExt for T {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkDialogClass;
let f = (*parent_class)
.response
.expect("No parent class impl for \"response\"");
f(dialog.to_glib_none().0, response.to_glib())
if let Some(f) = (*parent_class).response {
f(dialog.to_glib_none().0, response.to_glib())
}
}
}

fn parent_close(&self, dialog: &Dialog) {
unsafe {
let data = self.get_type_data();
let parent_class = data.as_ref().get_parent_class() as *mut gtk_sys::GtkDialogClass;
let f = (*parent_class)
.close
.expect("No parent class impl for \"close\"");
f(dialog.to_glib_none().0)
if let Some(f) = (*parent_class).close {
f(dialog.to_glib_none().0)
}
}
}
}
Expand Down
Loading