#include <iostream>
-#include <gtkmm2ext/pixfader.h>
+#include "gtkmm2ext/pixfader.h"
+#include "gtkmm2ext/keyboard.h"
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace Gdk;
using namespace std;
-#ifdef GTKOSX
-int PixFader::fine_scale_modifier = GDK_META_MASK;
-#else
-int PixFader::fine_scale_modifier = GDK_CONTROL_MASK;
-#endif
-int PixFader::extra_fine_scale_modifier = GDK_MOD1_MASK;
+int PixFader::fine_scale_modifier = Keyboard::PrimaryModifier;
+int PixFader::extra_fine_scale_modifier = Keyboard::SecondaryModifier;
-PixFader::PixFader (Glib::RefPtr<Pixbuf> belt, Gtk::Adjustment& adj, int orientation)
+PixFader::PixFader (Glib::RefPtr<Pixbuf> belt, Gtk::Adjustment& adj, int orientation, int fader_length)
: adjustment (adj),
pixbuf (belt),
if (orientation == VERT) {
view.width = girth = pixbuf->get_width();
- view.height = span = pixbuf->get_height() / 2;
- unity_loc = (int) rint (view.height - (default_value * view.height)) - 1;
} else {
- view.width = span = pixbuf->get_width () / 2;
view.height = girth = pixbuf->get_height();
- unity_loc = (int) rint (default_value * view.width) - 1;
- }
+ }
+
+ set_fader_length (fader_length);
- add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
+ add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
adjustment.signal_value_changed().connect (mem_fun (*this, &PixFader::adjustment_changed));
adjustment.signal_changed().connect (mem_fun (*this, &PixFader::adjustment_changed));
PixFader::on_expose_event (GdkEventExpose* ev)
{
GdkRectangle intersection;
- int srcx, srcy, ds = display_span ();
+ int srcx, srcy;
+
+ int const ds = display_span ();
+
int offset_into_pixbuf = (int) floor (span / ((float) span / ds));
+
+ /* account for fader lengths that are shorter than the fader pixbuf */
+ if (_orien == VERT) {
+ offset_into_pixbuf += pixbuf->get_height() / 2 - view.height;
+ } else {
+ offset_into_pixbuf += pixbuf->get_width() / 2 - view.width;
+ }
+
Glib::RefPtr<Gdk::GC> fg_gc (get_style()->get_fg_gc(get_state()));
if (gdk_rectangle_intersect (&view, &ev->area, &intersection)) {
/* no motion - just a click */
- if (ev->state & Gdk::SHIFT_MASK) {
- cerr << "SV A\n";
+ if (ev->state & Keyboard::TertiaryModifier) {
adjustment.set_value (default_value);
- cerr << "SV A OUT\n";
} else if (ev->state & fine_scale_modifier) {
- cerr << "SV B\n";
adjustment.set_value (adjustment.get_lower());
- cerr << "SV B OUT\n";
} else if ((_orien == VERT && ev_pos < span - display_span()) || (_orien == HORIZ && ev_pos > span - display_span())) {
/* above the current display height, remember X Window coords */
- cerr << "SV C\n";
adjustment.set_value (adjustment.get_value() + adjustment.get_step_increment());
- cerr << "SV C OUT\n";
} else {
- cerr << "SV D\n";
adjustment.set_value (adjustment.get_value() - adjustment.get_step_increment());
- cerr << "SV D OUT\n";
}
}
switch (ev->direction) {
case GDK_SCROLL_UP:
- /* wheel up */
adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale));
ret = true;
break;
case GDK_SCROLL_DOWN:
- /* wheel down */
adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale));
ret = true;
break;
case GDK_SCROLL_RIGHT:
case GDK_SCROLL_UP:
- /* wheel right */
adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale));
ret = true;
break;
case GDK_SCROLL_LEFT:
case GDK_SCROLL_DOWN:
- /* wheel left */
adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale));
ret = true;
break;
}
}
+/** @return pixel offset of the current value from the right or bottom of the fader */
int
PixFader::display_span ()
{
return (_orien == VERT) ? (int)floor (span * (1.0 - fract)) : (int)floor (span * fract);
}
+void
+PixFader::set_fader_length (int l)
+{
+ if (_orien == VERT) {
+ view.height = span = l;
+ unity_loc = (int) rint (view.height - (default_value * view.height)) - 1;
+ } else {
+ view.width = span = l;
+ unity_loc = (int) rint (default_value * view.width) - 1;
+ }
+
+ queue_draw ();
+}
+
+bool
+PixFader::on_enter_notify_event (GdkEventCrossing*)
+{
+ Keyboard::magic_widget_grab_focus ();
+ return false;
+}
+
+bool
+PixFader::on_leave_notify_event (GdkEventCrossing*)
+{
+ Keyboard::magic_widget_drop_focus();
+ return false;
+}