refactor(ribir): 💡 add a Query derive macro

core/src/builtin_widgets/align.rs

@@ -54,14 +54,14 @@ pub enum VAlign {
 }
 
 /// A widget that align its child in x-axis, base on child's width.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct HAlignWidget {
   #[declare(default, builtin)]
   pub h_align: HAlign,
 }
 
 /// A widget that align its child in y-axis, base on child's height.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct VAlignWidget {
   #[declare(default, builtin)]
   pub v_align: VAlign,
@@ -91,8 +91,6 @@ impl Render for HAlignWidget {
   }
 }
 
-crate::impl_query_self_only!(HAlignWidget);
-
 impl Render for VAlignWidget {
   fn perform_layout(&self, mut clamp: BoxClamp, ctx: &mut LayoutCtx) -> Size {
     let mut layouter = ctx.assert_single_child_layouter();
@@ -117,8 +115,6 @@ impl Render for VAlignWidget {
   }
 }
 
-crate::impl_query_self_only!(VAlignWidget);
-
 impl Align {
   pub fn align_value(self, child_size: f32, box_size: f32) -> f32 {
     match self {

core/src/builtin_widgets/anchor.rs

@@ -11,39 +11,34 @@ pub enum PositionUnit {
 }
 
 /// Widget use to anchor child constraints with the left edge of parent widget.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct LeftAnchor {
   #[declare(builtin, default = 0.)]
   pub left_anchor: PositionUnit,
 }
 
 /// Widget use to anchor child constraints with the right edge of parent widget.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct RightAnchor {
   #[declare(builtin, default = 0.)]
   pub right_anchor: PositionUnit,
 }
 
 /// Widget use to anchor child constraints with the top edge of parent widget.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct TopAnchor {
   #[declare(builtin, default = 0.)]
   pub top_anchor: PositionUnit,
 }
 
 /// Widget use to anchor child constraints with the bottom edge of parent
 /// widget.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct BottomAnchor {
   #[declare(builtin, default = 0.)]
   pub bottom_anchor: PositionUnit,
 }
 
-crate::impl_query_self_only!(LeftAnchor);
-crate::impl_query_self_only!(TopAnchor);
-crate::impl_query_self_only!(RightAnchor);
-crate::impl_query_self_only!(BottomAnchor);
-
 impl Render for LeftAnchor {
   fn perform_layout(&self, clamp: BoxClamp, ctx: &mut LayoutCtx) -> Size {
     let mut layouter = ctx.assert_single_child_layouter();

core/src/builtin_widgets/box_decoration.rs

@@ -1,7 +1,7 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 /// The BoxDecoration provides a variety of ways to draw a box.
-#[derive(SingleChild, Default, Clone, Declare2)]
+#[derive(SingleChild, Default, Clone, Declare2, Query)]
 pub struct BoxDecoration {
   /// The background of the box.
   #[declare(builtin, default)]
@@ -59,8 +59,6 @@ impl Render for BoxDecoration {
   }
 }
 
-impl_query_self_only!(BoxDecoration);
-
 impl BoxDecoration {
   fn paint_border(&self, painter: &mut Painter, rect: &Rect) {
     if self.border.is_none() {

core/src/builtin_widgets/clip.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 #[derive(Clone, Default)]
 pub enum ClipType {
@@ -7,7 +7,7 @@ pub enum ClipType {
   Path(Path),
 }
 
-#[derive(SingleChild, Clone, Declare2)]
+#[derive(SingleChild, Query, Clone, Declare2)]
 pub struct Clip {
   #[declare(default)]
   pub clip: ClipType,
@@ -40,5 +40,3 @@ impl Render for Clip {
     ctx.painter().clip(path);
   }
 }
-
-impl_query_self_only!(Clip);

core/src/builtin_widgets/delay_drop.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 /// A widget that can delay drop its child until the `delay_drop_until` field be
 /// set to `true`.
@@ -12,7 +12,7 @@ use crate::{impl_query_self_only, prelude::*};
 /// dropped.
 ///
 /// It's useful when you need run a leave animation for a widget.
-#[derive(Declare2)]
+#[derive(Declare2, Query)]
 pub struct DelayDrop {
   #[declare(builtin)]
   pub delay_drop_until: bool,
@@ -28,5 +28,3 @@ impl ComposeChild for DelayDrop {
     }
   }
 }
-
-impl_query_self_only!(DelayDrop);

core/src/builtin_widgets/fitted_box.rs

@@ -19,7 +19,7 @@ pub enum BoxFit {
 }
 
 /// Widget set how its child should be scale to fit its box.
-#[derive(Declare2, SingleChild)]
+#[derive(Declare2, Query, SingleChild)]
 pub struct FittedBox {
   #[declare(builtin)]
   pub box_fit: BoxFit,
@@ -74,8 +74,6 @@ impl Render for FittedBox {
   fn get_transform(&self) -> Option<Transform> { Some(self.scale_cache.get()) }
 }
 
-crate::impl_query_self_only!(FittedBox);
-
 #[cfg(test)]
 mod tests {
   use super::*;

core/src/builtin_widgets/focus_node.rs

@@ -1,10 +1,9 @@
 use crate::{
   events::focus_mgr::{FocusHandle, FocusType},
-  impl_query_self_only,
   prelude::*,
 };
 
-#[derive(Default, Declare2)]
+#[derive(Default, Query, Declare2)]
 pub struct FocusNode {
   /// Indicates that `widget` can be focused, and where it participates in
   /// sequential keyboard navigation (usually with the Tab key, hence the name.
@@ -75,9 +74,7 @@ impl ComposeChild for FocusNode {
   }
 }
 
-impl_query_self_only!(FocusNode);
-
-#[derive(Declare2)]
+#[derive(Declare2, Query)]
 pub struct RequestFocus {
   #[declare(default)]
   handle: Option<FocusHandle>,
@@ -112,8 +109,6 @@ impl RequestFocus {
   }
 }
 
-impl_query_self_only!(RequestFocus);
-
 #[cfg(test)]
 mod tests {
   use super::*;

core/src/builtin_widgets/focus_scope.rs

@@ -1,6 +1,6 @@
-use crate::{events::focus_mgr::FocusType, impl_query_self_only, prelude::*};
+use crate::{events::focus_mgr::FocusType, prelude::*};
 
-#[derive(Declare2, Clone, Default)]
+#[derive(Declare2, Query, Clone, Default)]
 pub struct FocusScope {
   /// If true, the descendants can not be focused.
   /// Default value is false, then the hold FocusScope subtree can be focused
@@ -28,8 +28,6 @@ impl ComposeChild for FocusScope {
   }
 }
 
-impl_query_self_only!(FocusScope);
-
 #[cfg(test)]
 mod tests {
   use winit::{

core/src/builtin_widgets/ignore_pointer.rs

@@ -1,6 +1,6 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
-#[derive(Declare2, SingleChild, Clone)]
+#[derive(Declare2, SingleChild, Query, Clone)]
 pub struct IgnorePointer {
   #[declare(default = true)]
   pub ignore: bool,
@@ -23,8 +23,6 @@ impl Render for IgnorePointer {
   }
 }
 
-impl_query_self_only!(IgnorePointer);
-
 impl IgnorePointer {
   #[inline]
   pub fn new(ignore: bool) -> Self { Self { ignore } }

core/src/builtin_widgets/image_widget.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 use ribir_geom::{Rect, Size};
 
 impl Render for ShareResource<PixelImage> {
@@ -17,4 +17,6 @@ impl Render for ShareResource<PixelImage> {
   }
 }
 
-impl_query_self_only!(ShareResource<PixelImage>);
+impl Query for ShareResource<PixelImage> {
+  crate::widget::impl_query_self_only!();
+}

core/src/builtin_widgets/key.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 use std::{
   cmp::{Eq, Ord, PartialOrd},
   fmt::Debug,
@@ -94,7 +94,9 @@ impl<V: 'static + Default + Clone + PartialEq> ComposeChild for KeyWidget<V> {
   }
 }
 
-impl_query_self_only!(Box<dyn AnyKey>);
+impl Query for Box<dyn AnyKey> {
+  crate::widget::impl_query_self_only!();
+}
 
 impl<V> KeyWidget<V>
 where

core/src/builtin_widgets/lifecycle.rs

@@ -1,15 +1,12 @@
-use crate::{
-  impl_all_event, impl_compose_child_for_listener, impl_query_self_only, prelude::*,
-  window::WindowId,
-};
+use crate::{impl_all_event, impl_compose_child_for_listener, prelude::*, window::WindowId};
 use rxrust::prelude::*;
 use std::{convert::Infallible, rc::Rc};
 
 define_widget_context!(LifecycleEvent);
 
 pub type LifecycleSubject = MutRefItemSubject<'static, AllLifecycle, Infallible>;
 
-#[derive(Default)]
+#[derive(Default, Query)]
 pub struct LifecycleListener {
   lifecycle: LifecycleSubject,
 }
@@ -84,8 +81,6 @@ impl LifecycleListener {
   fn subject(&mut self) -> LifecycleSubject { self.lifecycle.clone() }
 }
 
-impl_query_self_only!(LifecycleListener);
-
 impl EventListener for LifecycleListener {
   type Event = AllLifecycle;
   #[inline]

core/src/builtin_widgets/margin.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 #[derive(Debug, Copy, Clone, Default, PartialEq, Lerp)]
 pub struct EdgeInsets {
@@ -9,7 +9,7 @@ pub struct EdgeInsets {
 }
 
 /// A widget that create space around its child.
-#[derive(SingleChild, Default, Clone, PartialEq, Declare2)]
+#[derive(SingleChild, Default, Query, Clone, PartialEq, Declare2)]
 pub struct Margin {
   #[declare(builtin, default)]
   pub margin: EdgeInsets,
@@ -37,8 +37,6 @@ impl Render for Margin {
   fn paint(&self, _: &mut PaintingCtx) {}
 }
 
-impl_query_self_only!(Margin);
-
 impl Margin {
   #[inline]
   pub fn new(margin: EdgeInsets) -> Self { Self { margin } }

core/src/builtin_widgets/opacity.rs

@@ -1,14 +1,11 @@
-use crate::impl_query_self_only;
 use crate::prelude::*;
 
-#[derive(Declare2, Default, Clone, SingleChild)]
+#[derive(Declare2, Default, Query, Clone, SingleChild)]
 pub struct Opacity {
   #[declare(builtin, default = 1.)]
   pub opacity: f32,
 }
 
-impl_query_self_only!(Opacity);
-
 impl Render for Opacity {
   #[inline]
   fn perform_layout(&self, clamp: BoxClamp, ctx: &mut LayoutCtx) -> Size {

core/src/builtin_widgets/padding.rs

@@ -1,7 +1,7 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 /// A widget that insets its child by the given padding.
-#[derive(SingleChild, Clone, Declare2)]
+#[derive(SingleChild, Query, Clone, Declare2)]
 pub struct Padding {
   #[declare(builtin)]
   pub padding: EdgeInsets,
@@ -52,8 +52,6 @@ impl Render for Padding {
   fn paint(&self, _: &mut PaintingCtx) {}
 }
 
-impl_query_self_only!(Padding);
-
 impl Padding {
   #[inline]
   pub fn new(padding: EdgeInsets) -> Self { Self { padding } }

core/src/builtin_widgets/scrollable.rs

@@ -116,10 +116,7 @@ impl ScrollableWidget {
 
 #[cfg(test)]
 mod tests {
-  use crate::{
-    impl_query_self_only,
-    test_helper::{MockBox, TestWindow},
-  };
+  use crate::test_helper::{MockBox, TestWindow};
 
   use super::*;
   use winit::event::{DeviceId, ModifiersState, MouseScrollDelta, TouchPhase, WindowEvent};
@@ -178,7 +175,7 @@ mod tests {
     test_assert(Scrollable::Both, 100., 100., 0., 0.);
   }
 
-  #[derive(SingleChild, Declare2, Clone)]
+  #[derive(SingleChild, Query, Declare2, Clone)]
   pub struct FixedBox {
     pub size: Size,
   }
@@ -194,8 +191,6 @@ mod tests {
     fn paint(&self, _: &mut PaintingCtx) {}
   }
 
-  impl_query_self_only!(FixedBox);
-
   #[test]
   fn scroll_content_expand() {
     let _guard = unsafe { AppCtx::new_lock_scope() };

core/src/builtin_widgets/svg.rs

@@ -1,4 +1,4 @@
-use crate::{impl_query_self_only, prelude::*};
+use crate::prelude::*;
 
 impl Render for Svg {
   #[inline]
@@ -11,4 +11,6 @@ impl Render for Svg {
   }
 }
 
-impl_query_self_only!(Svg);
+impl Query for Svg {
+  crate::widget::impl_query_self_only!();
+}