AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
docs: Mention <packing> in migration guide

Closes #3950 and #2271

See merge request GNOME/gtk!3630
This commit is contained in:
Matthias Clasen 2021-06-04 20:24:23 +00:00
commit 74a41eeb70
10 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gsk/gskroundedrect.c
View File

@ -310,7 +310,17 @@ gsk_rounded_rect_scale_affine (GskRoundedRect *dest,
}
}
/* XXX: Find a better name */
/*<private>
* gsk_rounded_rect_is_circular:
* @self: the `GskRoundedRect` to check
*
* Checks if all corners of @self are quarter-circles (as
* opposed to quarter-ellipses).
*
* Note that different corners can still have different radii.
*
* Returns: %TRUE if the rectangle is circular.
*/
gboolean
gsk_rounded_rect_is_circular (const GskRoundedRect *self)
{

1
gtk/gtkbuilderparser.c
View File

@ -28,7 +28,6 @@
#include "gtkversion.h"
#include "gdkprofilerprivate.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
#include <gio/gio.h>

1
gtk/gtkcellareaboxcontext.c
View File

@ -25,7 +25,6 @@
#include "gtkcellareaboxcontextprivate.h"
#include "gtkorientable.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
/* GObjectClass */

4
gtk/gtkcssenumvalue.c
View File

@ -268,7 +268,7 @@ gtk_css_value_font_size_compute (GtkCssValue *value,
font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
else
font_size = gtk_css_font_size_get_default_px (provider, style);
/* XXX: This is what WebKit does... */
/* This is what WebKit does... */
font_size /= 1.2;
break;
case GTK_CSS_FONT_SIZE_LARGER:
@ -276,7 +276,7 @@ gtk_css_value_font_size_compute (GtkCssValue *value,
font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
else
font_size = gtk_css_font_size_get_default_px (provider, style);
/* XXX: This is what WebKit does... */
/* This is what WebKit does... */
font_size *= 1.2;
break;
}

4
gtk/gtkcsskeyframes.c
View File

@ -24,7 +24,6 @@
#include "gtkcssstylepropertyprivate.h"
#include "gtkstylepropertyprivate.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
#include <stdlib.h>
@ -97,7 +96,8 @@ gtk_css_keyframes_add_keyframe (GtkCssKeyframes *keyframes,
KEYFRAMES_VALUE (keyframes, k, p) = NULL;
/* XXX: GC properties that are now unset
* in all keyframes? */
* in all keyframes?
*/
}
return k;
}

1
gtk/gtkcssnodedeclaration.c
View File

@ -19,7 +19,6 @@
#include "gtkcssnodedeclarationprivate.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
#include <string.h>

1
gtk/gtkexpression.c
View File

@ -22,7 +22,6 @@
#include "gtkexpression.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
#include <gobject/gvaluecollector.h>

2
gtk/gtkicontheme.c
View File

@ -2269,7 +2269,7 @@ real_choose_icon (GtkIconTheme *self,
{
GTK_NOTE(ICONFALLBACK, {
char *s = g_strjoinv (", ", (char **)icon_names);
g_message ("No icon found for: %s", s);
g_message ("No icon found in %s (or fallbacks) for: %s", self->current_theme, s);
g_free (s);
});
icon = icon_paintable_new ("image-missing", size, scale);

6
gtk/gtkiconview.c
View File

@ -2002,7 +2002,7 @@ gtk_icon_view_set_cursor (GtkIconView *icon_view,
_gtk_icon_view_set_cell_data (icon_view, item);
gtk_cell_area_activate (icon_view->priv->cell_area, context,
GTK_WIDGET (icon_view), &item->cell_area,
0 /* XXX flags */, TRUE);
0, TRUE);
}
}
@ -2156,7 +2156,7 @@ gtk_icon_view_button_press (GtkGestureClick *gesture,
_gtk_icon_view_set_cell_data (icon_view, item);
gtk_cell_area_activate (icon_view->priv->cell_area, context,
GTK_WIDGET (icon_view),
&item->cell_area, 0/* XXX flags */, FALSE);
&item->cell_area, 0, FALSE);
}
}
else
@ -2489,7 +2489,7 @@ gtk_icon_view_real_activate_cursor_item (GtkIconView *icon_view)
gtk_cell_area_activate (icon_view->priv->cell_area, context,
GTK_WIDGET (icon_view),
&icon_view->priv->cursor_item->cell_area,
0 /* XXX flags */,
0,
FALSE);
path = gtk_tree_path_new_from_indices (icon_view->priv->cursor_item->index, -1);

1
gtk/gtkroundedbox.c
View File

@ -23,7 +23,6 @@
#include "gtkcssnumbervalueprivate.h"
#include "gtkcsstypesprivate.h"
/* XXX: For g_memdup2() */
#include "gtkprivate.h"
#include <string.h>