From 39f0ea6ae9dbed51bfb2f0f3f6bf428c72cb3978 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 21 Nov 2006 17:30:47 +0000 Subject: new fader design from thorwil, mostly git-svn-id: svn://localhost/ardour2/trunk@1149 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/gtkmm2ext/SConscript | 1 + libs/gtkmm2ext/gtkmm2ext/pixfader.h | 75 ++++++++ libs/gtkmm2ext/gtkmm2ext/slider_controller.h | 4 +- libs/gtkmm2ext/pixfader.cc | 256 +++++++++++++++++++++++++++ libs/gtkmm2ext/slider_controller.cc | 8 +- 5 files changed, 338 insertions(+), 6 deletions(-) create mode 100644 libs/gtkmm2ext/gtkmm2ext/pixfader.h create mode 100644 libs/gtkmm2ext/pixfader.cc (limited to 'libs') diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index e654b6cb52..1a7ab75264 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -43,6 +43,7 @@ gtk_ui.cc hexentry.cc idle_adjustment.cc pathlist.cc +pixfader.cc pixscroller.cc popup.cc prompter.cc diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h new file mode 100644 index 0000000000..4d0edc46b7 --- /dev/null +++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h @@ -0,0 +1,75 @@ +/* + Copyright (C) 2006 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: fastmeter.h 570 2006-06-07 21:21:21Z sampo $ +*/ + +#ifndef __gtkmm2ext_pixfader_h__ +#define __gtkmm2ext_pixfader_h__ + +#include + +#include +#include +#include + +namespace Gtkmm2ext { + +class PixFader : public Gtk::DrawingArea { + public: + PixFader (Glib::RefPtr base, + Glib::RefPtr handle, + Gtk::Adjustment& adjustment); + virtual ~PixFader (); + + protected: + Gtk::Adjustment& adjustment; + + void on_size_request (GtkRequisition*); + + bool on_expose_event (GdkEventExpose*); + bool on_button_press_event (GdkEventButton*); + bool on_button_release_event (GdkEventButton*); + bool on_motion_notify_event (GdkEventMotion*); + bool on_scroll_event (GdkEventScroll* ev); + + private: + Glib::RefPtr base_pixbuf; + Glib::RefPtr handle_pixbuf; + gint pixheight; + + GdkRectangle pixrect; + + GdkWindow* grab_window; + double grab_y; + double grab_start; + int last_drawn; + bool dragging; + float default_value; + int unity_y; + + void adjustment_changed (); + + int display_height () { + return (int) floor (pixheight * (1.0 - (adjustment.get_upper() - adjustment.get_value ()) / ((adjustment.get_upper() - adjustment.get_lower())))); + } +}; + + +} /* namespace */ + + #endif /* __gtkmm2ext_pixfader_h__ */ diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h index f0f645eab7..83cc1fddfd 100644 --- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h +++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace Gtkmm2ext { @@ -35,7 +35,7 @@ namespace PBD { namespace Gtkmm2ext { -class SliderController : public Gtkmm2ext::PixScroller +class SliderController : public Gtkmm2ext::PixFader { public: SliderController (Glib::RefPtr slider, diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc new file mode 100644 index 0000000000..429f5bf3c5 --- /dev/null +++ b/libs/gtkmm2ext/pixfader.cc @@ -0,0 +1,256 @@ +/* + Copyright (C) 2006 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: fastmeter.h 570 2006-06-07 21:21:21Z sampo $ +*/ + + +#include +#include + +using namespace Gtkmm2ext; +using namespace Gtk; +using namespace Gdk; +using namespace std; + +PixFader::PixFader (Glib::RefPtr base, Glib::RefPtr handle, Gtk::Adjustment& adj) + : adjustment (adj), + base_pixbuf (base), + handle_pixbuf (handle) +{ + dragging = false; + default_value = adjustment.get_value(); + last_drawn = -1; + pixrect.x = 0; + pixrect.y = 0; + pixrect.width = base_pixbuf->get_width(); + pixrect.height = base_pixbuf->get_height(); + pixheight = pixrect.height; + + unity_y = (int) rint (pixrect.height - (default_value * pixrect.height)); + + add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK); + + adjustment.signal_value_changed().connect (mem_fun (*this, &PixFader::adjustment_changed)); + adjustment.signal_changed().connect (mem_fun (*this, &PixFader::adjustment_changed)); +} + +PixFader::~PixFader () +{ +} + +bool +PixFader::on_expose_event (GdkEventExpose* ev) +{ + GdkRectangle intersection; + GdkRectangle background; + + pixrect.height = display_height (); + + background.x = 0; + background.y = 0; + background.width = pixrect.width; + background.height = pixheight - pixrect.height; + + if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) { + get_window()->draw_pixbuf (get_style()->get_fg_gc (get_state()), base_pixbuf, + intersection.x, intersection.y, + 0, 0, + intersection.width, intersection.height, + Gdk::RGB_DITHER_NONE, 0, 0); + + } + + /* recompute the height of the handle area to use X Window's top->bottom coordinate + system. + */ + + pixrect.y = pixheight - pixrect.height; + + if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) { + get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), handle_pixbuf, + intersection.x, intersection.y, + 0, pixrect.y, + intersection.width, intersection.height, + Gdk::RGB_DITHER_NONE, 0, 0); + } + + /* always draw the line */ + + get_window()->draw_line (get_style()->get_fg_gc(get_state()), 0, unity_y, pixrect.width, unity_y); + + last_drawn = pixrect.height; + return true; +} + +void +PixFader::on_size_request (GtkRequisition* req) +{ + req->width = base_pixbuf->get_width(); + req->height = base_pixbuf->get_height (); +} + +bool +PixFader::on_button_press_event (GdkEventButton* ev) +{ + switch (ev->button) { + case 1: + if (!(ev->state & Gdk::SHIFT_MASK)) { + add_modal_grab(); + grab_y = ev->y; + grab_start = ev->y; + grab_window = ev->window; + dragging = true; + } + break; + default: + break; + } + + + return false; +} + +bool +PixFader::on_button_release_event (GdkEventButton* ev) +{ + double scale; + + if (ev->state & GDK_CONTROL_MASK) { + if (ev->state & GDK_MOD1_MASK) { + scale = 0.05; + } else { + scale = 0.1; + } + } else { + scale = 1.0; + } + + switch (ev->button) { + case 1: + if (dragging) { + remove_modal_grab(); + dragging = false; + + if (ev->y == grab_start) { + /* no motion - just a click */ + double fract; + + if (ev->y < (pixheight/2)) { + /* near the top */ + fract = 1.0; + } else { + fract = 1.0 - (ev->y - pixheight); + } + + fract = min (1.0, fract); + fract = max (0.0, fract); + + adjustment.set_value (scale * fract * (adjustment.get_upper() - adjustment.get_lower())); + } + } else { + if (ev->state & Gdk::SHIFT_MASK) { + adjustment.set_value (default_value); + } + } + break; + default: + break; + } + return false; +} + +bool +PixFader::on_scroll_event (GdkEventScroll* ev) +{ + double scale; + + if (ev->state & GDK_CONTROL_MASK) { + if (ev->state & GDK_MOD1_MASK) { + scale = 0.05; + } else { + scale = 0.1; + } + } else { + scale = 0.5; + } + + switch (ev->direction) { + + case GDK_SCROLL_UP: + /* wheel up */ + adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale)); + break; + case GDK_SCROLL_DOWN: + /* wheel down */ + adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale)); + break; + default: + break; + } + return false; +} + +bool +PixFader::on_motion_notify_event (GdkEventMotion* ev) +{ + if (dragging) { + double fract; + double delta; + double scale; + + if (ev->window != grab_window) { + grab_y = ev->y; + grab_window = ev->window; + return true; + } + + if (ev->state & GDK_CONTROL_MASK) { + if (ev->state & GDK_MOD1_MASK) { + scale = 0.05; + } else { + scale = 0.1; + } + } else { + scale = 1.0; + } + + delta = ev->y - grab_y; + grab_y = ev->y; + + fract = (delta / pixheight); + + fract = min (1.0, fract); + fract = max (-1.0, fract); + + // X Window is top->bottom for 0..Y + + fract = -fract; + + adjustment.set_value (adjustment.get_value() + scale * fract * (adjustment.get_upper() - adjustment.get_lower())); + } + + return true; +} + +void +PixFader::adjustment_changed () +{ + if (display_height() != last_drawn) { + queue_draw (); + } +} diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index e524eba1cb..96a873941c 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "i18n.h" @@ -34,7 +34,7 @@ SliderController::SliderController (Glib::RefPtr slide, Controllable& c, bool with_numeric) - : PixScroller (*adj, slide, rail), + : PixFader (slide, rail, *adj), binding_proxy (c), spin (*adj, 0, 2) { @@ -47,7 +47,7 @@ SliderController::SliderController (Glib::RefPtr slide, void SliderController::set_value (float v) { - adj.set_value (v); + adjustment.set_value (v); } bool @@ -56,7 +56,7 @@ SliderController::on_button_press_event (GdkEventButton *ev) if (binding_proxy.button_press_handler (ev)) { return true; } - return PixScroller::on_button_press_event (ev); + return PixFader::on_button_press_event (ev); } VSliderController::VSliderController (Glib::RefPtr slide, -- cgit v1.2.3