X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fbarcontroller.cc;h=0c777ed9991636130bfe6cff1fb11690d9a78420;hb=77ce989dfa38a302da8722e6021e7ee768a5afb3;hp=53d642ce23f7ee1f63579d4b9a677130f93a0c2f;hpb=bcc929a5b6760660d307c30da58efdd24c9411fb;p=ardour.git diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 53d642ce23..0c777ed999 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -13,21 +13,23 @@ 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$ */ #include +#include #include #include #include #include #include +#include -#include -#include -#include +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/keyboard.h" +#include "gtkmm2ext/barcontroller.h" +#include "gtkmm2ext/cairo_widget.h" #include "i18n.h" @@ -36,399 +38,111 @@ using namespace Gtk; using namespace Gtkmm2ext; BarController::BarController (Gtk::Adjustment& adj, - boost::shared_ptr mc) - - : adjustment (adj), - binding_proxy (mc), - spinner (adjustment) - -{ - _style = LeftToRight; - grabbed = false; - switching = false; - switch_on_release = false; - use_parent = false; - - layout = darea.create_pango_layout(""); - - set_shadow_type (SHADOW_NONE); - - initial_value = adjustment.get_value (); - - adjustment.signal_value_changed().connect (mem_fun (*this, &Gtk::Widget::queue_draw)); - adjustment.signal_changed().connect (mem_fun (*this, &Gtk::Widget::queue_draw)); + boost::shared_ptr mc) + : _slider (&adj, mc, 60, 16) + , _switching (false) + , _switch_on_release (false) +{ - darea.add_events (Gdk::BUTTON_RELEASE_MASK| - Gdk::BUTTON_PRESS_MASK| - Gdk::POINTER_MOTION_MASK| - Gdk::ENTER_NOTIFY_MASK| - Gdk::LEAVE_NOTIFY_MASK| - Gdk::SCROLL_MASK); + add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK); + set (.5, .5, 1.0, 1.0); + set_border_width (0); + _slider.set_tweaks (PixFader::NoShowUnityLine); - darea.signal_expose_event().connect (mem_fun (*this, &BarController::expose)); - darea.signal_motion_notify_event().connect (mem_fun (*this, &BarController::motion)); - darea.signal_button_press_event().connect (mem_fun (*this, &BarController::button_press), false); - darea.signal_button_release_event().connect (mem_fun (*this, &BarController::button_release), false); - darea.signal_scroll_event().connect (mem_fun (*this, &BarController::scroll)); + _slider.StartGesture.connect (sigc::mem_fun(*this, &BarController::passtrhu_gesture_start)); + _slider.StopGesture.connect (sigc::mem_fun(*this, &BarController::passtrhu_gesture_stop)); + _slider.OnExpose.connect (sigc::mem_fun(*this, &BarController::before_expose)); + _slider.set_name (get_name()); + Gtk::SpinButton& spinner = _slider.get_spin_button(); spinner.signal_activate().connect (mem_fun (*this, &BarController::entry_activated)); spinner.signal_focus_out_event().connect (mem_fun (*this, &BarController::entry_focus_out)); - spinner.signal_input().connect (mem_fun (*this, &BarController::entry_input)); - spinner.signal_output().connect (mem_fun (*this, &BarController::entry_output)); - spinner.set_digits (3); - - add (darea); + spinner.set_digits (9); + spinner.set_numeric (true); + spinner.set_name ("BarControlSpinner"); + add (_slider); show_all (); } -void -BarController::drop_grab () +BarController::~BarController () { - if (grabbed) { - grabbed = false; - darea.remove_modal_grab(); - StopGesture (); - } } bool -BarController::button_press (GdkEventButton* ev) +BarController::on_button_press_event (GdkEventButton* ev) { - double fract; - - if (binding_proxy.button_press_handler (ev)) { - return true; + if (get_child() != &_slider) { + return false; } - - switch (ev->button) { - case 1: - if (ev->type == GDK_2BUTTON_PRESS) { - switch_on_release = true; - drop_grab (); - } else { - switch_on_release = false; - darea.add_modal_grab(); - grabbed = true; - grab_x = ev->x; - grab_window = ev->window; - StartGesture (); - } + if (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) { + _switch_on_release = true; return true; - break; - - case 2: - fract = ev->x / (darea.get_width() - 2.0); - adjustment.set_value (adjustment.get_lower() + fract * (adjustment.get_upper() - adjustment.get_lower())); - - case 3: - break; - - case 4: - case 5: - break; + } else { + _switch_on_release = false; } - return false; } bool -BarController::button_release (GdkEventButton* ev) +BarController::on_button_release_event (GdkEventButton* ev) { - drop_grab (); - - switch (ev->button) { - case 1: - if (switch_on_release) { - Glib::signal_idle().connect (mem_fun (*this, &BarController::switch_to_spinner)); - return true; - } - - if ((ev->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) == GDK_SHIFT_MASK) { - adjustment.set_value (initial_value); - } else { - double scale; - - if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { - scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { - scale = 0.1; - } else { - scale = 1.0; - } - - mouse_control (ev->x, ev->window, scale); - } - break; - - case 2: - break; - - case 3: + if (get_child() != &_slider) { return false; - - default: - break; - } - - return true; -} - -bool -BarController::scroll (GdkEventScroll* ev) -{ - double scale; - - if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { - scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { - scale = 0.1; - } else { - scale = 1.0; - } - - switch (ev->direction) { - case GDK_SCROLL_UP: - case GDK_SCROLL_RIGHT: - adjustment.set_value (adjustment.get_value() + (scale * adjustment.get_step_increment())); - break; - - case GDK_SCROLL_DOWN: - case GDK_SCROLL_LEFT: - adjustment.set_value (adjustment.get_value() - (scale * adjustment.get_step_increment())); - break; } - - return true; -} - -bool -BarController::motion (GdkEventMotion* ev) -{ - double scale; - - if (!grabbed) { + if (ev->button == 1 && _switch_on_release) { + Glib::signal_idle().connect (mem_fun (*this, &BarController::switch_to_spinner)); return true; } - - if ((ev->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) == GDK_SHIFT_MASK) { - return TRUE; - } - - if ((ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) { - scale = 0.01; - } else if (ev->state & GDK_CONTROL_MASK) { - scale = 0.1; - } else { - scale = 1.0; - } - - return mouse_control (ev->x, ev->window, scale); -} - -gint -BarController::mouse_control (double x, GdkWindow* window, double scaling) -{ - double fract = 0.0; - double delta; - - if (window != grab_window) { - grab_x = x; - grab_window = window; - return TRUE; - } - - delta = x - grab_x; - grab_x = x; - - switch (_style) { - case Line: - case LeftToRight: - fract = scaling * (delta / (darea.get_width() - 2)); - fract = min (1.0, fract); - fract = max (-1.0, fract); - adjustment.set_value (adjustment.get_value() + fract * (adjustment.get_upper() - adjustment.get_lower())); - break; - - default: - fract = 0.0; - } - - - return TRUE; -} - -bool -BarController::expose (GdkEventExpose* /*event*/) -{ - Glib::RefPtr win (darea.get_window()); - Widget* parent; - gint x1=0, x2=0, y1=0, y2=0; - gint w, h; - double fract; - - fract = ((adjustment.get_value() - adjustment.get_lower()) / - (adjustment.get_upper() - adjustment.get_lower())); - - switch (_style) { - case Line: - w = darea.get_width() - 1; - h = darea.get_height(); - x1 = (gint) floor (w * fract); - x2 = x1; - y1 = 0; - y2 = h - 1; - - if (use_parent) { - parent = get_parent(); - - if (parent) { - win->draw_rectangle (parent->get_style()->get_fg_gc (parent->get_state()), - true, - 0, 0, darea.get_width(), darea.get_height()); - } - - } else { - - win->draw_rectangle (get_style()->get_bg_gc (get_state()), - true, - 0, 0, darea.get_width() - ((darea.get_width()+1) % 2), darea.get_height()); - } - - win->draw_line (get_style()->get_fg_gc (get_state()), x1, 0, x1, h); - break; - - case CenterOut: - break; - - case LeftToRight: - - w = darea.get_width() - 2; - h = darea.get_height() - 2; - - x1 = 0; - x2 = (gint) floor (w * fract); - y1 = 0; - y2 = h - 1; - - win->draw_rectangle (get_style()->get_bg_gc (get_state()), - false, - 0, 0, darea.get_width() - 1, darea.get_height() - 1); - - /* draw active box */ - - win->draw_rectangle (get_style()->get_fg_gc (get_state()), - true, - 1 + x1, - 1 + y1, - x2, - 1 + y2); - - /* draw inactive box */ - - win->draw_rectangle (get_style()->get_fg_gc (STATE_INSENSITIVE), - true, - 1 + x2, - 1 + y1, - w - x2, - 1 + y2); - - break; - - case RightToLeft: - break; - case TopToBottom: - break; - case BottomToTop: - break; - } - - /* draw label */ - - int xpos = -1; - std::string const label = get_label (xpos); - - if (!label.empty()) { - - layout->set_text (label); - - int width, height; - layout->get_pixel_size (width, height); - - if (xpos == -1) { - xpos = max (3, 1 + (x2 - (width/2))); - xpos = min (darea.get_width() - width - 3, xpos); - } - - win->draw_layout (get_style()->get_text_gc (get_state()), - xpos, - (darea.get_height()/2) - (height/2), - layout); - } - - return true; + return false; } void -BarController::set_style (barStyle s) +BarController::on_style_changed (const Glib::RefPtr&) { - _style = s; - darea.queue_draw (); + _slider.set_name (get_name()); } gint BarController::switch_to_bar () { - if (switching) { - return FALSE; - } - - switching = true; - - if (get_child() == &darea) { + if (_switching || get_child() == &_slider) { return FALSE; } - + _switching = true; remove (); - add (darea); - darea.show (); - - switching = false; + add (_slider); + _slider.show (); + _slider.queue_draw (); + _switching = false; + SpinnerActive (false); /* EMIT SIGNAL */ return FALSE; } gint BarController::switch_to_spinner () { - if (switching) { + if (_switching || get_child() != &_slider) { return FALSE; } - switching = true; - - if (get_child() == &spinner) { - return FALSE; + _switching = true; + Gtk::SpinButton& spinner = _slider.get_spin_button(); + if (spinner.get_parent()) { + spinner.get_parent()->remove(spinner); } - remove (); add (spinner); spinner.show (); spinner.select_region (0, spinner.get_text_length()); spinner.grab_focus (); - - switching = false; + _switching = false; + SpinnerActive (true); /* EMIT SIGNAL */ return FALSE; } void BarController::entry_activated () { - string text = spinner.get_text (); - float val; - - if (sscanf (text.c_str(), "%f", &val) == 1) { - adjustment.set_value (val); - } - switch_to_bar (); } @@ -440,29 +154,15 @@ BarController::entry_focus_out (GdkEventFocus* /*ev*/) } void -BarController::set_use_parent (bool yn) +BarController::before_expose () { - use_parent = yn; - queue_draw (); + double xpos = -1; + _slider.set_text (get_label (xpos), false, false); } void BarController::set_sensitive (bool yn) { - Frame::set_sensitive (yn); - darea.set_sensitive (yn); -} - -bool -BarController::entry_input (double* /*v*/) -{ - return false; + Alignment::set_sensitive (yn); + _slider.set_sensitive (yn); } - -bool -BarController::entry_output () -{ - return false; -} - -