Merge branch 'wip/baedert/for-master' into 'main'

label: Remove a redundant assignment

See merge request GNOME/gtk!4348
This commit is contained in:
Matthias Clasen 2022-01-07 16:47:07 +00:00
commit 464219c0fa
3 changed files with 18 additions and 5 deletions

View File

@ -4993,8 +4993,15 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view,
* want to convert the returned list into a list of `GtkTreeRowReferences`.
* To do this, you can use gtk_tree_row_reference_new().
*
* To free the return value, use:
* To free the return value, use `g_lsit_free_full`:
* |[<!-- language="C" -->
* GtkWidget *icon_view = gtk_icon_view_new ();
* // Use icon_view
*
* GList *list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (icon_view));
*
* // use list
*
* g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
* ]|
*

View File

@ -1186,7 +1186,7 @@ my_pango_layout_get_width_for_height (PangoLayout *layout,
pango_layout_get_size (layout, &text_width, &text_height);
text_width = PANGO_PIXELS_CEIL (text_width);
if (text_width > mid)
min = mid = text_width;
min = text_width;
else if (text_height > for_height)
min = mid + 1;
else

View File

@ -753,9 +753,15 @@ gtk_is_initialized (void)
* you can use it to update the default text direction as follows:
*
* |[<!-- language="C" -->
* setlocale (LC_ALL, new_locale);
* direction = gtk_get_locale_direction ();
* gtk_widget_set_default_direction (direction);
* #include <locale.h>
*
* static void
* update_locale (const char *new_locale)
* {
* setlocale (LC_ALL, new_locale);
* GtkTextDirection direction = gtk_get_locale_direction ();
* gtk_widget_set_default_direction (direction);
* }
* ]|
*
* Returns: the `GtkTextDirection` of the current locale