AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

indentation: fix various alignment issues

Browse Source 
Most of these stem from the GtkIconInfo -> GtkIcon rename
This commit is contained in:
Alexander Larsson 2020-01-30 12:27:15 +01:00
parent 27799ba4f5
commit 5f8c2b52c6
7 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/icon-browser/iconbrowserwin.c
View File

@ -360,7 +360,7 @@ get_image_paintable (GtkImage *image)
size = gtk_image_get_pixel_size (image);
icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
icon = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 1,
GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
if (icon == NULL)
return NULL;
return GDK_PAINTABLE (icon);

4
gdk/gdkcairo.c
View File

@ -470,9 +470,9 @@ gdk_cairo_region_from_clip (cairo_t *cr)
* always done on the cpu.
*/
void
gdk_cairo_image_surface_recolor (cairo_surface_t *image_surface,
gdk_cairo_image_surface_recolor (cairo_surface_t *image_surface,
const graphene_matrix_t *color_matrix,
const graphene_vec4_t *color_offset)
const graphene_vec4_t *color_offset)
{
graphene_vec4_t pixel;
guint32* pixel_data;

4
gdk/gdkcairo.h
View File

@ -74,9 +74,9 @@ void gdk_cairo_surface_upload_to_gl (cairo_surface_t *surface,
GdkGLContext *context);
GDK_AVAILABLE_IN_ALL
void gdk_cairo_image_surface_recolor (cairo_surface_t *image_surface,
void gdk_cairo_image_surface_recolor (cairo_surface_t *image_surface,
const graphene_matrix_t *color_matrix,
const graphene_vec4_t *color_offset);
const graphene_vec4_t *color_offset);
G_END_DECLS

2
gtk/gtkapplication-quartz-menu.c
View File

@ -306,7 +306,7 @@ icon_loaded (GObject *object,
{
cancellable = g_cancellable_new ();
gtk_icon_load_symbolic_async (icon, &foreground, &success, &warning, &error,
cancellable, icon_loaded, self);
cancellable, icon_loaded, self);
g_object_unref (icon);
return;
}

2
gtk/gtkbuiltinicon.c
View File

@ -117,7 +117,7 @@ gtk_builtin_icon_new (const char *css_name)
void
gtk_builtin_icon_set_css_name (GtkBuiltinIcon *self,
const char *css_name)
const char *css_name)
{
gtk_css_node_set_name (gtk_widget_get_css_node (GTK_WIDGET (self)),
g_quark_from_string (css_name));

6
gtk/gtkbuiltiniconprivate.h
View File

@ -29,9 +29,9 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GtkBuiltinIcon, gtk_builtin_icon, GTK, BUILTIN_ICON, GtkWidget)
GtkWidget * gtk_builtin_icon_new (const char *css_name);
void gtk_builtin_icon_set_css_name (GtkBuiltinIcon *self,
const char *css_name);
GtkWidget * gtk_builtin_icon_new (const char *css_name);
void gtk_builtin_icon_set_css_name (GtkBuiltinIcon *self,
const char *css_name);
G_END_DECLS

89
gtk/gtkicontheme.c
View File

@ -557,7 +557,8 @@ _icon_cache_should_lru_cache (GtkIcon *icon)
/* This returns the old lru element because we can't unref it with
* the lock held */
static GtkIcon *
_icon_cache_add_to_lru_cache (GtkIconTheme *theme, GtkIcon *icon)
_icon_cache_add_to_lru_cache (GtkIconTheme *theme,
GtkIcon *icon)
{
GtkIcon *old_icon = NULL;
@ -573,7 +574,8 @@ _icon_cache_add_to_lru_cache (GtkIconTheme *theme, GtkIcon *icon)
}
static GtkIcon *
icon_cache_lookup (GtkIconTheme *theme, IconKey *key)
icon_cache_lookup (GtkIconTheme *theme,
IconKey *key)
{
GtkIcon *old_icon = NULL;
GtkIcon *icon;
@ -640,7 +642,8 @@ icon_cache_mark_used_if_cached (GtkIcon *icon)
}
static void
icon_cache_add (GtkIconTheme *theme, GtkIcon *icon)
icon_cache_add (GtkIconTheme *theme,
GtkIcon *icon)
{
GtkIcon *old_icon = NULL;
@ -892,8 +895,8 @@ update_current_theme__mainthread (GtkIconTheme *self)
/* Callback when the icon theme GtkSetting changes
*/
static void
theme_changed__mainthread_unlocked (GtkSettings *settings,
GParamSpec *pspec,
theme_changed__mainthread_unlocked (GtkSettings *settings,
GParamSpec *pspec,
GtkIconThemeRef *ref)
{
GtkIconTheme *self = gtk_icon_theme_ref_aquire (ref);
@ -1762,7 +1765,7 @@ load_themes (GtkIconTheme *self)
static gboolean
ensure_valid_themes (GtkIconTheme *self,
gboolean non_blocking)
gboolean non_blocking)
{
GTimeVal tv;
gboolean was_valid = self->themes_valid;
@ -1853,13 +1856,13 @@ icon_uri_is_symbolic (const gchar *icon_name,
}
static GtkIcon *
real_choose_icon (GtkIconTheme *self,
const gchar *icon_names[],
gint size,
gint scale,
GtkIconLookupFlags flags,
gboolean non_blocking,
gboolean *would_block)
real_choose_icon (GtkIconTheme *self,
const gchar *icon_names[],
gint size,
gint scale,
GtkIconLookupFlags flags,
gboolean non_blocking,
gboolean *would_block)
{
GList *l;
GtkIcon *icon = NULL;
@ -2072,13 +2075,13 @@ icon_name_list_add_icon (GPtrArray *icons,
}
static GtkIcon *
choose_icon (GtkIconTheme *self,
const gchar *icon_names[],
gint size,
gint scale,
GtkIconLookupFlags flags,
gboolean non_blocking,
gboolean *would_block)
choose_icon (GtkIconTheme *self,
const gchar *icon_names[],
gint size,
gint scale,
GtkIconLookupFlags flags,
gboolean non_blocking,
gboolean *would_block)
{
gboolean has_regular = FALSE, has_symbolic = FALSE;
GtkIcon *icon;
@ -2119,11 +2122,11 @@ choose_icon (GtkIconTheme *self,
g_ptr_array_add (new_names, NULL);
icon = real_choose_icon (self,
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
g_ptr_array_free (new_names, TRUE);
}
@ -2145,11 +2148,11 @@ choose_icon (GtkIconTheme *self,
g_ptr_array_add (new_names, NULL);
icon = real_choose_icon (self,
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
g_ptr_array_free (new_names, TRUE);
}
@ -2163,22 +2166,22 @@ choose_icon (GtkIconTheme *self,
g_ptr_array_add (new_names, NULL);
icon = real_choose_icon (self,
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
(const gchar **) new_names->pdata,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
g_ptr_array_free (new_names, TRUE);
}
else
{
icon = real_choose_icon (self,
icon_names,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
icon_names,
size,
scale,
flags & ~(GTK_ICON_LOOKUP_FORCE_REGULAR | GTK_ICON_LOOKUP_FORCE_SYMBOLIC),
non_blocking, would_block);
}
return icon;
@ -3191,7 +3194,7 @@ theme_lookup_icon (IconTheme *theme,
if (min_dir->cache)
{
icon->cache_pixbuf = gtk_icon_cache_get_icon (min_dir->cache, icon_name,
min_dir->subdir_index);
min_dir->subdir_index);
}
return icon;
@ -4178,8 +4181,8 @@ icon_paintable_init (GdkPaintableInterface *iface)
static GtkIcon *
gtk_icon_new_for_file (GFile *file,
gint size,
gint scale)
gint size,
gint scale)
{
GtkIcon *icon;