[Goodies-commits] r7270 - in xfmpc/branches/xfmpc-0.1.x: . src

[Mike Massonnet]

Author: mmassonnet
Date: 2009-04-22 13:43:16 +0000 (Wed, 22 Apr 2009)
New Revision: 7270

Modified:
   xfmpc/branches/xfmpc-0.1.x/ChangeLog
   xfmpc/branches/xfmpc-0.1.x/src/dbbrowser.c
   xfmpc/branches/xfmpc-0.1.x/src/playlist.c
Log:
Avoid losing multiple selection in playlist/dbbrowser

Modified: xfmpc/branches/xfmpc-0.1.x/ChangeLog
===================================================================
--- xfmpc/branches/xfmpc-0.1.x/ChangeLog	2009-04-22 07:52:39 UTC (rev 7269)
+++ xfmpc/branches/xfmpc-0.1.x/ChangeLog	2009-04-22 13:43:16 UTC (rev 7270)
@@ -1,7 +1,13 @@
 2009-03-29	Mike Massonnet <mmassonnet at xfce.org>
 
+Avoid losing multiple selection in playlist/dbbrowser
+	* src/playlist.c, src/dbbrowser.c:
+	  - Don't lose multiple selection when right clicking
+
+2009-03-29	Mike Massonnet <mmassonnet at xfce.org>
+
 Be more careful with context menus
-	* src/playlist.c, src/dbbrowse.c:
+	* src/playlist.c, src/dbbrowser.c:
 	  - Don't show the context menu when no row is selected
 	  - React on button release instead of press this way it lets you do
 	  rubber banding selections

Modified: xfmpc/branches/xfmpc-0.1.x/src/dbbrowser.c
===================================================================
--- xfmpc/branches/xfmpc-0.1.x/src/dbbrowser.c	2009-04-22 07:52:39 UTC (rev 7269)
+++ xfmpc/branches/xfmpc-0.1.x/src/dbbrowser.c	2009-04-22 13:43:16 UTC (rev 7270)
@@ -45,6 +45,8 @@
                                                                 GtkTreeViewColumn *column);
 static gboolean         cb_key_pressed                         (XfmpcDbbrowser *dbbrowser,
                                                                 GdkEventKey *event);
+static gboolean         cb_button_pressed                      (XfmpcDbbrowser *dbbrowser,
+                                                                GdkEventButton *event);
 static gboolean         cb_button_released                     (XfmpcDbbrowser *dbbrowser,
                                                                 GdkEventButton *event);
 static gboolean         cb_popup_menu                          (XfmpcDbbrowser *dbbrowser);
@@ -256,6 +258,8 @@
                             G_CALLBACK (cb_row_activated), dbbrowser);
   g_signal_connect_swapped (priv->treeview, "key-press-event",
                             G_CALLBACK (cb_key_pressed), dbbrowser);
+  g_signal_connect_swapped (priv->treeview, "button-press-event",
+                            G_CALLBACK (cb_button_pressed), dbbrowser);
   g_signal_connect_swapped (priv->treeview, "button-release-event",
                             G_CALLBACK (cb_button_released), dbbrowser);
   g_signal_connect_swapped (priv->treeview, "popup-menu",
@@ -588,6 +592,14 @@
 }
 
 static gboolean
+cb_button_pressed (XfmpcPlaylist *playlist,
+                   GdkEventButton *event)
+{
+  /* Avoid multiple selections from getting lost for button 3 */
+  return event->button == 3 ? TRUE : FALSE;
+}
+
+static gboolean
 cb_button_released (XfmpcDbbrowser *dbbrowser,
                     GdkEventButton *event)
 {

Modified: xfmpc/branches/xfmpc-0.1.x/src/playlist.c
===================================================================
--- xfmpc/branches/xfmpc-0.1.x/src/playlist.c	2009-04-22 07:52:39 UTC (rev 7269)
+++ xfmpc/branches/xfmpc-0.1.x/src/playlist.c	2009-04-22 13:43:16 UTC (rev 7270)
@@ -51,6 +51,8 @@
                                                                  GtkTreeViewColumn *column);
 static gboolean         cb_key_released                         (XfmpcPlaylist *playlist,
                                                                  GdkEventKey *event);
+static gboolean         cb_button_pressed                       (XfmpcPlaylist *playlist,
+                                                                 GdkEventButton *event);
 static gboolean         cb_button_released                      (XfmpcPlaylist *playlist,
                                                                  GdkEventButton *event);
 static gboolean         cb_popup_menu                           (XfmpcPlaylist *playlist);
@@ -281,6 +283,8 @@
                             G_CALLBACK (cb_row_activated), playlist);
   g_signal_connect_swapped (priv->treeview, "key-release-event",
                             G_CALLBACK (cb_key_released), playlist);
+  g_signal_connect_swapped (priv->treeview, "button-press-event",
+                            G_CALLBACK (cb_button_pressed), playlist);
   g_signal_connect_swapped (priv->treeview, "button-release-event",
                             G_CALLBACK (cb_button_released), playlist);
   g_signal_connect_swapped (priv->treeview, "popup-menu",
@@ -495,6 +499,14 @@
 }
 
 static gboolean
+cb_button_pressed (XfmpcPlaylist *playlist,
+                   GdkEventButton *event)
+{
+  /* Avoid multiple selections from getting lost for button 3 */
+  return event->button == 3 ? TRUE : FALSE;
+}
+
+static gboolean
 cb_button_released (XfmpcPlaylist *playlist,
                     GdkEventButton *event)
 {