Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
baseline = -1 means no baseline

Closes #4385

See merge request GNOME/gtk!4307
This commit is contained in:
Emmanuele Bassi
2021-12-31 14:55:20 +00:00
parent c8bdb4c7fb 1354854d23
commit 35ee82ca07
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtksizerequest.c
View File

@@ -461,9 +461,9 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget,
* @minimum: (out) (optional): location to store the minimum size
* @natural: (out) (optional): location to store the natural size
* @minimum_baseline: (out) (optional): location to store the baseline
* position for the minimum size
* position for the minimum size, or -1 to report no baseline
* @natural_baseline: (out) (optional): location to store the baseline
* position for the natural size
* position for the natural size, or -1 to report no baseline
*
* Measures @widget in the orientation @orientation and for the given @for_size.
*

9
gtk/inspector/init.c
View File

@@ -108,10 +108,11 @@ gtk_inspector_init (void)
void
gtk_inspector_register_extension (void)
{
if (extension_point == NULL) {
extension_point = g_io_extension_point_register ("gtk-inspector-page");
g_io_extension_point_set_required_type (extension_point, GTK_TYPE_WIDGET);
}
if (extension_point == NULL)
{
extension_point = g_io_extension_point_register ("gtk-inspector-page");
g_io_extension_point_set_required_type (extension_point, GTK_TYPE_WIDGET);
}
}
// vim: set et sw=2 ts=2: