[nautilus/middle-click-tab-close: 1/2] general: Use constants for button events
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/middle-click-tab-close: 1/2] general: Use constants for button events
- Date: Tue, 13 Feb 2018 11:55:41 +0000 (UTC)
commit 71931d5766bce9d9c5711c49e7ed6c9e16c56594
Author: Carlos Soriano <csoriano gnome org>
Date: Tue Feb 13 12:53:24 2018 +0100
general: Use constants for button events
src/nautilus-list-view.c | 22 +++++++++++-----------
src/nautilus-notebook.c | 2 +-
src/nautilus-pathbar.c | 2 +-
src/nautilus-toolbar.c | 2 +-
src/nautilus-window.c | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 8f226b6e2..c579e39bd 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -267,7 +267,7 @@ nautilus_list_view_did_not_drag (NautilusListView *view,
if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
&path, NULL, NULL, NULL))
{
- if ((event->button == 1 || event->button == 2)
+ if ((event->button == GDK_BUTTON_PRIMARY || event->button == GDK_BUTTON_MIDDLE)
&& ((event->state & GDK_CONTROL_MASK) != 0 ||
(event->state & GDK_SHIFT_MASK) == 0)
&& view->details->row_selected_on_button_down)
@@ -286,11 +286,11 @@ nautilus_list_view_did_not_drag (NautilusListView *view,
if ((get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE)
&& !button_event_modifies_selection (event))
{
- if (event->button == 1)
+ if (event->button == GDK_BUTTON_PRIMARY)
{
activate_selected_items (view);
}
- else if (event->button == 2)
+ else if (event->button == GDK_BUTTON_MIDDLE)
{
activate_selected_items_alternate (view, NULL, TRUE);
}
@@ -563,7 +563,7 @@ button_press_callback (GtkWidget *widget,
}
view->details->ignore_button_release = FALSE;
- is_simple_click = ((event->button == 1 || event->button == 2) && (event->type == GDK_BUTTON_PRESS));
+ is_simple_click = ((event->button == GDK_BUTTON_PRIMARY || event->button == GDK_BUTTON_MIDDLE) &&
(event->type == GDK_BUTTON_PRESS));
/* No item at this position */
if (!gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
@@ -581,7 +581,7 @@ button_press_callback (GtkWidget *widget,
gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (tree_view));
tree_view_class->button_press_event (widget, event);
- if (event->button == 3)
+ if (event->button == GDK_BUTTON_SECONDARY)
{
nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (view),
(GdkEvent *) event);
@@ -630,7 +630,7 @@ button_press_callback (GtkWidget *widget,
view->details->double_click_path[1] &&
gtk_tree_path_compare (view->details->double_click_path[0], view->details->double_click_path[1])
== 0)
{
- if ((event->button == 1) && button_event_modifies_selection (event))
+ if ((event->button == GDK_BUTTON_PRIMARY) && button_event_modifies_selection (event))
{
file = nautilus_list_model_file_for_path (view->details->model, path);
if (file != NULL)
@@ -641,11 +641,11 @@ button_press_callback (GtkWidget *widget,
}
else
{
- if ((event->button == 1 || event->button == 3))
+ if ((event->button == GDK_BUTTON_PRIMARY || event->button == GDK_BUTTON_SECONDARY))
{
activate_selected_items (view);
}
- else if (event->button == 2)
+ else if (event->button == GDK_BUTTON_MIDDLE)
{
activate_selected_items_alternate (view, NULL, TRUE);
}
@@ -664,12 +664,12 @@ button_press_callback (GtkWidget *widget,
* want that; we want the right click menu or single
* click to apply to everything that's currently selected.
*/
- if (event->button == 3 && path_selected)
+ if (event->button == GDK_BUTTON_SECONDARY && path_selected)
{
call_parent = FALSE;
}
- if ((event->button == 1 || event->button == 2) &&
+ if ((event->button == GDK_BUTTON_PRIMARY || event->button == GDK_BUTTON_MIDDLE) &&
((event->state & GDK_CONTROL_MASK) != 0 || (event->state & GDK_SHIFT_MASK) == 0))
{
view->details->row_selected_on_button_down = path_selected;
@@ -738,7 +738,7 @@ button_press_callback (GtkWidget *widget,
view->details->drag_y = event->y;
}
- if (event->button == 3)
+ if (event->button == GDK_BUTTON_SECONDARY)
{
nautilus_files_view_pop_up_selection_context_menu (NAUTILUS_FILES_VIEW (view),
(GdkEvent *) event);
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index 3db3584cc..70eae9109 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -146,7 +146,7 @@ button_press_cb (NautilusNotebook *notebook,
tab_clicked = find_tab_num_at_pos (notebook, event->x_root, event->y_root);
if (event->type == GDK_BUTTON_PRESS &&
- event->button == 3 &&
+ event->button == GDK_BUTTON_SECONDARY &&
(event->state & gtk_accelerator_get_default_mod_mask ()) == 0)
{
if (tab_clicked == -1)
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index ae6706a20..50e370850 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1469,7 +1469,7 @@ nautilus_path_bar_slider_button_press (GtkWidget *widget,
gtk_widget_grab_focus (widget);
}
- if (event->type != GDK_BUTTON_PRESS || event->button != 1)
+ if (event->type != GDK_BUTTON_PRESS || event->button != GDK_BUTTON_PRIMARY)
{
return FALSE;
}
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 1dfb0977d..50f38d4bf 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -248,7 +248,7 @@ navigation_button_press_cb (GtkButton *button,
button_event = (GdkEventButton *) event;
- if (button_event->button == 3)
+ if (button_event->button == GDK_BUTTON_SECONDARY)
{
/* right click */
show_menu (self, GTK_WIDGET (button), event);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 0d689ca15..2e4621b52 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2109,7 +2109,7 @@ notebook_button_press_cb (GtkWidget *widget,
{
NautilusWindow *window = user_data;
- if (GDK_BUTTON_PRESS == event->type && 3 == event->button)
+ if (GDK_BUTTON_PRESS == event->type && event->button == GDK_BUTTON_SECONDARY)
{
notebook_popup_menu_show (window, event);
return TRUE;
@@ -3004,7 +3004,7 @@ nautilus_event_get_window_open_flags (void)
}
if ((event->type == GDK_BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) &&
- (event->button.button == 2))
+ (event->button.button == GDK_BUTTON_MIDDLE))
{
flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]