zedfrigg/zoodex
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Introduce image UI macro, require explicit borrowing in UI macros

Browse source
This commit is contained in:
Reinout Meliesie 2025-02-07 13:36:14 +01:00
commit 38adb5f4b9
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
7 changed files with 88 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/ui/utility.rs
View file

@ -32,9 +32,9 @@ macro_rules ! g_box { (
$ ( container . set_spacing ( $ spacing ) ; ) ?
$ ( container . set_margin_top ( $ margin_top ) ; ) ?
$ ( container . set_margin_bottom ( $ margin_bottom ) ; ) ?
$ ( container . set_widget_name ( & $ widget_name ) ; ) ?
$ ( container . set_css_classes ( & $ css_classes ) ; ) ?
$ ( container . append ( & $ child ) ; ) *
$ ( container . set_widget_name ( $ widget_name ) ; ) ?
$ ( container . set_css_classes ( $ css_classes ) ; ) ?
$ ( container . append ( $ child ) ; ) *
container
} } }
@ -52,7 +52,7 @@ macro_rules ! list_box { (
) => { {
let container = gtk4 :: ListBox :: new () ;
$ ( container . connect_row_activated ( $ connect_row_activated ) ; ) ?
$ ( container . append ( & $ child ) ; ) *
$ ( container . append ( $ child ) ; ) *
container
} } }
@ -61,8 +61,8 @@ macro_rules ! split_button { (
$ child : expr $ (,) ?
) => { {
let widget = libadwaita :: SplitButton :: new () ;
$ ( widget . set_popover ( Some ( & $ popover ) ) ; ) ?
widget . set_child ( Some ( & $ child ) ) ;
$ ( widget . set_popover ( Some ( $ popover ) ) ; ) ?
widget . set_child ( Some ( $ child ) ) ;
widget
} } }
@ -71,14 +71,28 @@ macro_rules ! popover { (
$ child : expr $ (,) ?
) => { {
let widget = gtk4 :: Popover :: new () ;
$ ( widget . set_css_classes ( & $ css_classes ) ; ) ?
widget . set_child ( Some ( & $ child ) ) ;
$ ( widget . set_css_classes ( $ css_classes ) ; ) ?
widget . set_child ( Some ( $ child ) ) ;
widget
} } }
macro_rules ! icon { ( $ icon_name : expr ) => {
gtk4 :: Image :: from_icon_name ( $ icon_name )
} }
macro_rules ! image { (
$ ( @ icon_name : $ icon_name : expr ; ) ?
$ ( @ paintable : $ paintable : expr ; ) ?
$ ( @ width_request : $ width_request : expr ; ) ?
$ ( @ height_request : $ height_request : expr ; ) ?
$ ( @ margin_top : $ margin_top : expr ; ) ?
$ ( @ margin_bottom : $ margin_bottom : expr ; ) ?
) => { {
let image = gtk4 :: Image :: new () ;
$ ( image . set_icon_name ( Some ( $ icon_name ) ) ; ) ?
$ ( image . set_paintable ( Some ( $ paintable ) ) ; ) ?
$ ( image . set_width_request ( $ width_request ) ; ) ?
$ ( image . set_height_request ( $ height_request ) ; ) ?
$ ( image . set_margin_top ( $ margin_top ) ; ) ?
$ ( image . set_margin_bottom ( $ margin_bottom ) ; ) ?
image
} } }
macro_rules ! scrolled_window { (
$ ( @ propagate_natural_height : $ propagate_natural_height : expr ; ) ?
@ -86,7 +100,7 @@ macro_rules ! scrolled_window { (
) => { {
let widget = gtk4 :: ScrolledWindow :: new () ;
$ ( widget . set_propagate_natural_height ( $ propagate_natural_height ) ; ) ?
widget . set_child ( Some ( & $ child ) ) ;
widget . set_child ( Some ( $ child ) ) ;
widget
} } }
@ -108,13 +122,13 @@ macro_rules ! view_switcher { (
) => { {
let widget = libadwaita :: ViewSwitcher :: new () ;
$ ( widget . set_policy ( $ policy ) ; ) ?
widget . set_stack ( Some ( & $ stack ) ) ;
widget . set_stack ( Some ( $ stack ) ) ;
widget
} } }
macro_rules ! header_bar { ( $ title_widget : expr $ (,) ? ) => { {
let widget = libadwaita :: HeaderBar :: new () ;
widget . set_title_widget ( Some ( & $ title_widget ) ) ;
widget . set_title_widget ( Some ( $ title_widget ) ) ;
widget
} } }
@ -133,7 +147,7 @@ macro_rules ! application_window { (
let window = libadwaita :: ApplicationWindow :: new ( $ application ) ;
window . set_title ( Some ( $ title ) ) ;
window . set_content ( Some ( & $ content ) ) ;
window . set_content ( Some ( $ content ) ) ;
window
} } }
@ -141,7 +155,7 @@ macro_rules ! vertically_filling { ( $ child : expr ) => {
g_box ! (
@ orientation : gtk4 :: Orientation :: Vertical ;
$ child ,
bin ! ( @ vexpand : true ; ) ,
& bin ! ( @ vexpand : true ; ) ,
)
} }
@ -168,7 +182,7 @@ pub (crate) use {
list_box ,
split_button ,
popover ,
icon ,
image ,
scrolled_window ,
flow_box ,
view_switcher ,