=== modified file 'panel-plugin/weather.c' --- panel-plugin/weather.c 2009-07-30 10:52:47 +0000 +++ panel-plugin/weather.c 2009-07-30 11:04:50 +0000 @@ -147,10 +147,10 @@ } /* arbitrary, choose something that works */ - if (orientation == GTK_ORIENTATION_HORIZONTAL) + if (0) // (orientation == GTK_ORIENTATION_HORIZONTAL) txtsize = "medium"; else if (size > 36) - txtsize = "medium"; + txtsize = "small"; else if (size > 30) txtsize = "small"; else if (size > 24) @@ -230,10 +230,10 @@ /* arbitrary, choose something that works */ - if (data->orientation == GTK_ORIENTATION_HORIZONTAL) + if (0) //(data->orientation == GTK_ORIENTATION_HORIZONTAL) txtsize = "medium"; else if (size > 36) - txtsize = "medium"; + txtsize = "small"; else if (size > 30) txtsize = "small"; else if (size > 24) @@ -249,7 +249,7 @@ gtk_widget_get_size_request (data->scrollbox, NULL, &height); - if (data->orientation == GTK_ORIENTATION_VERTICAL) + if (1) //(data->orientation == GTK_ORIENTATION_VERTICAL) icon = get_icon ("99", data->size - height - 2); else icon = get_icon ("99", data->size); @@ -296,7 +296,7 @@ else { gtk_widget_get_size_request (data->scrollbox, NULL, &height); - if (data->orientation == GTK_ORIENTATION_VERTICAL) + if (1) //(data->orientation == GTK_ORIENTATION_VERTICAL) size = data->size - height - 2; else size = data->size; @@ -808,14 +808,14 @@ data->labels = g_array_new (FALSE, TRUE, sizeof (datas)); data->vbox_center_scrollbox = gtk_vbox_new(FALSE, 0); + data->top_vbox = gtk_vbox_new (FALSE, 0); + //gtk_misc_set_alignment (GTK_MISC (data->iconimage), 1, 0.5); + gtk_box_pack_start (GTK_BOX (data->top_vbox), data->iconimage, TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (data->vbox_center_scrollbox), data->scrollbox, TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (data->top_vbox), data->vbox_center_scrollbox, TRUE, FALSE, 0); + data->top_hbox = gtk_hbox_new (FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (data->iconimage), 1, 0.5); - gtk_box_pack_start (GTK_BOX (data->top_hbox), data->iconimage, TRUE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (data->vbox_center_scrollbox), data->scrollbox, TRUE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (data->top_hbox), data->vbox_center_scrollbox, TRUE, FALSE, 0); - - data->top_vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (data->top_vbox), data->top_hbox, TRUE, FALSE, 0); + //gtk_box_pack_start (GTK_BOX (data->top_vbox), data->top_hbox, TRUE, FALSE, 0); data->tooltipbox = gtk_event_box_new (); gtk_container_add (GTK_CONTAINER (data->tooltipbox), data->top_vbox); @@ -948,7 +948,7 @@ gtk_container_remove(GTK_CONTAINER(parent), data->vbox_center_scrollbox); if (data->orientation == GTK_ORIENTATION_HORIZONTAL) { - gtk_box_pack_start (GTK_BOX (data->top_hbox), data->vbox_center_scrollbox, TRUE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (data->top_vbox), data->vbox_center_scrollbox, TRUE, FALSE, 0); } else { gtk_box_pack_start (GTK_BOX (data->top_vbox), data->vbox_center_scrollbox, TRUE, FALSE, 0); }