aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog5
-rw-r--r--widgets/misc/e-scroll-frame.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 51a3b2d029..aadc5d6e2d 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-13 Anders Carlsson <andersca@gnu.org>
+
+ * e-scroll-frame.c (e_scroll_frame_button_press): Control does
+ horizontal scrolling, a la gimp.
+
2000-06-11 Anders Carlsson <andersca@gnu.org>
* e-scroll-frame.c (e_scroll_frame_button_press): Add support
diff --git a/widgets/misc/e-scroll-frame.c b/widgets/misc/e-scroll-frame.c
index f4317d51d7..254977457a 100644
--- a/widgets/misc/e-scroll-frame.c
+++ b/widgets/misc/e-scroll-frame.c
@@ -791,9 +791,11 @@ e_scroll_frame_button_press (GtkWidget *widget, GdkEventButton *event)
if (event->button == 4 || event->button == 5) {
GtkAdjustment *adj;
gfloat new_value;
-
+
gtk_object_get (GTK_OBJECT (widget),
- "vadjustment", &adj,
+ (event->state & GDK_CONTROL_MASK) ?
+ "hadjustment" : "vadjustment",
+ &adj,
NULL);
new_value = adj->value + ((event->button == 4) ?
-adj->page_increment / 2: