mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
parent
3a0ab1cc0c
commit
1a92fa788d
@ -31,7 +31,7 @@
|
|||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||||
|
|
||||||
/* This is between GTK_PRIORITY_RESIZE (+10) and GTK_PRIORITY_REDRAW (+20) */
|
/* This is between GTK_PRIORITY_RESIZE (+10) and GDK_PRIORITY_REDRAW (+20) */
|
||||||
#define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
|
#define META_PRIORITY_RESIZE (G_PRIORITY_HIGH_IDLE + 15)
|
||||||
|
|
||||||
typedef struct _MetaUI MetaUI;
|
typedef struct _MetaUI MetaUI;
|
||||||
|
@ -473,7 +473,7 @@ meta_window_menu_new (MetaFrames *frames,
|
|||||||
|
|
||||||
gtk_signal_connect_full (GTK_OBJECT (mi),
|
gtk_signal_connect_full (GTK_OBJECT (mi),
|
||||||
"activate",
|
"activate",
|
||||||
GTK_SIGNAL_FUNC (activate_cb),
|
G_CALLBACK (activate_cb),
|
||||||
NULL,
|
NULL,
|
||||||
md,
|
md,
|
||||||
g_free, FALSE, FALSE);
|
g_free, FALSE, FALSE);
|
||||||
|
@ -72,7 +72,7 @@ meta_preview_class_init (MetaPreviewClass *class)
|
|||||||
GtkWidgetClass *widget_class;
|
GtkWidgetClass *widget_class;
|
||||||
|
|
||||||
widget_class = (GtkWidgetClass*) class;
|
widget_class = (GtkWidgetClass*) class;
|
||||||
parent_class = gtk_type_class (GTK_TYPE_BIN);
|
parent_class = g_type_class_peek (GTK_TYPE_BIN);
|
||||||
|
|
||||||
gobject_class->finalize = meta_preview_finalize;
|
gobject_class->finalize = meta_preview_finalize;
|
||||||
|
|
||||||
|
@ -194,13 +194,13 @@ render_multi (GdkDrawable *drawable,
|
|||||||
colors, N_COLORS,
|
colors, N_COLORS,
|
||||||
type);
|
type);
|
||||||
|
|
||||||
gdk_pixbuf_render_to_drawable (pixbuf,
|
gdk_draw_pixbuf (drawable,
|
||||||
drawable,
|
gc,
|
||||||
gc,
|
pixbuf,
|
||||||
0, 0,
|
0, 0,
|
||||||
0, 0, width, height,
|
0, 0, width, height,
|
||||||
GDK_RGB_DITHER_NORMAL,
|
GDK_RGB_DITHER_NORMAL,
|
||||||
0, 0);
|
0, 0);
|
||||||
|
|
||||||
g_object_unref (G_OBJECT (pixbuf));
|
g_object_unref (G_OBJECT (pixbuf));
|
||||||
#undef N_COLORS
|
#undef N_COLORS
|
||||||
@ -248,13 +248,13 @@ render_interwoven_func (GdkDrawable *drawable,
|
|||||||
colors, height / 10,
|
colors, height / 10,
|
||||||
colors + 2, height / 14);
|
colors + 2, height / 14);
|
||||||
|
|
||||||
gdk_pixbuf_render_to_drawable (pixbuf,
|
gdk_draw_pixbuf (drawable,
|
||||||
drawable,
|
gc,
|
||||||
gc,
|
pixbuf,
|
||||||
0, 0,
|
0, 0,
|
||||||
0, 0, width, height,
|
0, 0, width, height,
|
||||||
GDK_RGB_DITHER_NORMAL,
|
GDK_RGB_DITHER_NORMAL,
|
||||||
0, 0);
|
0, 0);
|
||||||
|
|
||||||
g_object_unref (G_OBJECT (pixbuf));
|
g_object_unref (G_OBJECT (pixbuf));
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ meta_area_class_init (MetaAreaClass *class)
|
|||||||
|
|
||||||
object_class = (GtkObjectClass*) class;
|
object_class = (GtkObjectClass*) class;
|
||||||
widget_class = (GtkWidgetClass*) class;
|
widget_class = (GtkWidgetClass*) class;
|
||||||
parent_class = gtk_type_class (gtk_misc_get_type ());
|
parent_class = g_type_class_peek (gtk_misc_get_type ());
|
||||||
|
|
||||||
gobject_class->finalize = meta_area_finalize;
|
gobject_class->finalize = meta_area_finalize;
|
||||||
|
|
||||||
|
@ -648,7 +648,7 @@ meta_ui_window_should_not_cause_focus (Display *xdisplay,
|
|||||||
/* we shouldn't cause focus if we're an override redirect
|
/* we shouldn't cause focus if we're an override redirect
|
||||||
* toplevel which is not foreign
|
* toplevel which is not foreign
|
||||||
*/
|
*/
|
||||||
if (window && gdk_window_get_type (window) == GDK_WINDOW_TEMP)
|
if (window && gdk_window_get_window_type (window) == GDK_WINDOW_TEMP)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
else
|
else
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
Loading…
Reference in New Issue
Block a user