lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code: clone macro: Use convenience attributes instead of upgrade_or_else

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/412>
This commit is contained in:
Fina Wilke 2024-06-23 22:28:16 +02:00 • committed by Sophie Herold
parent 6385658169
commit 5956aa6460
6 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/widgets/image/input_handling.rs
View file

@ -73,8 +73,8 @@ impl imp::LpImage {
scroll_controller.connect_scroll(glib::clone!( scroll_controller.connect_scroll(glib::clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or]
|| glib::Propagation::Proceed, glib::Propagation::Proceed,
move |event, _, y| { move |event, _, y| {
let imp = obj.imp(); let imp = obj.imp();
let state = event.current_event_state(); let state = event.current_event_state();

4
src/widgets/image/loading.rs
View file

@ -120,8 +120,8 @@ impl imp::LpImage {
let callback_id = obj.add_tick_callback(glib::clone!( let callback_id = obj.add_tick_callback(glib::clone!(
#[weak(rename_to = obj)] #[weak(rename_to = obj)]
self, self,
#[upgrade_or_else] #[upgrade_or]
|| glib::ControlFlow::Break, glib::ControlFlow::Break,
move |_, clock| obj.tick_callback(clock) move |_, clock| obj.tick_callback(clock)
)); ));
self.tick_callback.replace(Some(callback_id)); self.tick_callback.replace(Some(callback_id));

3
src/widgets/image_view.rs
View file

@ -190,8 +190,7 @@ mod imp {
self.drag_source.connect_prepare(glib::clone!( self.drag_source.connect_prepare(glib::clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or_default]
|| None,
move |gesture, _, _| { move |gesture, _, _| {
let is_scrollable = obj let is_scrollable = obj
.current_page() .current_page()

3
src/widgets/properties_view.rs
View file

@ -129,8 +129,7 @@ mod imp {
glib::clone!( glib::clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or_default]
|| None,
move |_| { move |_| {
obj.imp().update(); obj.imp().update();
None None

4
src/widgets/sliding_view.rs
View file

@ -195,8 +195,8 @@ mod imp {
scroll_controller.connect_scroll(glib::clone!( scroll_controller.connect_scroll(glib::clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or]
|| glib::Propagation::Proceed, glib::Propagation::Proceed,
move |_, x, _| { move |_, x, _| {
let direction_sign = if obj.imp().is_rtl() { -1. } else { 1. }; let direction_sign = if obj.imp().is_rtl() { -1. } else { 1. };

11
src/window.rs
View file

@ -279,8 +279,7 @@ mod imp {
glib::clone!( glib::clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or_default]
|| None,
move |_| { move |_| {
obj.update_title(); obj.update_title();
None None
@ -389,8 +388,8 @@ mod imp {
self.drop_target.connect_accept(clone!( self.drop_target.connect_accept(clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or]
|| false, false,
move |_drop_target, drop| { move |_drop_target, drop| {
// Only accept drops from external sources or different windows // Only accept drops from external sources or different windows
let different_source = drop.drag().is_none() let different_source = drop.drag().is_none()
@ -409,8 +408,8 @@ mod imp {
self.drop_target.connect_drop(clone!( self.drop_target.connect_drop(clone!(
#[weak] #[weak]
obj, obj,
#[upgrade_or_else] #[upgrade_or]
|| false, false,
move |_, value, _, _| { move |_, value, _, _| {
// Here we use a GValue, which is a dynamic object that can hold different // Here we use a GValue, which is a dynamic object that can hold different
// types, e.g. strings, numbers, or in this case objects. In // types, e.g. strings, numbers, or in this case objects. In