app: use toggle_behavior_mask not CONTROL to trigger zoom-on-scroll

This commit is contained in:
Michael Natterer 2011-10-06 23:59:49 +02:00
parent 1bff8224ad
commit a38faefba7
3 changed files with 5 additions and 4 deletions

View File

@ -717,7 +717,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
{
GdkScrollDirection direction = sevent->direction;
if (state & GDK_CONTROL_MASK)
if (state & gimp_get_toggle_behavior_mask ())
{
switch (direction)
{

View File

@ -858,7 +858,7 @@ view_events (GtkWidget *widget,
{
GdkEventScroll *sevent = (GdkEventScroll *) event;
if (sevent->state & GDK_CONTROL_MASK)
if (sevent->state & gimp_get_toggle_behavior_mask ())
{
switch (sevent->direction)
{
@ -1063,7 +1063,7 @@ control_events (GtkWidget *widget,
{
GdkEventScroll *sevent = (GdkEventScroll *) event;
if (sevent->state & GDK_SHIFT_MASK)
if (sevent->state & gimp_get_toggle_behavior_mask ())
{
if (sevent->direction == GDK_SCROLL_UP)
gimp_gradient_editor_zoom (editor, GIMP_ZOOM_IN);

View File

@ -36,6 +36,7 @@
#include "gimpnavigationview.h"
#include "gimpviewrenderer.h"
#include "gimpwidgets-utils.h"
#define BORDER_WIDTH 2
@ -302,7 +303,7 @@ static gboolean
gimp_navigation_view_scroll (GtkWidget *widget,
GdkEventScroll *sevent)
{
if (sevent->state & GDK_CONTROL_MASK)
if (sevent->state & gimp_get_toggle_behavior_mask ())
{
switch (sevent->direction)
{