comparison src/audacious/widgets/playlist_list.c @ 2356:4b2c7d9523e7 trunk

[svn] right-clicking on playlist entry automatically selects the entry if it was unselected before, closes #728

2355:f03beaca8e81

static void
playlist_list_button_press_cb(GtkWidget * widget,
                              GdkEventButton * event,
                              PlayList_List * pl)
{
    gint nr, y;
    Playlist *playlist = playlist_get_active();

    if (event->button == 1 && pl->pl_fheight &&
        widget_contains(&pl->pl_widget, event->x, event->y)) {

        y = event->y - pl->pl_widget.y;
        nr = (y / pl->pl_fheight) + pl->pl_first;

        if (nr >= playlist_get_length(playlist))
            nr = playlist_get_length(playlist) - 1;

        if (!(event->state & GDK_CONTROL_MASK))
            playlist_select_all(playlist, FALSE);

        if (event->state & GDK_SHIFT_MASK && pl->pl_prev_selected != -1) {
            playlist_select_range(playlist, pl->pl_prev_selected, nr, TRUE);

            if (!playback_get_playing())
                playback_initiate();
        }

        pl->pl_dragging = TRUE;
        playlistwin_update_list(playlist);
    }
}

gint
playlist_list_get_playlist_position(PlayList_List * pl,
                                    gint x,

        return -1;
    iy = y - pl->pl_widget.y;

    ret = (iy / pl->pl_fheight) + pl->pl_first;

    if(ret > length-1)
	    ret = -1;

    return ret;
}

2356:4b2c7d9523e7

static void
playlist_list_button_press_cb(GtkWidget * widget,
                              GdkEventButton * event,
                              PlayList_List * pl)
{
    gint nr;
    Playlist *playlist = playlist_get_active();

	nr = playlist_list_get_playlist_position(pl, event->x, event->y);
	if (nr == -1)
		return;

	if (event->button == 3)
	{
		GList* selection = playlist_get_selected(playlist);
		if (g_list_find(selection, GINT_TO_POINTER(nr)) == NULL)
		{
			playlist_select_all(playlist, FALSE);
			playlist_select_range(playlist, nr, nr, TRUE);
		}
	}
	else if (event->button == 1)
	{
        if (!(event->state & GDK_CONTROL_MASK))
            playlist_select_all(playlist, FALSE);

        if (event->state & GDK_SHIFT_MASK && pl->pl_prev_selected != -1) {
            playlist_select_range(playlist, pl->pl_prev_selected, nr, TRUE);

            if (!playback_get_playing())
                playback_initiate();
        }

        pl->pl_dragging = TRUE;
    }

	playlistwin_update_list(playlist);
}

gint
playlist_list_get_playlist_position(PlayList_List * pl,
                                    gint x,

        return -1;
    iy = y - pl->pl_widget.y;

    ret = (iy / pl->pl_fheight) + pl->pl_first;

    if (ret > length - 1)
	    ret = -1;

    return ret;
}