[Xfce4-commits] <xfce4-panel:master> Set window colormap and change autohide window type (bug #7435)

[Nick Schermer]

Updating branch refs/heads/master
         to 27dfa9b5bf3216ba725df55172ba861281d71aa8 (commit)
       from 2d84329885b5754122f1a2613be8c4ab9d7925e8 (commit)

commit 27dfa9b5bf3216ba725df55172ba861281d71aa8
Author: Nick Schermer <nick at xfce.org>
Date:   Sat May 28 13:39:15 2011 +0200

    Set window colormap and change autohide window type (bug #7435)
    
    The colormap was not properly applied to the autohide window
    and therefore the alpha value was not rendered.
    
    Also set the GTK_WINDOW_TOPLEVEL type on the popup windows so
    the autohide window is not visible in fullscreen applications.

 panel/panel-base-window.c |    5 ++++-
 panel/panel-window.c      |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 7025621..23ecd55 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -212,6 +212,9 @@ panel_base_window_init (PanelBaseWindow *window)
   /* some wm require stick to show the window on all workspaces, on xfwm4
    * the type-hint already takes care of that */
   gtk_window_stick (GTK_WINDOW (window));
+
+  /* set colormap */
+  panel_base_window_screen_changed (GTK_WIDGET (window), NULL);
 }
 
 
@@ -673,7 +676,7 @@ panel_base_window_composited_changed (GtkWidget *widget)
 
   /* set new compositing state */
   window->is_composited = gtk_widget_is_composited (widget);
-  if (window->is_composited ==  was_composited)
+  if (window->is_composited == was_composited)
     return;
 
   if (window->is_composited)
diff --git a/panel/panel-window.c b/panel/panel-window.c
index ecdc854..5c323ea 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2175,7 +2175,7 @@ panel_window_set_autohide (PanelWindow *window,
       /* create the window */
       panel_return_if_fail (window->autohide_window == NULL);
       popup = g_object_new (PANEL_TYPE_BASE_WINDOW,
-                            "type", GTK_WINDOW_POPUP,
+                            "type", GTK_WINDOW_TOPLEVEL,
                             "decorated", FALSE,
                             "resizable", TRUE,
                             "type-hint", GDK_WINDOW_TYPE_HINT_DOCK,