e7fc0bd
diff -up gdm-2.24.0/gui/simple-greeter/gdm-greeter-panel.c.add-panel-slide gdm-2.24.0/gui/simple-greeter/gdm-greeter-panel.c
e7fc0bd
--- gdm-2.24.0/gui/simple-greeter/gdm-greeter-panel.c.add-panel-slide	2008-08-21 00:31:47.000000000 -0400
e7fc0bd
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-panel.c	2008-09-30 23:02:34.000000000 -0400
e7fc0bd
@@ -20,6 +20,7 @@
e7fc0bd
 
e7fc0bd
 #include "config.h"
e7fc0bd
 
e7fc0bd
+#include <math.h>
e7fc0bd
 #include <stdlib.h>
e7fc0bd
 #include <stdio.h>
e7fc0bd
 #include <sys/time.h>
e7fc0bd
@@ -40,6 +41,7 @@
e7fc0bd
 #include "gdm-language-option-widget.h"
e7fc0bd
 #include "gdm-layout-option-widget.h"
e7fc0bd
 #include "gdm-session-option-widget.h"
e7fc0bd
+#include "gdm-timer.h"
e7fc0bd
 #include "gdm-profile.h"
e7fc0bd
 
e7fc0bd
 #include "na-tray.h"
e7fc0bd
@@ -59,6 +61,9 @@ struct GdmGreeterPanelPrivate
e7fc0bd
         GtkWidget              *layout_option_widget;
e7fc0bd
         GtkWidget              *session_option_widget;
e7fc0bd
 
e7fc0bd
+        GdmTimer               *animation_timer;
e7fc0bd
+        double                  progress;
e7fc0bd
+
e7fc0bd
         char                   *default_session_name;
e7fc0bd
         char                   *default_language_name;
e7fc0bd
 };
e7fc0bd
@@ -349,7 +354,7 @@ update_geometry (GdmGreeterPanel *panel,
e7fc0bd
         panel->priv->geometry.height = requisition->height + 2 * GTK_CONTAINER (panel)->border_width;
e7fc0bd
 
e7fc0bd
         panel->priv->geometry.x = geometry.x;
e7fc0bd
-        panel->priv->geometry.y = geometry.y + geometry.height - panel->priv->geometry.height;
e7fc0bd
+        panel->priv->geometry.y = geometry.y + geometry.height - panel->priv->geometry.height + (1.0 - panel->priv->progress) * panel->priv->geometry.height;
e7fc0bd
 
e7fc0bd
 #if 0
e7fc0bd
         g_debug ("Setting geometry x:%d y:%d w:%d h:%d",
e7fc0bd
@@ -402,6 +407,39 @@ gdm_greeter_panel_real_size_request (Gtk
e7fc0bd
 
e7fc0bd
         gdm_greeter_panel_move_resize_window (panel, position_changed, size_changed);
e7fc0bd
 }
e7fc0bd
+static void
e7fc0bd
+gdm_greeter_panel_real_show (GtkWidget *widget)
e7fc0bd
+{
e7fc0bd
+        GdmGreeterPanel *panel;
e7fc0bd
+        GtkSettings *settings;
e7fc0bd
+        gboolean     animations_are_enabled;
e7fc0bd
+
e7fc0bd
+        settings = gtk_settings_get_for_screen (gtk_widget_get_screen (widget));
e7fc0bd
+        g_object_get (settings, "gtk-enable-animations", &animations_are_enabled, NULL);
e7fc0bd
+
e7fc0bd
+        panel = GDM_GREETER_PANEL (widget);
e7fc0bd
+
e7fc0bd
+        if (animations_are_enabled) {
e7fc0bd
+                gdm_timer_start (panel->priv->animation_timer, 1.0);
e7fc0bd
+        } else {
e7fc0bd
+                panel->priv->progress = 1.0;
e7fc0bd
+        }
e7fc0bd
+
e7fc0bd
+        GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->show (widget);
e7fc0bd
+}
e7fc0bd
+
e7fc0bd
+static void
e7fc0bd
+gdm_greeter_panel_real_hide (GtkWidget *widget)
e7fc0bd
+{
e7fc0bd
+        GdmGreeterPanel *panel;
e7fc0bd
+
e7fc0bd
+        panel = GDM_GREETER_PANEL (widget);
e7fc0bd
+
e7fc0bd
+        gdm_timer_stop (panel->priv->animation_timer);
e7fc0bd
+        panel->priv->progress = 0.0;
e7fc0bd
+
e7fc0bd
+        GTK_WIDGET_CLASS (gdm_greeter_panel_parent_class)->hide (widget);
e7fc0bd
+}
e7fc0bd
 
e7fc0bd
 static void
e7fc0bd
 gdm_greeter_panel_class_init (GdmGreeterPanelClass *klass)
e7fc0bd
@@ -418,6 +456,9 @@ gdm_greeter_panel_class_init (GdmGreeter
e7fc0bd
         widget_class->realize = gdm_greeter_panel_real_realize;
e7fc0bd
         widget_class->unrealize = gdm_greeter_panel_real_unrealize;
e7fc0bd
         widget_class->size_request = gdm_greeter_panel_real_size_request;
e7fc0bd
+        widget_class->show = gdm_greeter_panel_real_show;
e7fc0bd
+        widget_class->hide = gdm_greeter_panel_real_hide;
e7fc0bd
+
e7fc0bd
         signals[LANGUAGE_SELECTED] =
e7fc0bd
                 g_signal_new ("language-selected",
e7fc0bd
                               G_TYPE_FROM_CLASS (object_class),
e7fc0bd
@@ -521,6 +562,15 @@ on_session_activated (GdmSessionOptionWi
e7fc0bd
 }
e7fc0bd
 
e7fc0bd
 static void
e7fc0bd
+on_animation_tick (GdmGreeterPanel *panel,
e7fc0bd
+                   double           progress)
e7fc0bd
+{
e7fc0bd
+        panel->priv->progress = progress * log ((G_E - 1.0) * progress + 1.0);
e7fc0bd
+
e7fc0bd
+        gtk_widget_queue_resize (GTK_WIDGET (panel));
e7fc0bd
+}
e7fc0bd
+
e7fc0bd
+static void
e7fc0bd
 gdm_greeter_panel_init (GdmGreeterPanel *panel)
e7fc0bd
 {
e7fc0bd
         NaTray    *tray;
e7fc0bd
@@ -605,6 +655,13 @@ gdm_greeter_panel_init (GdmGreeterPanel 
e7fc0bd
 
e7fc0bd
         gdm_greeter_panel_hide_user_options (panel);
e7fc0bd
 
e7fc0bd
+        panel->priv->progress = 0.0;
e7fc0bd
+        panel->priv->animation_timer = gdm_timer_new ();
e7fc0bd
+        g_signal_connect_swapped (panel->priv->animation_timer,
e7fc0bd
+                                  "tick",
e7fc0bd
+                                  G_CALLBACK (on_animation_tick),
e7fc0bd
+                                  panel);
e7fc0bd
+
e7fc0bd
         gdm_profile_end (NULL);
e7fc0bd
 }
e7fc0bd
 
e7fc0bd
@@ -620,6 +677,8 @@ gdm_greeter_panel_finalize (GObject *obj
e7fc0bd
 
e7fc0bd
         g_return_if_fail (greeter_panel->priv != NULL);
e7fc0bd
 
e7fc0bd
+        g_signal_handlers_disconnect_by_func (object, on_animation_tick, greeter_panel);
e7fc0bd
+
e7fc0bd
         G_OBJECT_CLASS (gdm_greeter_panel_parent_class)->finalize (object);
e7fc0bd
 }
e7fc0bd