/*
- Copyright (C) 2008 Paul Davis
+ Copyright (C) 2008 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include <iostream>
-#include <gtkmm2ext/scroomer.h>
+
+#include "gtkmm2ext/scroomer.h"
+#include "gtkmm2ext/keyboard.h"
using namespace Gtkmm2ext;
using namespace Gtk;
Scroomer::Scroomer(Gtk::Adjustment& adjustment)
: adj(adjustment)
, handle_size(0)
- , grab_comp(None) {
-
+ , grab_comp(None)
+{
position[TopBase] = 0;
position[Handle1] = 0;
position[Slider] = 0;
return true;
}
+ if (ev->y < 0 || ev->y > get_height ()) {
+ return true;
+ }
+
grab_y = ev->y;
- if (ev->state & GDK_CONTROL_MASK) {
- if (ev->state & GDK_MOD1_MASK) {
+ if (ev->state & Keyboard::PrimaryModifier) {
+ if (ev->state & Keyboard::SecondaryModifier) {
scale = 0.05;
} else {
scale = 0.1;
fract = max (-1.0, fract);
fract = -fract;
- switch(grab_comp) {
+ switch (grab_comp) {
case TopBase:
case BottomBase:
unzoomed_val += scale * fract * range;
unzoomed_val = max(unzoomed_val, adj.get_lower());
break;
case Handle1:
+
unzoomed_page += scale * fract * range;
unzoomed_page = min(unzoomed_page, adj.get_upper() - unzoomed_val);
unzoomed_page = max(unzoomed_page, min_page_size);
+
+ if (pinch){
+ temp = unzoomed_val + unzoomed_page;
+ unzoomed_val -= scale * fract * range * 0.5;
+ unzoomed_val = min(unzoomed_val, temp - min_page_size);
+ unzoomed_val = max(unzoomed_val, adj.get_lower());
+ }
+
break;
case Handle2:
temp = unzoomed_val + unzoomed_page;
unzoomed_val = max(unzoomed_val, adj.get_lower());
unzoomed_page = temp - unzoomed_val;
+
+ if (pinch){
+
+ unzoomed_page -= scale * fract * range;
+ }
+
+ unzoomed_page = min(unzoomed_page, adj.get_upper() - unzoomed_val);
unzoomed_page = max(unzoomed_page, min_page_size);
break;
default:
/* Then we handle zoom, which is dragging horizontally. We zoom around the area that is
* the current y pointer value, not from the area that was the start of the drag.
- * the point of zoom must have the same
+ * We don't start doing zoom until we are at least one scroomer width outside the scroomer's
+ * area.
*/
-
- if (ev->x > get_width()) {
+
+ if (ev->x > (get_width() * 2)) {
zoom = ev->x - get_width();
-
+
double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
double lower = val_at_pointer - (unzoomed_val + half_min_page);
page = min(page, adj.get_upper() - val);
} else if (ev->x < 0) {
/* on zoom out increase the page size as well as moving the range towards the mouse pos*/
- zoom = abs(ev->x);
+ /*zoom = abs(ev->x);
- /*double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
+ double higher = unzoomed_val + unzoomed_page - half_min_page - val_at_pointer;
double lower = val_at_pointer - (unzoomed_val + half_min_page);
higher *= zoom / 128;
page = unzoomed_page;
}
- adj.set_page_size(page);
-
- if (val == adj.get_value()) {
- adj.value_changed();
- }
+ /* Round these values to stop the scroomer handlers quivering about during drags */
+ adj.set_page_size (rint (page));
+ adj.set_value (rint (val));
+ adj.value_changed();
- if (val < adj.get_lower()) {
- adj.value_changed();
- } else if (val > adj.get_upper()) {
- adj.value_changed();
- } else {
- adj.set_value(val);
+ return true;
+}
+
+bool
+Scroomer::on_scroll_event (GdkEventScroll* ev)
+{
+ switch (ev->direction) {
+ case GDK_SCROLL_UP:
+ adj.set_value (min (adj.get_value() + adj.get_page_size() / 10.0, adj.get_upper() - adj.get_page_size()));
+ break;
+ case GDK_SCROLL_DOWN:
+ adj.set_value (adj.get_value() - adj.get_page_size() / 10.0);
+ break;
+ default:
+ return false;
}
return true;
bool
Scroomer::on_button_press_event (GdkEventButton* ev)
{
- if (ev->button == 1) {
+ if (ev->button == 1 || ev->button == 3) {
Component comp = point_in(ev->y);
if (comp == Total || comp == None) {
unzoomed_val = adj.get_value();
unzoomed_page = adj.get_page_size();
grab_window = ev->window;
+
+ if (ev->button == 3){
+ pinch = true;
+ } else {
+ pinch = false;
+ }
+
+ DragStarting (); /* EMIT SIGNAL */
}
- return false;
+
+ if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) {
+ DoubleClicked();
+ }
+
+ return true;
}
bool
return true;
}
- if (ev->button != 1) {
+ if (ev->button != 1 && ev->button != 3) {
return true;
}
- switch(grab_comp) {
+ switch (grab_comp) {
case TopBase:
break;
case Handle1:
default:
break;
}
-
+
grab_comp = None;
remove_modal_grab();
- return true;
-}
-
-bool
-Scroomer::on_scroll_event (GdkEventScroll*)
-{
+ DragFinishing (); /* EMIT SIGNAL */
return true;
}
{
int index = (int) c;
- switch(c) {
+ switch (c) {
case None:
return;
case Total:
rect.set_height(position[BottomBase] - old_pos[Handle2]);
win->invalidate_rect(rect, false);
}
-
- win->process_updates(false);
}
-std::string
-Scroomer::get_comp_name(Component c)
-{
- switch(c) {
- case TopBase:
- return "TopBase";
- case Handle1:
- return "Handle1";
- case Slider:
- return "Slider";
- case Handle2:
- return "Handle2";
- case BottomBase:
- return "BottomBase";
- case Total:
- return "Total";
- case None:
- return "None";
- default:
- return "ERROR";
- }
-}
projects / ardour.git / blobdiff