Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use shift+alt+scroll for widget resize instead of ctrl+scroll #13523

Merged
merged 4 commits into from
Feb 6, 2023
Merged

use shift+alt+scroll for widget resize instead of ctrl+scroll #13523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c3efb7
switch widget resize to shift+alt+scroll and various histogram adjust…
dterrahe Feb 3, 2023
5bd0eda
improve scope mode tooltips
dterrahe Feb 4, 2023
85f0775
fix navigation resize scroll zooming too and refresh
dterrahe Feb 4, 2023
b96c11e
don't initiate rotate when right-clicking in navigator
dterrahe Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/develop/develop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2393,7 +2393,7 @@ void dt_dev_exposure_reset_defaults(dt_develop_t *dev)

dt_iop_module_t *exposure = instance->module;
memcpy(exposure->params, exposure->default_params, exposure->params_size);
exposure->gui_update(exposure);
dt_iop_gui_update(exposure);
dt_dev_add_history_item(exposure->dev, exposure, TRUE);
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/accelerators.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ gboolean dt_shortcut_tooltip_callback(GtkWidget *widget, gint x, gint y, gboolea
else
{
if(g_object_get_data(G_OBJECT(widget), "scroll-resize-tooltip"))
original_markup = dt_util_dstrcat(original_markup, "%s%s", original_markup ? "\n" : "", _("ctrl+scroll to change height"));
original_markup = dt_util_dstrcat(original_markup, "%s%s", original_markup ? "\n" : "", _("shift+alt+scroll to change height"));
action = g_hash_table_lookup(darktable.control->widgets, widget);
if(!action)
{
Expand Down
7 changes: 3 additions & 4 deletions src/gui/gtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3063,7 +3063,7 @@ static gboolean _resize_wrap_scroll(GtkScrolledWindow *sw, GdkEventScroll *event

dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y);

if(dt_modifier_is(event->state, GDK_CONTROL_MASK))
if(dt_modifier_is(event->state, GDK_SHIFT_MASK | GDK_MOD1_MASK))
{
const gint new_size = dt_conf_get_int(config_str) + increment*delta_y;

Expand All @@ -3090,7 +3090,7 @@ static gboolean _resize_wrap_scroll(GtkScrolledWindow *sw, GdkEventScroll *event

static gboolean _scroll_wrap_aspect(GtkWidget *w, GdkEventScroll *event, const char *config_str)
{
if(dt_modifier_is(event->state, GDK_CONTROL_MASK))
if(dt_modifier_is(event->state, GDK_SHIFT_MASK | GDK_MOD1_MASK))
{
int delta_y;
if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y))
Expand All @@ -3099,9 +3099,8 @@ static gboolean _scroll_wrap_aspect(GtkWidget *w, GdkEventScroll *event, const c
const int aspect = dt_conf_get_int(config_str);
dt_conf_set_int(config_str, aspect + delta_y);
dtgtk_drawing_area_set_aspect_ratio(w, aspect / 100.0);

return TRUE;
}
return TRUE;
}

return FALSE;
Expand Down
2 changes: 1 addition & 1 deletion src/iop/levels.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ static gboolean dt_iop_levels_scroll(GtkWidget *widget, GdkEventScroll *event, g

if(darktable.develop->gui_module != self) dt_iop_request_focus(self);

const float interval = 0.002; // Distance moved for each scroll event
const float interval = 0.002 * dt_accel_get_speed_multiplier(widget, event->state); // Distance moved for each scroll event
int delta_y;
if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y))
{
Expand Down
2 changes: 1 addition & 1 deletion src/iop/rgblevels.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ static gboolean _area_scroll_callback(GtkWidget *widget, GdkEventScroll *event,

if(darktable.develop->gui_module != self) dt_iop_request_focus(self);

const float interval = 0.002; // Distance moved for each scroll event
const float interval = 0.002 * dt_accel_get_speed_multiplier(widget, event->state); // Distance moved for each scroll event
int delta_y;
if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y))
{
Expand Down
187 changes: 84 additions & 103 deletions src/libs/histogram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,18 +1194,16 @@ static void _lib_histogram_draw_vectorscope(dt_lib_histogram_t *d, cairo_t *cr,
pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);

// scale conservatively to 100% of width:
gchar *text = g_strdup_printf("analogous complementary\nrotation: 360°");
pango_layout_set_text(layout, text, -1);
pango_layout_get_pixel_extents(layout, &ink, NULL);
pango_layout_set_text(layout, _("analogous complementary"), -1);
pango_layout_get_pixel_extents(layout, NULL, &ink);
pango_font_description_set_absolute_size(desc, width * 0.9 / ink.width * PANGO_SCALE);
pango_layout_set_font_description(layout, desc);
g_free(text);

text = g_strdup_printf("%d°\n%s", d->harmony_rotation, _(hm.name));
gchar *text = g_strdup_printf("%d°\n%s", d->harmony_rotation, _(hm.name));

set_color(cr, darktable.bauhaus->graph_fg);
pango_layout_set_text(layout, text, -1);
pango_layout_get_pixel_extents(layout, &ink, NULL);
pango_layout_get_pixel_extents(layout, NULL, &ink);
cairo_scale(cr, 1., -1.);
cairo_rotate(cr, -d->vectorscope_angle);
cairo_move_to(cr, 0.48f * width - ink.width - ink.x, 0.48 * height - ink.height - ink.y);
Expand Down Expand Up @@ -1425,12 +1423,12 @@ static gboolean _drawable_motion_notify_callback(GtkWidget *widget, GdkEventMoti
// FIXME: see dt_bauhaus_slider_postponed_value_change(): delay processing until the pixelpipe can update based on dev->preview_average_delay for smoother interaction
if(d->highlight == DT_LIB_HISTOGRAM_HIGHLIGHT_EXPOSURE)
{
const float exposure = d->button_down_value + diff * 4.0f / (float)range;
const float exposure = d->button_down_value + diff * 4.0f / (float)range * dt_accel_get_speed_multiplier(widget, event->state);
dt_dev_exposure_set_exposure(dev, exposure);
}
else if(d->highlight == DT_LIB_HISTOGRAM_HIGHLIGHT_BLACK_POINT)
{
const float black = d->button_down_value - diff * .1f / (float)range;
const float black = d->button_down_value - diff * .1f / (float)range * dt_accel_get_speed_multiplier(widget, event->state);
dt_dev_exposure_set_black(dev, black);
}
}
Expand All @@ -1445,28 +1443,35 @@ static gboolean _drawable_motion_notify_callback(GtkWidget *widget, GdkEventMoti
const gboolean hooks_available = (cv->view(cv) == DT_VIEW_DARKROOM) && dt_dev_exposure_hooks_available(dev);

// FIXME: make just one tooltip for the widget depending on whether it is draggable or not, and set it when enter the view
if(!hooks_available || d->scope_type == DT_LIB_HISTOGRAM_SCOPE_VECTORSCOPE)
gchar *tip = g_strdup_printf("%s\n", _(dt_lib_histogram_scope_type_names[d->scope_type]));
if(d->scope_type == DT_LIB_HISTOGRAM_SCOPE_VECTORSCOPE)
{
d->highlight = DT_LIB_HISTOGRAM_HIGHLIGHT_NONE;
if(d->scope_type == DT_LIB_HISTOGRAM_SCOPE_VECTORSCOPE &&
d->vectorscope_type == DT_LIB_HISTOGRAM_VECTORSCOPE_RYB &&
d->color_harmony != DT_LIB_HISTOGRAM_HARMONY_NONE)
gtk_widget_set_tooltip_text(widget, "histogram");
tip = dt_util_dstrcat(tip, _("\nscroll to coarse-rotate\nctrl+scroll to fine rotate"
"\nshift+scroll to change width\nalt+scroll to cycle"));
}
// FIXME: could a GtkRange be used to do this work?
else if((posx < 0.2f && d->scope_type == DT_LIB_HISTOGRAM_SCOPE_HISTOGRAM) ||
(d->scope_type == DT_LIB_HISTOGRAM_SCOPE_WAVEFORM &&
((posy > 7.0f/9.0f && d->scope_orient == DT_LIB_HISTOGRAM_ORIENT_HORI) ||
(posx < 2.0f/9.0f && d->scope_orient == DT_LIB_HISTOGRAM_ORIENT_VERT))))
{
d->highlight = DT_LIB_HISTOGRAM_HIGHLIGHT_BLACK_POINT;
gtk_widget_set_tooltip_text(widget, _("histogram\ndrag to change black point,\ndouble-click resets"));
}
else
else if(hooks_available)
{
d->highlight = DT_LIB_HISTOGRAM_HIGHLIGHT_EXPOSURE;
gtk_widget_set_tooltip_text(widget, _("histogram\ndrag to change exposure,\ndouble-click resets"));
if((posx < 0.2f && d->scope_type == DT_LIB_HISTOGRAM_SCOPE_HISTOGRAM) ||
((d->scope_type == DT_LIB_HISTOGRAM_SCOPE_WAVEFORM || d->scope_type == DT_LIB_HISTOGRAM_SCOPE_PARADE) &&
((posy > 7.0f/9.0f && d->scope_orient == DT_LIB_HISTOGRAM_ORIENT_HORI) ||
(posx < 2.0f/9.0f && d->scope_orient == DT_LIB_HISTOGRAM_ORIENT_VERT))))
{
d->highlight = DT_LIB_HISTOGRAM_HIGHLIGHT_BLACK_POINT;
tip = dt_util_dstrcat(tip, _("\ndrag to change black point,\ndouble-click resets"));
}
else
{
d->highlight = DT_LIB_HISTOGRAM_HIGHLIGHT_EXPOSURE;
tip = dt_util_dstrcat(tip, _("\ndrag to change exposure,\ndouble-click resets"));
}
}
gtk_widget_set_tooltip_text(widget, tip);
g_free(tip);

if(prior_highlight != d->highlight)
{
dt_control_queue_redraw_widget(widget);
Expand Down Expand Up @@ -1513,19 +1518,31 @@ static gboolean _drawable_button_press_callback(GtkWidget *widget, GdkEventButto
return TRUE;
}

static gboolean _drawable_scroll_callback(GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
static void _color_harmony_button_on_off(dt_lib_histogram_color_harmony_type_t on,
dt_lib_histogram_color_harmony_type_t off,
dt_lib_histogram_t *d)
{
if(off != DT_LIB_HISTOGRAM_HARMONY_NONE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d->color_harmony_button[off - 1]), FALSE);
if(on != DT_LIB_HISTOGRAM_HARMONY_NONE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d->color_harmony_button[on - 1]), TRUE);
}

static void _color_harmony_changed(dt_lib_histogram_t *d);

static gboolean _eventbox_scroll_callback(GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
if(dt_modifier_is(event->state, GDK_CONTROL_MASK))
dt_lib_histogram_t *d = (dt_lib_histogram_t *)user_data;
int delta_y = 0;
if(dt_modifier_is(event->state, GDK_SHIFT_MASK | GDK_MOD1_MASK))
{
// bubble to adjusting the overall widget size
return FALSE;
gtk_widget_event(d->scope_draw, (GdkEvent*)event);
}
dt_lib_histogram_t *d = (dt_lib_histogram_t *)user_data;
int delta_y = 0;
// note are using unit rather than smooth scroll events, as
// exposure changes can get laggy if handling a multitude of smooth
// scroll events
if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y) && delta_y != 0)
else if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y) && delta_y != 0)
{
if(d->highlight != DT_LIB_HISTOGRAM_HIGHLIGHT_NONE)
{
Expand All @@ -1534,14 +1551,45 @@ static gboolean _drawable_scroll_callback(GtkWidget *widget, GdkEventScroll *eve
if(d->highlight == DT_LIB_HISTOGRAM_HIGHLIGHT_EXPOSURE)
{
const float ce = dt_dev_exposure_get_exposure(dev);
dt_dev_exposure_set_exposure(dev, ce - 0.15f * delta_y);
dt_dev_exposure_set_exposure(dev, ce - 0.15f * delta_y * dt_accel_get_speed_multiplier(widget, event->state));
}
else if(d->highlight == DT_LIB_HISTOGRAM_HIGHLIGHT_BLACK_POINT)
{
const float cb = dt_dev_exposure_get_black(dev);
dt_dev_exposure_set_black(dev, cb + 0.001f * delta_y);
dt_dev_exposure_set_black(dev, cb + 0.001f * delta_y * dt_accel_get_speed_multiplier(widget, event->state));
}
}
else if(d->scope_type == DT_LIB_HISTOGRAM_SCOPE_VECTORSCOPE)
{
if(dt_modifier_is(event->state, GDK_SHIFT_MASK)) // SHIFT+SCROLL
{
if(d->harmony_width == 0 && delta_y < 0) d->harmony_width = DT_LIB_HISTOGRAM_HARMONY_WIDTH_N - 1;
else d->harmony_width = (d->harmony_width +delta_y) % DT_LIB_HISTOGRAM_HARMONY_WIDTH_N;
}
else if(dt_modifier_is(event->state, GDK_MOD1_MASK)) // ALT+SCROLL
{
if(d->color_harmony_old == DT_LIB_HISTOGRAM_HARMONY_NONE && delta_y < 0)
d->color_harmony = DT_LIB_HISTOGRAM_HARMONY_N - 1;
else d->color_harmony = (d->color_harmony_old + delta_y) % DT_LIB_HISTOGRAM_HARMONY_N;
_color_harmony_button_on_off(d->color_harmony, d->color_harmony_old, d);
d->color_harmony_old = d->color_harmony;
}
else
{
int a;
if(dt_modifier_is(event->state, GDK_CONTROL_MASK)) // CTRL+SCROLL
a = d->harmony_rotation + delta_y;
else // SCROLL
{
d->harmony_rotation = (int)(d->harmony_rotation / 15.) * 15;
a = d->harmony_rotation + 15 * delta_y;
}
a %= 360;
if(a < 0) a += 360;
d->harmony_rotation = a;
}
_color_harmony_changed(d);
}
}
return TRUE;
}
Expand Down Expand Up @@ -1814,17 +1862,6 @@ static void _color_harmony_changed(dt_lib_histogram_t *d)
dt_control_queue_redraw_widget(d->scope_draw);
}

static void _color_harmony_button_on_off(dt_lib_histogram_color_harmony_type_t on,
dt_lib_histogram_color_harmony_type_t off,
dt_lib_histogram_t *d)
{
if(off != DT_LIB_HISTOGRAM_HARMONY_NONE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d->color_harmony_button[off - 1]), FALSE);
if(on != DT_LIB_HISTOGRAM_HARMONY_NONE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(d->color_harmony_button[on - 1]), TRUE);
}


static gboolean _color_harmony_clicked(GtkWidget *button, GdkEventButton *event, dt_lib_histogram_t *d)
{
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
Expand All @@ -1850,44 +1887,6 @@ static gboolean _color_harmony_clicked(GtkWidget *button, GdkEventButton *event,
return TRUE;
}

static gboolean _color_harmony_scroll_callback(GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
dt_lib_histogram_t *d = (dt_lib_histogram_t *)user_data;
int delta_y = 0;
if(dt_gui_get_scroll_unit_deltas(event, NULL, &delta_y) && delta_y != 0)
{
if(dt_modifier_is(event->state, GDK_SHIFT_MASK)) // SHIFT+SCROLL
{
if(d->harmony_width == 0 && delta_y < 0) d->harmony_width = DT_LIB_HISTOGRAM_HARMONY_WIDTH_N - 1;
else d->harmony_width = (d->harmony_width +delta_y) % DT_LIB_HISTOGRAM_HARMONY_WIDTH_N;
}
else if(dt_modifier_is(event->state, GDK_MOD1_MASK)) // ALT+SCROLL
{
if(d->color_harmony_old == DT_LIB_HISTOGRAM_HARMONY_NONE && delta_y < 0)
d->color_harmony = DT_LIB_HISTOGRAM_HARMONY_N - 1;
else d->color_harmony = (d->color_harmony_old + delta_y) % DT_LIB_HISTOGRAM_HARMONY_N;
_color_harmony_button_on_off(d->color_harmony, d->color_harmony_old, d);
d->color_harmony_old = d->color_harmony;
}
else
{
int a;
if(dt_modifier_is(event->state, GDK_CONTROL_MASK)) // CTRL+SCROLL
a = d->harmony_rotation + delta_y;
else // SCROLL
{
d->harmony_rotation = (int)(d->harmony_rotation / 15.) * 15;
a = d->harmony_rotation + 15 * delta_y;
}
a %= 360;
if(a < 0) a += 360;
d->harmony_rotation = a;
}
_color_harmony_changed(d);
}
return TRUE;
}

static gboolean _color_harmony_enter_notify_callback(GtkWidget *widget, GdkEventCrossing *event,
gpointer user_data)
{
Expand Down Expand Up @@ -2252,22 +2251,7 @@ void gui_init(dt_lib_module_t *self)
for(int i=0; i<DT_LIB_HISTOGRAM_SCOPE_N; i++)
{
d->scope_type_button[i] = dtgtk_togglebutton_new(dt_lib_histogram_scope_type_icons[i], CPF_NONE, NULL);
if(i == DT_LIB_HISTOGRAM_SCOPE_VECTORSCOPE)
{
gchar *text = g_strdup_printf("%s\n\n%s\n%s\n%s\n%s",
_(dt_lib_histogram_scope_type_names[i]),
_("scroll to coarse-rotate"),
_("ctrl+scroll to fine rotate"),
_("shift+scroll to change width"),
_("alt+scroll to cycle"));
gtk_widget_set_tooltip_text(d->scope_type_button[i], text);
g_free(text);
}
else
{
gtk_widget_set_tooltip_text(d->scope_type_button[i],
_(dt_lib_histogram_scope_type_names[i]));
}
gtk_widget_set_tooltip_text(d->scope_type_button[i], _(dt_lib_histogram_scope_type_names[i]));
dt_action_define(dark, N_("modes"), dt_lib_histogram_scope_type_names[i],
d->scope_type_button[i], &dt_action_def_toggle);
gtk_box_pack_start(GTK_BOX(box_left), d->scope_type_button[i], FALSE, FALSE, 0);
Expand Down Expand Up @@ -2323,9 +2307,6 @@ void gui_init(dt_lib_module_t *self)
&(dt_color_harmonies[i]));
dt_action_define(dark, N_("color harmonies"), dt_color_harmonies[i].name, rb, &dt_action_def_toggle);
g_signal_connect(G_OBJECT(rb), "button-press-event", G_CALLBACK(_color_harmony_clicked), d);
gtk_widget_add_events(rb, darktable.gui->scroll_mask);
g_signal_connect(G_OBJECT(rb), "scroll-event",
G_CALLBACK(_color_harmony_scroll_callback), d);
g_signal_connect(G_OBJECT(rb), "enter-notify-event",
G_CALLBACK(_color_harmony_enter_notify_callback), d);
g_signal_connect(G_OBJECT(rb), "leave-notify-event",
Expand Down Expand Up @@ -2382,8 +2363,8 @@ void gui_init(dt_lib_module_t *self)
g_signal_connect(G_OBJECT(d->green_channel_button), "toggled", G_CALLBACK(_green_channel_toggle), d);
g_signal_connect(G_OBJECT(d->blue_channel_button), "toggled", G_CALLBACK(_blue_channel_toggle), d);

gtk_widget_add_events(d->scope_draw, GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | darktable.gui->scroll_mask);
gtk_widget_add_events(d->scope_draw, GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
// FIXME: why does cursor motion over buttons trigger multiple draw callbacks?
g_signal_connect(G_OBJECT(d->scope_draw), "draw", G_CALLBACK(_drawable_draw_callback), d);
g_signal_connect(G_OBJECT(d->scope_draw), "leave-notify-event",
Expand All @@ -2394,10 +2375,10 @@ void gui_init(dt_lib_module_t *self)
G_CALLBACK(_drawable_button_release_callback), d);
g_signal_connect(G_OBJECT(d->scope_draw), "motion-notify-event",
G_CALLBACK(_drawable_motion_notify_callback), d);
g_signal_connect(G_OBJECT(d->scope_draw), "scroll-event",
G_CALLBACK(_drawable_scroll_callback), d);

gtk_widget_add_events(eventbox, GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_POINTER_MOTION_MASK);
gtk_widget_add_events(eventbox, GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK | GDK_POINTER_MOTION_MASK | darktable.gui->scroll_mask);
g_signal_connect(G_OBJECT(eventbox), "scroll-event",
G_CALLBACK(_eventbox_scroll_callback), d);
g_signal_connect(G_OBJECT(eventbox), "enter-notify-event",
G_CALLBACK(_eventbox_enter_notify_callback), d);
g_signal_connect(G_OBJECT(eventbox), "leave-notify-event",
Expand Down
6 changes: 3 additions & 3 deletions src/libs/navigation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ int position(const dt_lib_module_t *self)
static void _lib_navigation_control_redraw_callback(gpointer instance, gpointer user_data)
{
dt_lib_module_t *self = (dt_lib_module_t *)user_data;
dt_control_queue_redraw_widget(self->widget);
dt_control_queue_redraw_widget(gtk_bin_get_child(GTK_BIN(self->widget)));
}


Expand Down Expand Up @@ -311,7 +311,7 @@ void _lib_navigation_set_position(dt_lib_module_t *self, double x, double y, int
dt_control_set_dev_zoom_y(zoom_y);

/* redraw myself */
gtk_widget_queue_draw(self->widget);
_lib_navigation_control_redraw_callback(NULL, self);

/* redraw pipe */
dt_dev_invalidate(darktable.develop);
Expand Down Expand Up @@ -442,7 +442,7 @@ static gboolean _lib_navigation_button_press_callback(GtkWidget *widget, GdkEven
dt_lib_navigation_t *d = (dt_lib_navigation_t *)self->data;
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
if(event->type == GDK_BUTTON_PRESS && event->button.button == 1)
if(event->type == GDK_BUTTON_PRESS && event->button.button != 2)
{
d->dragging = 1;
_lib_navigation_set_position(self, event->button.x, event->button.y, allocation.width, allocation.height);
Expand Down