fix attachment list layout

diff --git a/application/note/src/window.rs b/application/note/src/window.rs
index 19c3c590ae4ce902aa2931e5a7c8190a29ad6c61..6d877a416c33c64476d3ee5bba93e21e3c3e5c0f 100644 (file)
--- a/application/note/src/window.rs
+++ b/application/note/src/window.rs
@@ -288,9 +288,10 @@ pub fn create_window(app: &App, ctx: &AppContext<MainWindow>) -> UiObject<MainWi
                         button!(obj, label = "Close", action = "note_title_close");
                     });
                     hbox!(obj, visibility_states = &[AppStates::NoteHasAttachments], margin = 10, spacing = 4, |obj|{
-                        let mut w = scrolledwindow!(obj, |obj|{
+                        let mut w = scrolledwindow!(obj, fill = true, |obj|{
                             obj.itemlist::<Attachment>()
                                 .varname("note_attachments")
+                                .container(SubContainer::HBox)
                                 .createui(|obj, data, _i|{
                                     let imgviewer = imageviewer!(obj,
                                             scrollview = false,
@@ -299,6 +300,7 @@ pub fn create_window(app: &App, ctx: &AppContext<MainWindow>) -> UiObject<MainWi
                                     if let Some(thumbnail) = &data.attachment.thumbnail {
                                         imgviewer.load_data(thumbnail);
                                     }
+
                                 })
                                 .create();
                         });

diff --git a/application/window.c b/application/window.c
index e4c75aa6d06db340dd62f0f32e9f8cf9247f01a8..92fbf0be3c84470550aace07bec36976ad708905 100644 (file)
--- a/application/window.c
+++ b/application/window.c
@@ -122,7 +122,7 @@ void window_create() {
                     }
                     ui_hbox_w(obj, wdata->attachments, .margin = 10, .visibility_states = UI_STATES(APP_STATE_NOTE_HAS_ATTACHMENTS)) {
                         UIWIDGET sw;
-                        ui_scrolledwindow_w(obj, sw, .name = "note_attachments_sw") {
+                        ui_scrolledwindow_w(obj, sw, .fill = true, .name = "note_attachments_sw") {
                             ui_itemlist(obj, .varname = "note_attachments", .container = UI_CONTAINER_HBOX, .create_ui = attachment_item, .userdata = wdata);
                         }
                         ui_widget_set_size(sw, -1, 120);

diff --git a/ui-rs/src/ui/container.rs b/ui-rs/src/ui/container.rs
index 4f9d0440ee09e6490c1ae0431f72a26a7c4451fd..3ffab1949204a4d8da2fc323ce35f9400996c7df 100644 (file)
--- a/ui-rs/src/ui/container.rs
+++ b/ui-rs/src/ui/container.rs
@@ -1539,6 +1539,13 @@ impl<'a, T, C> ItemListContainerBuilder<'a, T, C> {
         self
     }
 
+    pub fn container(&mut self, cttype: SubContainer) -> &mut Self {
+        unsafe {
+            ui_itemlist_container_args_set_container(self.args, cttype as c_int);
+        }
+        self
+    }
+
     pub fn subcontainer_type(&mut self, subtype: SubContainer) -> &mut Self {
         unsafe {
             ui_itemlist_container_args_set_subcontainer(self.args, subtype as c_int);