[gtk+] Fix opacity group hack
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix opacity group hack
- Date: Wed, 27 Feb 2013 12:00:36 +0000 (UTC)
commit bbfc8f9a9b84cc019dff0c23d52aac83beb6be64
Author: Alexander Larsson <alexl redhat com>
Date: Wed Feb 27 12:57:38 2013 +0100
Fix opacity group hack
We can't norender the main window for a windowed widget as we then
never get any expose events.
gtk/gtkwidget.c | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2ba9281..eefadde 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -14098,7 +14098,7 @@ gtk_widget_register_window (GtkWidget *widget,
gdk_window_set_user_data (window, widget);
priv->registered_windows = g_list_prepend (priv->registered_windows, window);
- if (!gtk_widget_get_has_window (widget) && !gdk_window_has_native (window))
+ if (priv->window != window && !gdk_window_has_native (window))
gdk_window_set_opacity (window,
priv->norender_children ? 0.0 : 1.0);
}
@@ -14231,8 +14231,8 @@ gtk_widget_propagate_alpha (GtkWidget *widget)
parent = priv->parent;
norender =
- /* If this widget has an opacity group, never render it */
- priv->opacity_group ||
+ /* If this widget has an opacity group and no window don't render it */
+ (priv->opacity_group && !gtk_widget_get_has_window (widget)) ||
/* If the parent has norender_children, propagate that here */
(parent != NULL && parent->priv->norender_children);
@@ -14252,14 +14252,12 @@ gtk_widget_propagate_alpha (GtkWidget *widget)
gdk_window_set_opacity (priv->window,
norender ? 0 : priv->alpha / 255.0);
}
- else /* !has_window */
+
+ for (l = priv->registered_windows; l != NULL; l = l->next)
{
- for (l = priv->registered_windows; l != NULL; l = l->next)
- {
- GdkWindow *w = l->data;
- if (!gdk_window_has_native (w))
- gdk_window_set_opacity (w, norender_children ? 0.0 : 1.0);
- }
+ GdkWindow *w = l->data;
+ if (w != priv->window && !gdk_window_has_native (w))
+ gdk_window_set_opacity (w, norender_children ? 0.0 : 1.0);
}
priv->norender = norender;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]