Mercurial > pidgin
view src/gtkmenutray.c @ 12115:e9790eb93216
[gaim-migrate @ 14415]
quoth charkins:
" This patch has a few small fixes for the visibility
stuff in gtkblist.c.
First, tracking of the ICONIFIED state of the blist was
removed. This was intended to allow the blist to
"remember" if it was minimized between restarts.
Unfortunately, this is not possible because the
ICONIFIED state gets set when the blist is on a
different desktop with many window managers.
Second, while talking about the ICONIFIED issue on
#gtk@GIMPNet, muntyan_ asked about a bug where the
blist would get shown on an account re-connect with
1.5.0. Luke mentioned something about this with cvs as
well. This patch introduces a check in
gaim_gtk_blist_show() to prevent the window from being
shown if it already exists and is visible.
Third, sadrul pointed me to a one-line fix for the
missing blist on startup. I added a second line to make
sure the blist restores its proper size as well.
Finally, when the last visibility manager is removed,
gaim will now minimize the blist if it was previously
hidden, rather than showing it. This could prevent a
race condition with out-of-process applets, preventing
gaim from maintaining the visibility state properly
between restarts.
This was 'cvs diff'ed against the last available anon
cvs from Friday. Hopefully it'll apply cleanly."
it did.
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Wed, 16 Nov 2005 17:55:26 +0000 |
parents | 91aaa1b3ac30 |
children |
line wrap: on
line source
/* * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "debug.h" #include "gtkmenutray.h" #include <gtk/gtkeventbox.h> #include <gtk/gtkiconfactory.h> #include <gtk/gtkversion.h> /****************************************************************************** * Enums *****************************************************************************/ enum { PROP_ZERO = 0, PROP_BOX }; /****************************************************************************** * Globals *****************************************************************************/ static GObjectClass *parent_class = NULL; /****************************************************************************** * Internal Stuff *****************************************************************************/ /****************************************************************************** * Item Stuff *****************************************************************************/ static void gaim_gtk_menu_tray_select(GtkItem *item) { /* this may look like nothing, but it's really overriding the * GtkMenuItem's select function so that it doesn't get highlighted like * a normal menu item would. */ } static void gaim_gtk_menu_tray_deselect(GtkItem *item) { /* Probably not necessary, but I'd rather be safe than sorry. We're * overridding the select, so it makes sense to override deselect as well. */ } /****************************************************************************** * Widget Stuff *****************************************************************************/ /****************************************************************************** * Object Stuff *****************************************************************************/ static void gaim_gtk_menu_tray_get_property(GObject *obj, guint param_id, GValue *value, GParamSpec *pspec) { GaimGtkMenuTray *menu_tray = GAIM_GTK_MENU_TRAY(obj); switch(param_id) { case PROP_BOX: g_value_set_object(value, gaim_gtk_menu_tray_get_box(menu_tray)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec); break; } } static void gaim_gtk_menu_tray_finalize(GObject *obj) { #if 0 /* This _might_ be leaking, but I have a sneaking suspicion that the widget is * getting destroyed in GtkContainer's finalize function. But if were are * leaking here, be sure to figure out why this causes a crash. * -- Gary */ GaimGtkMenuTray *tray = GAIM_GTK_MENU_TRAY(obj); if(GTK_IS_WIDGET(tray->tray)) gtk_widget_destroy(GTK_WIDGET(tray->tray)); #endif G_OBJECT_CLASS(parent_class)->finalize(obj); } static void gaim_gtk_menu_tray_class_init(GaimGtkMenuTrayClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); GtkItemClass *item_class = GTK_ITEM_CLASS(klass); GParamSpec *pspec; parent_class = g_type_class_peek_parent(klass); object_class->finalize = gaim_gtk_menu_tray_finalize; object_class->get_property = gaim_gtk_menu_tray_get_property; item_class->select = gaim_gtk_menu_tray_select; item_class->deselect = gaim_gtk_menu_tray_deselect; pspec = g_param_spec_object("box", "The box", "The box", GTK_TYPE_BOX, G_PARAM_READABLE); g_object_class_install_property(object_class, PROP_BOX, pspec); } static void gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { GtkWidget *widget = GTK_WIDGET(menu_tray); #if GTK_CHECK_VERSION(2,2,0) GtkSettings *settings; #endif gint height = -1; gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); if(!GTK_IS_WIDGET(menu_tray->tray)) menu_tray->tray = gtk_hbox_new(FALSE, 0); menu_tray->tooltips = gtk_tooltips_new(); #if GTK_CHECK_VERSION(2,2,0) settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); if(gtk_icon_size_lookup_for_settings(settings, GTK_ICON_SIZE_MENU, NULL, &height)) #else if(gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, NULL, &height)) #endif { gtk_widget_set_size_request(widget, -1, height); } gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray); gtk_widget_show(menu_tray->tray); } /****************************************************************************** * API *****************************************************************************/ GType gaim_gtk_menu_tray_get_gtype(void) { static GType type = 0; if(type == 0) { static const GTypeInfo info = { sizeof(GaimGtkMenuTrayClass), NULL, NULL, (GClassInitFunc)gaim_gtk_menu_tray_class_init, NULL, NULL, sizeof(GaimGtkMenuTray), 0, (GInstanceInitFunc)gaim_gtk_menu_tray_init, NULL }; type = g_type_register_static(GTK_TYPE_MENU_ITEM, "GaimGtkMenuTray", &info, 0); } return type; } GtkWidget * gaim_gtk_menu_tray_new() { return g_object_new(GAIM_GTK_TYPE_MENU_TRAY, NULL); } GtkWidget * gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray) { g_return_val_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray), NULL); return menu_tray->tray; } static void gaim_gtk_menu_tray_add(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip, gboolean prepend) { g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray)); g_return_if_fail(GTK_IS_WIDGET(widget)); if (GTK_WIDGET_NO_WINDOW(widget)) { GtkWidget *event; event = gtk_event_box_new(); gtk_container_add(GTK_CONTAINER(event), widget); gtk_widget_show(event); widget = event; } gaim_gtk_menu_tray_set_tooltip(menu_tray, widget, tooltip); if (prepend) gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0); else gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0); } void gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip) { gaim_gtk_menu_tray_add(menu_tray, widget, tooltip, FALSE); } void gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip) { gaim_gtk_menu_tray_add(menu_tray, widget, tooltip, TRUE); } void gaim_gtk_menu_tray_set_tooltip(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip) { if (!menu_tray->tooltips) return; /* Should we check whether widget is a child of menu_tray? */ /* * If the widget does not have it's own window, then it * must have automatically been added to an event box * when it was added to the menu tray. If this is the * case, we want to set the tooltip on the widget's parent, * not on the widget itself. */ if (GTK_WIDGET_NO_WINDOW(widget)) widget = widget->parent; gtk_tooltips_set_tip(menu_tray->tooltips, widget, tooltip, NULL); }