Mercurial > audlegacy
comparison audacious/equalizer.c @ 1068:de6e77a1ef79 trunk
[svn] - fix dock.c
author | nenolod |
---|---|
date | Tue, 16 May 2006 20:38:22 -0700 |
parents | 13d721835794 |
children | 9a3b3fd54df2 |
comparison
equal
deleted
inserted
replaced
1067:dc9373f0186b | 1068:de6e77a1ef79 |
---|---|
1 /* BMP - Cross-platform multimedia player | 1 /* Audacious - Cross-platform multimedia player |
2 * Copyright (C) 2005-2006 Audacious development team. | |
3 * | |
4 * BMP - Cross-platform multimedia player | |
2 * Copyright (C) 2003-2004 BMP development team. | 5 * Copyright (C) 2003-2004 BMP development team. |
3 * | 6 * |
4 * Based on XMMS: | 7 * Based on XMMS: |
5 * Copyright (C) 1998-2003 XMMS development team. | 8 * Copyright (C) 1998-2003 XMMS development team. |
6 * | 9 * |
421 equalizerwin_motion(GtkWidget * widget, | 424 equalizerwin_motion(GtkWidget * widget, |
422 GdkEventMotion * event, gpointer callback_data) | 425 GdkEventMotion * event, gpointer callback_data) |
423 { | 426 { |
424 GdkEvent *gevent; | 427 GdkEvent *gevent; |
425 | 428 |
426 handle_motion_cb(equalizerwin_wlist, widget, event); | 429 if (dock_is_moving(GTK_WINDOW(equalizerwin))) |
427 draw_main_window(FALSE); /* XXX: shouldn't this be draw_equalizer_window()? */ | 430 { |
431 dock_move_motion(GTK_WINDOW(equalizerwin), event); | |
432 } | |
433 else | |
434 { | |
435 handle_motion_cb(equalizerwin_wlist, widget, event); | |
436 draw_main_window(FALSE); /* XXX: shouldn't this be draw_equalizer_window()? */ | |
437 } | |
428 | 438 |
429 gdk_flush(); | 439 gdk_flush(); |
430 | 440 |
431 while ((gevent = gdk_event_get()) != NULL) gdk_event_free(gevent); | 441 while ((gevent = gdk_event_get()) != NULL) gdk_event_free(gevent); |
432 | 442 |
437 equalizerwin_release(GtkWidget * widget, | 447 equalizerwin_release(GtkWidget * widget, |
438 GdkEventButton * event, gpointer callback_data) | 448 GdkEventButton * event, gpointer callback_data) |
439 { | 449 { |
440 gdk_pointer_ungrab(GDK_CURRENT_TIME); | 450 gdk_pointer_ungrab(GDK_CURRENT_TIME); |
441 gdk_flush(); | 451 gdk_flush(); |
452 | |
442 if (dock_is_moving(GTK_WINDOW(equalizerwin))) { | 453 if (dock_is_moving(GTK_WINDOW(equalizerwin))) { |
443 dock_move_release(GTK_WINDOW(equalizerwin)); | 454 dock_move_release(GTK_WINDOW(equalizerwin)); |
444 } | 455 } |
445 else { | 456 else { |
446 handle_release_cb(equalizerwin_wlist, widget, event); | 457 handle_release_cb(equalizerwin_wlist, widget, event); |
741 width = 275; | 752 width = 275; |
742 height = cfg.equalizer_shaded ? 14 : 116; | 753 height = cfg.equalizer_shaded ? 14 : 116; |
743 | 754 |
744 gtk_window_set_default_size(GTK_WINDOW(equalizerwin), width, height); | 755 gtk_window_set_default_size(GTK_WINDOW(equalizerwin), width, height); |
745 gtk_window_set_resizable(GTK_WINDOW(equalizerwin), FALSE); | 756 gtk_window_set_resizable(GTK_WINDOW(equalizerwin), FALSE); |
746 gtk_window_set_decorated(GTK_WINDOW(equalizerwin), cfg.show_wm_decorations); | 757 |
758 dock_window_list = dock_window_set_decorated(dock_window_list, | |
759 GTK_WINDOW(equalizerwin), | |
760 cfg.show_wm_decorations); | |
747 | 761 |
748 gtk_window_set_transient_for(GTK_WINDOW(equalizerwin), | 762 gtk_window_set_transient_for(GTK_WINDOW(equalizerwin), |
749 GTK_WINDOW(mainwin)); | 763 GTK_WINDOW(mainwin)); |
750 gtk_window_set_skip_taskbar_hint(GTK_WINDOW(equalizerwin), TRUE); | 764 gtk_window_set_skip_taskbar_hint(GTK_WINDOW(equalizerwin), TRUE); |
751 | 765 |