diff options
| -rw-r--r-- | cdplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | cdplayer/cdplayer.c | 24 |
2 files changed, 17 insertions, 13 deletions
diff --git a/cdplayer/ChangeLog b/cdplayer/ChangeLog index 3e5767ea8..744ddceed 100644 --- a/cdplayer/ChangeLog +++ b/cdplayer/ChangeLog @@ -1,3 +1,9 @@ +2002-12-15 Kevin Vandersloot <kfv101@psu.edu> + + * cdplayer.c: change packing so as to not try to expand panels. Fixes + bugs #83282. Change packing on vertical panels. Fixes bug + #67596 + 2002-12-14 Fernando Herrera <fherrera@onirica.com> * GNOME_CDPlayerApplet.server.in.in: added bugzilla attributtes diff --git a/cdplayer/cdplayer.c b/cdplayer/cdplayer.c index c1f6e3c86..6a9117ab1 100644 --- a/cdplayer/cdplayer.c +++ b/cdplayer/cdplayer.c @@ -573,12 +573,12 @@ ui_component_event (BonoboUIComponent *comp, static void setup_box(CDPlayerData* cd) { - GtkWidget *hbox; + GtkWidget *hbox, *vbox; if(cd->panel.box) destroy_box(cd); - if ((cd->orient == PANEL_APPLET_ORIENT_DOWN || cd->orient == PANEL_APPLET_ORIENT_UP) && cd->size < 36 ) + if ((cd->orient == PANEL_APPLET_ORIENT_DOWN || cd->orient == PANEL_APPLET_ORIENT_UP) && cd->size < 48 ) { /* tiny horizontal panel */ cd->panel.box = gtk_hbox_new(FALSE, 0); @@ -593,7 +593,7 @@ setup_box(CDPlayerData* cd) gtk_widget_show(cd->panel.box); } - else if ((cd->orient == PANEL_APPLET_ORIENT_DOWN || cd->orient == PANEL_APPLET_ORIENT_UP) && cd->size < 48 ) + else if ((cd->orient == PANEL_APPLET_ORIENT_DOWN || cd->orient == PANEL_APPLET_ORIENT_UP) && cd->size < 80 ) { /* small horizontal panel */ cd->panel.box = gtk_vbox_new(FALSE, 0); @@ -609,20 +609,18 @@ setup_box(CDPlayerData* cd) pack_thing(hbox, cd->panel.track_control.next, FALSE); gtk_widget_show(cd->panel.box); } - else if ((cd->orient == PANEL_APPLET_ORIENT_LEFT || cd->orient == PANEL_APPLET_ORIENT_RIGHT) && cd->size < 48 ) + else if ((cd->orient == PANEL_APPLET_ORIENT_LEFT || cd->orient == PANEL_APPLET_ORIENT_RIGHT) && cd->size < 128 ) { cd->panel.box = gtk_vbox_new(FALSE, 0); + vbox = cd->panel.box; gtk_container_add(GTK_CONTAINER(cd->panel.frame), cd->panel.box); pack_thing(cd->panel.box, cd->panel.time, TRUE); - hbox = pack_make_hbox(cd); - pack_thing(hbox, cd->panel.play_control.play_pause, TRUE); - pack_thing(hbox, cd->panel.play_control.stop, FALSE); - hbox = pack_make_hbox(cd); - pack_thing(hbox, cd->panel.play_control.eject, FALSE); - pack_thing(hbox, cd->panel.track_control.display, TRUE); - hbox = pack_make_hbox(cd); - pack_thing(hbox, cd->panel.track_control.prev, TRUE); - pack_thing(hbox, cd->panel.track_control.next, TRUE); + pack_thing(vbox, cd->panel.track_control.display, TRUE); + pack_thing(vbox, cd->panel.play_control.play_pause, TRUE); + pack_thing(vbox, cd->panel.track_control.prev, TRUE); + pack_thing(vbox, cd->panel.track_control.next, TRUE); + pack_thing(vbox, cd->panel.play_control.stop, FALSE); + pack_thing(vbox, cd->panel.play_control.eject, FALSE); gtk_widget_show(cd->panel.box); } else |