|
 |
ecdf9b |
From 81ad92ad8228ba36209130ed4eaf67752ea79bb8 Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Thu, 13 Jun 2013 12:39:44 +0200
|
|
|
ecdf9b |
Subject: [PATCH 35/35] cheese-flash: Fix the flash no longer being white
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
libcheese/cheese-flash.c | 23 ++++-------------------
|
|
|
ecdf9b |
1 file changed, 4 insertions(+), 19 deletions(-)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/libcheese/cheese-flash.c b/libcheese/cheese-flash.c
|
|
|
ecdf9b |
index fd46818..37cd36d 100644
|
|
|
ecdf9b |
--- a/libcheese/cheese-flash.c
|
|
|
ecdf9b |
+++ b/libcheese/cheese-flash.c
|
|
|
ecdf9b |
@@ -76,29 +76,13 @@ struct _CheeseFlashPrivate
|
|
|
ecdf9b |
guint fade_timeout_tag;
|
|
|
ecdf9b |
};
|
|
|
ecdf9b |
|
|
|
ecdf9b |
-/*
|
|
|
ecdf9b |
- * cheese_flash_draw_event_cb:
|
|
|
ecdf9b |
- * @widget: the #CheeseFlash
|
|
|
ecdf9b |
- * @cr: the Cairo context
|
|
|
ecdf9b |
- * @user_data: the user data of the signal
|
|
|
ecdf9b |
- *
|
|
|
ecdf9b |
- * Draw the flash.
|
|
|
ecdf9b |
- *
|
|
|
ecdf9b |
- * Returns: %TRUE
|
|
|
ecdf9b |
- */
|
|
|
ecdf9b |
-static gboolean
|
|
|
ecdf9b |
-cheese_flash_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
|
|
|
ecdf9b |
-{
|
|
|
ecdf9b |
- cairo_fill (cr);
|
|
|
ecdf9b |
- return TRUE;
|
|
|
ecdf9b |
-}
|
|
|
ecdf9b |
-
|
|
|
ecdf9b |
static void
|
|
|
ecdf9b |
cheese_flash_init (CheeseFlash *self)
|
|
|
ecdf9b |
{
|
|
|
ecdf9b |
CheeseFlashPrivate *priv = self->priv = CHEESE_FLASH_GET_PRIVATE (self);
|
|
|
ecdf9b |
cairo_region_t *input_region;
|
|
|
ecdf9b |
GtkWindow *window = GTK_WINDOW (self);
|
|
|
ecdf9b |
+ const GdkColor white = { 0, 65535, 65535, 65535 };
|
|
|
ecdf9b |
|
|
|
ecdf9b |
priv->flash_timeout_tag = 0;
|
|
|
ecdf9b |
priv->fade_timeout_tag = 0;
|
|
|
ecdf9b |
@@ -113,13 +97,14 @@ cheese_flash_init (CheeseFlash *self)
|
|
|
ecdf9b |
gtk_window_set_accept_focus (window, FALSE);
|
|
|
ecdf9b |
gtk_window_set_focus_on_map (window, FALSE);
|
|
|
ecdf9b |
|
|
|
ecdf9b |
+ /* Make it white */
|
|
|
ecdf9b |
+ gtk_widget_modify_bg (GTK_WIDGET (window), GTK_STATE_NORMAL, &white);
|
|
|
ecdf9b |
+
|
|
|
ecdf9b |
/* Don't consume input */
|
|
|
ecdf9b |
gtk_widget_realize (GTK_WIDGET (window));
|
|
|
ecdf9b |
input_region = cairo_region_create ();
|
|
|
ecdf9b |
gdk_window_input_shape_combine_region (gtk_widget_get_window (GTK_WIDGET (window)), input_region, 0, 0);
|
|
|
ecdf9b |
cairo_region_destroy (input_region);
|
|
|
ecdf9b |
-
|
|
|
ecdf9b |
- g_signal_connect (G_OBJECT (window), "draw", G_CALLBACK (cheese_flash_draw_event_cb), NULL);
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
|
|
|
ecdf9b |
static void
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|