Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org>
Wed Mar 17 01:46:28 1999 Tim Janik <timj@gtk.org> * merges from gtk-1-2: Tue Mar 16 17:43:33 1999 Tim Janik <timj@gtk.org> * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc_string): ensure the item factory class has been created. (gtk_item_factory_parse_rc): likewise. * gtk/gtkmenu.c: keep proper references for old_active_menu_item. (gtk_menu_reparent): unset the usize of the new parent, so the menu can sanely be size requested and we don't get nasty screen artefacts upon next reparentation. (gtk_menu_motion_notify): set send_event to TRUE if we synthesize an enter notify. only synthesize enter notifies if the pointer really is inside the event window. (gtk_menu_popdown): use gtk_menu_shell_deselect(). (gtk_menu_popup): move the background setting stuff into gtk_menu_tearoff_bg_copy() so it can be called from other places as well. * gtk/gtkmenushell.c (gtk_menu_shell_button_press): use gtk_menu_shell_select_item() to select the new item. (gtk_menu_shell_deselect): export this function, so gtkmenu.c can do the right thing for deselection as well. Sat Mar 15 20:10:33 1999 Tim Janik <timj@gtk.org> * gtk/gtkwidget.[hc]: (gtk_widget_accelerators_locked): return whether a widget's accelerators are locked. * gtk/gtkmenu.c (gtk_menu_key_press): don't remove or install new or existing accelerators if the widget's accelerators are locked. Sat Mar 14 19:44:05 1999 Tim Janik <timj@gtk.org> * gtk/gtkitemfactory.[hc]: allow managing of foreign menu items. * gtk/gtkmenu.c: truely forward key press and key release events to the menu widget from the toplevel or tearoff window. we can't simply connect to that, we need to stop further processing of the events as well. Sat Mar 13 13:14:17 1999 Tim Janik <timj@gtk.org> * gtk/gtkmenu.c: (gtk_menu_key_press): pass event->keyval, event->state to gtk_accelerator_valid, instead of event->keyval twice. refuse to install single letter accelerators for menus that use single letter shortcuts. * gtk/gtkitemfactory.c (gtk_item_factory_create_item): use gtk_menu_ensure_uline_accel_group(). * gtk/gtkmenu.[hc]: added gtk_menu_ensure_uline_accel_group() which will always return an uline accel group, made gtk_menu_get_uline_accel_group() return NULL if the group isn't yet created. Mon Mar 15 01:03:27 1999 Lars Hamann <lars@gtk.org> * gtk/gtkclist.h (struct _GtkCListColumn): added button_passive flag. * gtk/gtkclist.c (gtk_clist_column_title_passive): Leave button sensitive, trap button_press, button_release, motion_notify, enter_notify and leave_notify events instead. (gtk_clist_column_title_active): disconnect event handler. (gtk_clist_drag_data_get): fixed memory leak. Reported by Guillaume Laurent <glaurent@worldnet.fr> Wed Mar 10 23:49:55 1999 Lars Hamann <lars@gtk.org> * gtk/gtklayout.c (gtk_layout_adjustment_changed): fixed a few width/height mixups. * gtk/gtkctree.c (tree_delete): emit an tree_unselect_row signal if needed. Wed Mar 10 00:11:32 1999 Tim Janik <timj@gtk.org> * gtk/testgtk.c (create_item_factory): unref the item factory after window's destruction. * gtk/gtkmenushell.c (gtk_menu_shell_activate_item): keep a reference count on the menu shell around the menu item's activation, since the signal emission may cause menu shell destruction. * gtk/gtkitemfactory.c: the previous code leaked one accel group per menu. we use gtk_menu_get_uline_accel_group() now to fix that, and with that also create the underline accelerator group of the menus only if required (i.e. an underline accelerator has been specified). (gtk_item_factory_construct): (gtk_item_factory_create_item): removed code that would create an extra accel group for the menu (and leak references). (gtk_item_factory_create_item): adapted the underline accelerator installation code to properly feature gtk_menu_get_uline_accel_group(). * gtk/gtkmenu.[hc]: added gtk_menu_get_accel_group() to retrive menu->accel_group, this may return NULL if the accelerator group hasn't been set yet. added gtk_menu_get_uline_accel_group() to retrive the underline accelerator group of the menu, this will be created on demand and proper care is taken about its reference count. * gtk/gtkitemfactory.h: * gtk/gtkitemfactory.c: dumped the approach of keeping a widgets by action list on the factory since the factory<->widget destroy negotiation didn't work and would be hard to get going at all. instead we keep a list of GtkItemFactoryItem items on the factory (GtkItemFactoryItems are persistant throughout a program's life time). also, i removed the static const gchar *key_* variables, and made them inline strings (they weren't actually used anyways). (gtk_item_factory_add_item): update ifactory->items. (gtk_item_factory_destroy): destroy ifactory->items (and remove the item factory pointer from the remaining ifactory widgets). (gtk_item_factory_get_widget_by_action): walk the GtkItemFactoryItem list to find the widget. (gtk_item_factory_get_item): new function that works around gtk_item_factory_get_widget() limitations, this function will only return menu items, even for <Branch> entries. Tue Mar 9 01:01:28 1999 Tim Janik <timj@gtk.org> * gdk/gdkfont.c (gdk_font_load): first lookup the xfont ID in our font hash table, if we have a GdkFontPrivate entry for this font already, simply increment its reference count, provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. * gtk/gtkstyle.c (gtk_style_copy): plug a GdkFont reference leak, fix provided by Olaf Dietsche <olaf.dietsche+list.gtk@netcologne.de>. Sun Mar 7 06:13:29 1999 Tim Janik <timj@gtk.org> * gtk/gtkcontainer.c: (gtk_container_add_with_args): (gtk_container_addv): (gtk_container_add): before adding a child to a conatiner, make sure it is (default) constructed, this is neccessary because under certain circumstances the child will get relized and mapped immediatedly, in which case it has to be constructed already. Mon Mar 1 17:58:21 1999 Tim Janik <timj@gtk.org> * gtk/gtksignal.c (gtk_signal_connect_by_type): count object_signal values > 1 as TRUE also.
This commit is contained in:
Tim Janik
296
gtk/gtkclist.c
296
gtk/gtkclist.c
@ -39,7 +39,7 @@
|
||||
#define MAX_BUTTON 5
|
||||
|
||||
/* the number rows memchunk expands at a time */
|
||||
#define CLIST_OPTIMUM_SIZE 512
|
||||
#define CLIST_OPTIMUM_SIZE 64
|
||||
|
||||
/* the width of the column resize windows */
|
||||
#define DRAG_WIDTH 6
|
||||
@ -438,11 +438,14 @@ static GList *gtk_clist_mergesort (GtkCList *clist,
|
||||
GList *list,
|
||||
gint num);
|
||||
/* Misc */
|
||||
static gboolean title_focus (GtkCList *clist,
|
||||
gint dir);
|
||||
static void real_row_move (GtkCList *clist,
|
||||
gint source_row,
|
||||
gint dest_row);
|
||||
static gboolean title_focus (GtkCList *clist,
|
||||
gint dir);
|
||||
static void real_row_move (GtkCList *clist,
|
||||
gint source_row,
|
||||
gint dest_row);
|
||||
static gint column_title_passive_func (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
gpointer data);
|
||||
|
||||
|
||||
|
||||
@ -1291,44 +1294,110 @@ void
|
||||
gtk_clist_column_title_active (GtkCList *clist,
|
||||
gint column)
|
||||
{
|
||||
GtkObject *object;
|
||||
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
if (column < 0 || column >= clist->columns)
|
||||
return;
|
||||
if (!clist->column[column].button)
|
||||
if (!clist->column[column].button || !clist->column[column].button_passive)
|
||||
return;
|
||||
|
||||
if (!GTK_WIDGET_SENSITIVE (clist->column[column].button) ||
|
||||
!GTK_WIDGET_CAN_FOCUS (clist->column[column].button))
|
||||
{
|
||||
GTK_WIDGET_SET_FLAGS (clist->column[column].button,
|
||||
GTK_SENSITIVE | GTK_CAN_FOCUS);
|
||||
if (GTK_WIDGET_VISIBLE (clist))
|
||||
gtk_widget_queue_draw (clist->column[column].button);
|
||||
}
|
||||
object = GTK_OBJECT (clist->column[column].button);
|
||||
|
||||
clist->column[column].button_passive = FALSE;
|
||||
|
||||
gtk_signal_disconnect_by_func (object,
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("button_press_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_disconnect_by_func (object,
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("button_release_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_disconnect_by_func (object,
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("motion_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_disconnect_by_func (object,
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("enter_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_disconnect_by_func (object,
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("leave_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
|
||||
GTK_WIDGET_SET_FLAGS (clist->column[column].button, GTK_CAN_FOCUS);
|
||||
if (GTK_WIDGET_VISIBLE (clist))
|
||||
gtk_widget_queue_draw (clist->column[column].button);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_clist_column_title_passive (GtkCList *clist,
|
||||
gint column)
|
||||
{
|
||||
GtkObject *object;
|
||||
GtkButton *button;
|
||||
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
if (column < 0 || column >= clist->columns)
|
||||
return;
|
||||
if (!clist->column[column].button)
|
||||
if (!clist->column[column].button || clist->column[column].button_passive)
|
||||
return;
|
||||
|
||||
if (GTK_WIDGET_SENSITIVE (clist->column[column].button) ||
|
||||
GTK_WIDGET_CAN_FOCUS (clist->column[column].button))
|
||||
{
|
||||
GTK_WIDGET_UNSET_FLAGS (clist->column[column].button,
|
||||
GTK_SENSITIVE | GTK_CAN_FOCUS);
|
||||
if (GTK_WIDGET_VISIBLE (clist))
|
||||
gtk_widget_queue_draw (clist->column[column].button);
|
||||
}
|
||||
object = GTK_OBJECT (clist->column[column].button);
|
||||
button = GTK_BUTTON (clist->column[column].button);
|
||||
|
||||
clist->column[column].button_passive = TRUE;
|
||||
|
||||
|
||||
|
||||
gtk_signal_connect (object, "button_press_event",
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("button_press_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
|
||||
if (button->button_down)
|
||||
gtk_button_released (button);
|
||||
|
||||
gtk_signal_connect (object, "button_release_event",
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("button_release_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_connect (object, "motion_notify_event",
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("motion_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
gtk_signal_connect (object, "enter_notify_event",
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("enter_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
|
||||
if (button->in_button)
|
||||
gtk_button_leave (button);
|
||||
|
||||
gtk_signal_connect (object, "leave_notify_event",
|
||||
(GtkSignalFunc) column_title_passive_func,
|
||||
GINT_TO_POINTER (gtk_signal_lookup
|
||||
("leave_notify_event",
|
||||
GTK_TYPE_WIDGET)));
|
||||
|
||||
GTK_WIDGET_UNSET_FLAGS (clist->column[column].button, GTK_CAN_FOCUS);
|
||||
if (GTK_WIDGET_VISIBLE (clist))
|
||||
gtk_widget_queue_draw (clist->column[column].button);
|
||||
}
|
||||
|
||||
void
|
||||
@ -1764,6 +1833,7 @@ gtk_clist_set_column_max_width (GtkCList *clist,
|
||||
* new_column_width
|
||||
* column_button_create
|
||||
* column_button_clicked
|
||||
* column_title_passive_func
|
||||
*/
|
||||
static void
|
||||
column_auto_resize (GtkCList *clist,
|
||||
@ -2103,84 +2173,15 @@ column_button_clicked (GtkWidget *widget,
|
||||
gtk_signal_emit (GTK_OBJECT (clist), clist_signals[CLICK_COLUMN], i);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_clist_set_row_height (GtkCList *clist,
|
||||
guint height)
|
||||
static gint
|
||||
column_title_passive_func (GtkWidget *widget,
|
||||
GdkEvent *event,
|
||||
gpointer data)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
widget = GTK_WIDGET (clist);
|
||||
|
||||
if (height > 0)
|
||||
{
|
||||
clist->row_height = height;
|
||||
GTK_CLIST_SET_FLAG (clist, CLIST_ROW_HEIGHT_SET);
|
||||
}
|
||||
else
|
||||
{
|
||||
GTK_CLIST_UNSET_FLAG (clist, CLIST_ROW_HEIGHT_SET);
|
||||
clist->row_height = 0;
|
||||
}
|
||||
|
||||
if (GTK_WIDGET_REALIZED (clist))
|
||||
{
|
||||
if (!GTK_CLIST_ROW_HEIGHT_SET(clist))
|
||||
{
|
||||
clist->row_height = (widget->style->font->ascent +
|
||||
widget->style->font->descent + 1);
|
||||
clist->row_center_offset = widget->style->font->ascent + 1.5;
|
||||
}
|
||||
else
|
||||
clist->row_center_offset = 1.5 + (clist->row_height +
|
||||
widget->style->font->ascent -
|
||||
widget->style->font->descent - 1) / 2;
|
||||
}
|
||||
|
||||
CLIST_REFRESH (clist);
|
||||
gtk_signal_emit_stop (GTK_OBJECT (widget), GPOINTER_TO_INT (data));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void
|
||||
gtk_clist_moveto (GtkCList *clist,
|
||||
gint row,
|
||||
gint column,
|
||||
gfloat row_align,
|
||||
gfloat col_align)
|
||||
{
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
if (row < -1 || row >= clist->rows)
|
||||
return;
|
||||
if (column < -1 || column >= clist->columns)
|
||||
return;
|
||||
|
||||
row_align = CLAMP (row_align, 0, 1);
|
||||
col_align = CLAMP (col_align, 0, 1);
|
||||
|
||||
/* adjust horizontal scrollbar */
|
||||
if (clist->hadjustment && column >= 0)
|
||||
{
|
||||
gint x;
|
||||
|
||||
x = (COLUMN_LEFT (clist, column) - CELL_SPACING - COLUMN_INSET -
|
||||
(col_align * (clist->clist_window_width - 2 * COLUMN_INSET -
|
||||
CELL_SPACING - clist->column[column].area.width)));
|
||||
if (x < 0)
|
||||
gtk_adjustment_set_value (clist->hadjustment, 0.0);
|
||||
else if (x > LIST_WIDTH (clist) - clist->clist_window_width)
|
||||
gtk_adjustment_set_value
|
||||
(clist->hadjustment, LIST_WIDTH (clist) - clist->clist_window_width);
|
||||
else
|
||||
gtk_adjustment_set_value (clist->hadjustment, x);
|
||||
}
|
||||
|
||||
/* adjust vertical scrollbar */
|
||||
if (clist->vadjustment && row >= 0)
|
||||
move_vertical (clist, row, row_align);
|
||||
}
|
||||
|
||||
/* PUBLIC CELL FUNCTIONS
|
||||
* gtk_clist_get_cell_type
|
||||
@ -2934,6 +2935,8 @@ real_row_move (GtkCList *clist,
|
||||
}
|
||||
|
||||
/* PUBLIC ROW FUNCTIONS
|
||||
* gtk_clist_moveto
|
||||
* gtk_clist_set_row_height
|
||||
* gtk_clist_set_row_data
|
||||
* gtk_clist_set_row_data_full
|
||||
* gtk_clist_get_row_data
|
||||
@ -2944,6 +2947,85 @@ real_row_move (GtkCList *clist,
|
||||
* gtk_clist_set_foreground
|
||||
* gtk_clist_set_background
|
||||
*/
|
||||
void
|
||||
gtk_clist_moveto (GtkCList *clist,
|
||||
gint row,
|
||||
gint column,
|
||||
gfloat row_align,
|
||||
gfloat col_align)
|
||||
{
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
if (row < -1 || row >= clist->rows)
|
||||
return;
|
||||
if (column < -1 || column >= clist->columns)
|
||||
return;
|
||||
|
||||
row_align = CLAMP (row_align, 0, 1);
|
||||
col_align = CLAMP (col_align, 0, 1);
|
||||
|
||||
/* adjust horizontal scrollbar */
|
||||
if (clist->hadjustment && column >= 0)
|
||||
{
|
||||
gint x;
|
||||
|
||||
x = (COLUMN_LEFT (clist, column) - CELL_SPACING - COLUMN_INSET -
|
||||
(col_align * (clist->clist_window_width - 2 * COLUMN_INSET -
|
||||
CELL_SPACING - clist->column[column].area.width)));
|
||||
if (x < 0)
|
||||
gtk_adjustment_set_value (clist->hadjustment, 0.0);
|
||||
else if (x > LIST_WIDTH (clist) - clist->clist_window_width)
|
||||
gtk_adjustment_set_value
|
||||
(clist->hadjustment, LIST_WIDTH (clist) - clist->clist_window_width);
|
||||
else
|
||||
gtk_adjustment_set_value (clist->hadjustment, x);
|
||||
}
|
||||
|
||||
/* adjust vertical scrollbar */
|
||||
if (clist->vadjustment && row >= 0)
|
||||
move_vertical (clist, row, row_align);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_clist_set_row_height (GtkCList *clist,
|
||||
guint height)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
|
||||
g_return_if_fail (clist != NULL);
|
||||
g_return_if_fail (GTK_IS_CLIST (clist));
|
||||
|
||||
widget = GTK_WIDGET (clist);
|
||||
|
||||
if (height > 0)
|
||||
{
|
||||
clist->row_height = height;
|
||||
GTK_CLIST_SET_FLAG (clist, CLIST_ROW_HEIGHT_SET);
|
||||
}
|
||||
else
|
||||
{
|
||||
GTK_CLIST_UNSET_FLAG (clist, CLIST_ROW_HEIGHT_SET);
|
||||
clist->row_height = 0;
|
||||
}
|
||||
|
||||
if (GTK_WIDGET_REALIZED (clist))
|
||||
{
|
||||
if (!GTK_CLIST_ROW_HEIGHT_SET(clist))
|
||||
{
|
||||
clist->row_height = (widget->style->font->ascent +
|
||||
widget->style->font->descent + 1);
|
||||
clist->row_center_offset = widget->style->font->ascent + 1.5;
|
||||
}
|
||||
else
|
||||
clist->row_center_offset = 1.5 + (clist->row_height +
|
||||
widget->style->font->ascent -
|
||||
widget->style->font->descent - 1) / 2;
|
||||
}
|
||||
|
||||
CLIST_REFRESH (clist);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_clist_set_row_data (GtkCList *clist,
|
||||
gint row,
|
||||
@ -6356,6 +6438,7 @@ columns_new (GtkCList *clist)
|
||||
column[i].width_set = FALSE;
|
||||
column[i].resizeable = TRUE;
|
||||
column[i].auto_resize = FALSE;
|
||||
column[i].button_passive = FALSE;
|
||||
column[i].justification = GTK_JUSTIFY_LEFT;
|
||||
}
|
||||
|
||||
@ -7708,21 +7791,18 @@ gtk_clist_drag_data_get (GtkWidget *widget,
|
||||
|
||||
if (info)
|
||||
{
|
||||
GtkCListCellInfo *ret_info;
|
||||
GtkCListCellInfo ret_info;
|
||||
|
||||
ret_info = g_new (GtkCListCellInfo, 1);
|
||||
ret_info->row = info->row;
|
||||
ret_info->column = info->column;
|
||||
ret_info.row = info->row;
|
||||
ret_info.column = info->column;
|
||||
|
||||
gtk_selection_data_set (selection_data,
|
||||
selection_data->target,
|
||||
GTK_TYPE_POINTER,
|
||||
(guchar *) ret_info,
|
||||
gtk_selection_data_set (selection_data, selection_data->target,
|
||||
GTK_TYPE_POINTER, (guchar *) &ret_info,
|
||||
sizeof (GtkCListCellInfo));
|
||||
}
|
||||
else
|
||||
gtk_selection_data_set (selection_data, selection_data->target,
|
||||
GTK_TYPE_POINTER, NULL, 0);
|
||||
GTK_TYPE_POINTER, NULL, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user