AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Let ctrl key combinations move the focus without influencing the

Browse Source 
Sun Jun 20 23:39:51 2004  Matthias Clasen  <maclas@gmx.de>

	* libegg/iconlist/eggiconlist.c: Let ctrl key combinations
	move the focus without influencing the selection.
This commit is contained in:
Matthias Clasen 2004-06-21 03:41:04 +00:00 committed by Matthias Clasen
parent 9e6b81d8f1
commit 569bded2e2
1 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gtk/gtkiconview.c
View File

@ -928,15 +928,16 @@ egg_icon_list_button_press (GtkWidget *widget,
if (event->button == 1 && event->type == GDK_BUTTON_PRESS) if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{ {
if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
return TRUE;
item = egg_icon_list_get_item_at_pos (icon_list, item = egg_icon_list_get_item_at_pos (icon_list,
event->x, event->y); event->x, event->y);
if (item != NULL) if (item != NULL)
{ {
if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE && if (icon_list->priv->selection_mode == GTK_SELECTION_NONE)
{
egg_icon_list_set_cursor_item (icon_list, item);
}
else if (icon_list->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
(event->state & GDK_SHIFT_MASK)) (event->state & GDK_SHIFT_MASK))
{ {
egg_icon_list_unselect_all_internal (icon_list, FALSE); egg_icon_list_unselect_all_internal (icon_list, FALSE);
@ -966,6 +967,7 @@ egg_icon_list_button_press (GtkWidget *widget,
egg_icon_list_unselect_all_internal (icon_list, FALSE); egg_icon_list_unselect_all_internal (icon_list, FALSE);
item->selected = TRUE; item->selected = TRUE;
egg_icon_list_queue_draw_item (icon_list, item);
dirty = TRUE; dirty = TRUE;
} }
} }
@ -2898,16 +2900,23 @@ egg_icon_list_move_cursor_up_down (EggIconList *icon_list,
if (!item) if (!item)
return; return;
if (!icon_list->priv->shift_pressed || if (icon_list->priv->ctrl_pressed ||
!icon_list->priv->shift_pressed ||
!icon_list->priv->anchor_item || !icon_list->priv->anchor_item ||
icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE) icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
icon_list->priv->anchor_item = item; icon_list->priv->anchor_item = item;
icon_list->priv->cursor_item = item; egg_icon_list_set_cursor_item (icon_list, item);
if (!icon_list->priv->ctrl_pressed &&
icon_list->priv->selection_mode != GTK_SELECTION_NONE)
{
egg_icon_list_unselect_all (icon_list); egg_icon_list_unselect_all (icon_list);
egg_icon_list_select_all_between (icon_list, egg_icon_list_select_all_between (icon_list,
icon_list->priv->anchor_item, icon_list->priv->anchor_item,
item, TRUE); item, TRUE);
}
egg_icon_list_scroll_to_item (icon_list, item); egg_icon_list_scroll_to_item (icon_list, item);
} }
@ -2939,16 +2948,23 @@ egg_icon_list_move_cursor_page_up_down (EggIconList *icon_list,
if (!item) if (!item)
return; return;
if (!icon_list->priv->shift_pressed || if (icon_list->priv->ctrl_pressed ||
!icon_list->priv->shift_pressed ||
!icon_list->priv->anchor_item || !icon_list->priv->anchor_item ||
icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE) icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
icon_list->priv->anchor_item = item; icon_list->priv->anchor_item = item;
icon_list->priv->cursor_item = item; egg_icon_list_set_cursor_item (icon_list, item);
if (!icon_list->priv->ctrl_pressed &&
icon_list->priv->selection_mode != GTK_SELECTION_NONE)
{
egg_icon_list_unselect_all (icon_list); egg_icon_list_unselect_all (icon_list);
egg_icon_list_select_all_between (icon_list, egg_icon_list_select_all_between (icon_list,
icon_list->priv->anchor_item, icon_list->priv->anchor_item,
item, TRUE); item, TRUE);
}
egg_icon_list_scroll_to_item (icon_list, item); egg_icon_list_scroll_to_item (icon_list, item);
} }
@ -2980,16 +2996,23 @@ egg_icon_list_move_cursor_left_right (EggIconList *icon_list,
if (!item) if (!item)
return; return;
if (!icon_list->priv->shift_pressed || if (icon_list->priv->ctrl_pressed ||
!icon_list->priv->shift_pressed ||
!icon_list->priv->anchor_item || !icon_list->priv->anchor_item ||
icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE) icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
icon_list->priv->anchor_item = item; icon_list->priv->anchor_item = item;
icon_list->priv->cursor_item = item; egg_icon_list_set_cursor_item (icon_list, item);
if (!icon_list->priv->ctrl_pressed &&
icon_list->priv->selection_mode != GTK_SELECTION_NONE)
{
egg_icon_list_unselect_all (icon_list); egg_icon_list_unselect_all (icon_list);
egg_icon_list_select_all_between (icon_list, egg_icon_list_select_all_between (icon_list,
icon_list->priv->anchor_item, icon_list->priv->anchor_item,
item, TRUE); item, TRUE);
}
egg_icon_list_scroll_to_item (icon_list, item); egg_icon_list_scroll_to_item (icon_list, item);
} }
@ -3013,16 +3036,23 @@ egg_icon_list_move_cursor_start_end (EggIconList *icon_list,
if (!item) if (!item)
return; return;
if (!icon_list->priv->shift_pressed || if (icon_list->priv->ctrl_pressed ||
!icon_list->priv->shift_pressed ||
!icon_list->priv->anchor_item || !icon_list->priv->anchor_item ||
icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE) icon_list->priv->selection_mode != GTK_SELECTION_MULTIPLE)
icon_list->priv->anchor_item = item; icon_list->priv->anchor_item = item;
icon_list->priv->cursor_item = item; egg_icon_list_set_cursor_item (icon_list, item);
if (!icon_list->priv->ctrl_pressed &&
icon_list->priv->selection_mode != GTK_SELECTION_NONE)
{
egg_icon_list_unselect_all (icon_list); egg_icon_list_unselect_all (icon_list);
egg_icon_list_select_all_between (icon_list, egg_icon_list_select_all_between (icon_list,
icon_list->priv->anchor_item, icon_list->priv->anchor_item,
item, TRUE); item, TRUE);
}
egg_icon_list_scroll_to_item (icon_list, item); egg_icon_list_scroll_to_item (icon_list, item);
} }