Mercurial > pidgin

comparison src/gtkstatusbox.c @ 12596:037a673ba862

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14926] Squeeze that statusbox! committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Wed, 21 Dec 2005 10:56:07 +0000
parents 3169cd6727ad
children 842b3b897cde
comparison
equal deleted inserted replaced
12595:3169cd6727ad 12596:037a673ba862
738 gtk_gaim_status_box_size_request(GtkWidget *widget, 738 gtk_gaim_status_box_size_request(GtkWidget *widget,
739 GtkRequisition *requisition) 739 GtkRequisition *requisition)
740 { 740 {
741 GtkRequisition box_req; 741 GtkRequisition box_req;
742 combo_box_size_request(widget, requisition); 742 combo_box_size_request(widget, requisition);
743 requisition->height += 6; 743 requisition->height += 3;
744 744
745 gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req); 745 gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req);
746 if (box_req.height > 1) 746 if (box_req.height > 1)
747 requisition->height = requisition->height + box_req.height + 6; 747 requisition->height = requisition->height + box_req.height + 3;
748 748
749 if (GTK_GAIM_STATUS_BOX(widget)->typing) { 749 if (GTK_GAIM_STATUS_BOX(widget)->typing) {
750 gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->toolbar, &box_req); 750 gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->toolbar, &box_req);
751 requisition->height = requisition->height + box_req.height; 751 requisition->height = requisition->height + box_req.height;
752 } 752 }
763 763
764 parent_alc = *allocation; 764 parent_alc = *allocation;
765 box_alc = *allocation; 765 box_alc = *allocation;
766 combo_box_size_request(widget, &req); 766 combo_box_size_request(widget, &req);
767 767
768 box_alc.height = MAX(1, (allocation->height - req.height - 12)); 768 box_alc.height = MAX(1, (allocation->height - req.height - 6));
769 box_alc.y = box_alc.y + req.height + 9; 769 box_alc.y = box_alc.y + req.height + 6;
770 770
771 box_alc.width -= 6; 771 box_alc.width -= 6;
772 box_alc.x += 3; 772 box_alc.x += 3;
773 773
774 gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc); 774 gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc);