From 45c8c8f93457fb7d793b3ba4182e57ede0aeabb7 Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Mon, 1 Jan 2018 14:31:56 +0000 Subject: Range: Make down/up keys act like down/up scrolls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before now, down/up keys on H Ranges would increase/decrease value resp, which is unintuitive & worse, contradicts what we already do for scrolls Fix simply by moving to the new should_invert_move() as scrolls just did – which also gets us the other benefits explained in the last 2 commits. https://bugzilla.gnome.org/show_bug.cgi?id=407242 https://bugzilla.gnome.org/show_bug.cgi?id=791802 --- gtk/gtkrange.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gtk/gtkrange.c') diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index f064a1d99f..9822935941 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2494,28 +2494,28 @@ gtk_range_scroll (GtkRange *range, switch (scroll) { case GTK_SCROLL_STEP_LEFT: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_HORIZONTAL)) step_forward (range); else step_back (range); break; case GTK_SCROLL_STEP_UP: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_VERTICAL)) step_forward (range); else step_back (range); break; case GTK_SCROLL_STEP_RIGHT: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_HORIZONTAL)) step_back (range); else step_forward (range); break; case GTK_SCROLL_STEP_DOWN: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_VERTICAL)) step_back (range); else step_forward (range); @@ -2530,28 +2530,28 @@ gtk_range_scroll (GtkRange *range, break; case GTK_SCROLL_PAGE_LEFT: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_HORIZONTAL)) page_forward (range); else page_back (range); break; case GTK_SCROLL_PAGE_UP: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_VERTICAL)) page_forward (range); else page_back (range); break; case GTK_SCROLL_PAGE_RIGHT: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_HORIZONTAL)) page_back (range); else page_forward (range); break; case GTK_SCROLL_PAGE_DOWN: - if (should_invert (range)) + if (should_invert_move (range, GTK_ORIENTATION_VERTICAL)) page_back (range); else page_forward (range); -- cgit v1.2.1