diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2008-08-08 23:49:56 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2008-08-08 23:49:56 +0000 |
| commit | cd378a12bb9b3222ab78b13fbcfa1f8b4f04c65d (patch) | |
| tree | 1834a9578ce46d337845fb1dde762088617c06ad /mixer | |
| parent | 777401ec7f2566a846e9ef1b348969084753bab8 (diff) | |
Revert window positionsing changes (second part of bug 456498).
svn path=/trunk/; revision=10901
Diffstat (limited to 'mixer')
| -rw-r--r-- | mixer/ChangeLog | 7 | ||||
| -rw-r--r-- | mixer/applet.c | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog index 95d2eaa86..0935a55c5 100644 --- a/mixer/ChangeLog +++ b/mixer/ChangeLog @@ -1,3 +1,10 @@ +2008-08-09 Callum McKenzie <callum@spooky-possum.org> + + * applet.c (gnome_volume_applet_popup_dock): Revert to the old + code for positioning the window. This is ugly, but it doesn't have + the window mysteriously appearing in an odd place before jumping + to the right place. (Still bug #456498.) + 2008-08-07 Callum McKenzie <callum@spooky-possum.org> * dock.c (gnome_volume_applet_dock_init): Be more explicit about diff --git a/mixer/applet.c b/mixer/applet.c index 3d4f3267c..8d1ea48da 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -612,9 +612,15 @@ gnome_volume_applet_popup_dock (GnomeVolumeApplet *applet) GtkWidget *widget = GTK_WIDGET (applet); gint x, y; + /* Get it in just about the right position so that it + * doesn't flicker to obviously when we reposition it. */ + gnome_volume_applet_get_dock_position (applet, &x, &y); + gtk_window_move (GTK_WINDOW (applet->dock), x, y); + gtk_widget_show_all (GTK_WIDGET (applet->dock)); - /* Reposition. */ + /* Reposition the window now that we know its actual size + * and can center it. */ gnome_volume_applet_get_dock_position (applet, &x, &y); gtk_window_move (GTK_WINDOW (applet->dock), x, y); |