Merge branch 'wip/otte/for-main' into 'main'

popover: Fix typo

See merge request GNOME/gtk!5720

demos/gtk-demo/demo.gresource.xml

@@ -43,7 +43,7 @@
     <file>cssview.css</file>
     <file>reset.css</file>
   </gresource>
-  <gresource prefix="/dropdown">
+  <gresource prefix="/listview_selections">
     <file>suggestionentry.h</file>
     <file>suggestionentry.c</file>
     <file>suggestionentry.css</file>
@@ -274,7 +274,6 @@
     <file>cursors.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
-    <file>dropdown.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
     <file>entry_completion.c</file>
@@ -298,6 +297,7 @@
     <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
+    <file>image_scaling.c</file>
     <file>images.c</file>
     <file>infobar.c</file>
     <file>layoutmanager.c</file>
@@ -310,6 +310,7 @@
     <file>listview_clocks.c</file>
     <file>listview_filebrowser.c</file>
     <file>listview_minesweeper.c</file>
+    <file>listview_selections.c</file>
     <file>listview_settings.c</file>
     <file>listview_ucd.c</file>
     <file>listview_weather.c</file>
@@ -318,7 +319,6 @@
     <file>main.c</file>
     <file>markup.c</file>
     <file>mask.c</file>
-    <file>menu.c</file>
     <file>overlay.c</file>
     <file>overlay_decorative.c</file>
     <file>paint.c</file>

demos/gtk-demo/image_scaling.c

@@ -117,7 +117,7 @@ transform_from (GBinding     *binding,
 }
 
 GtkWidget *
-do_menu (GtkWidget *do_widget)
+do_image_scaling (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
 

demos/gtk-demo/listview_selections.c

@@ -369,7 +369,7 @@ match_func (MatchObject *obj,
 }
 
 GtkWidget *
-do_dropdown (GtkWidget *do_widget)
+do_listview_selections (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *button, *box, *spin, *check, *hbox, *label, *entry;

demos/gtk-demo/meson.build

@@ -39,6 +39,7 @@ demos = files([
   'iconscroll.c',
   'iconview.c',
   'iconview_edit.c',
+  'image_scaling.c',
   'images.c',
   'infobar.c',
   'layoutmanager.c',
@@ -47,7 +48,6 @@ demos = files([
   'listbox.c',
   'listbox_controls.c',
   'mask.c',
-  'menu.c',
   'flowbox.c',
   'list_store.c',
   'listview_applauncher.c',
@@ -55,7 +55,7 @@ demos = files([
   'listview_colors.c',
   'listview_filebrowser.c',
   'listview_minesweeper.c',
-  'dropdown.c',
+  'listview_selections.c',
   'listview_settings.c',
   'listview_ucd.c',
   'listview_weather.c',

demos/gtk-demo/suggestionentry.c

@@ -849,7 +849,7 @@ suggestion_entry_init (SuggestionEntry *self)
       GtkCssProvider *provider;
 
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/dropdown/suggestionentry.css");
+      gtk_css_provider_load_from_resource (provider, "/listview_selections/suggestionentry.css");
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);

gtk/gtkpopover.c

@@ -468,7 +468,7 @@ compute_surface_pointing_to (GtkPopover   *popover,
   rect->x = (int) floor (bounds.origin.x + nx);
   rect->y = (int) floor (bounds.origin.y + ny);
   rect->width = (int) ceilf (bounds.size.width);
-  rect->width = (int) ceilf (bounds.size.height);
+  rect->height = (int) ceilf (bounds.size.height);
 }
 
 static GdkPopupLayout *