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));
- darea.signal_button_release_event().connect (mem_fun (*this, &BarController::button_release));
+ 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));
spinner.signal_activate().connect (mem_fun (*this, &BarController::entry_activated));
show_all ();
}
+void
+BarController::drop_grab ()
+{
+ if (grabbed) {
+ grabbed = false;
+ darea.remove_modal_grab();
+ StopGesture ();
+ }
+}
+
bool
BarController::button_press (GdkEventButton* ev)
{
+ double fract;
+
if (binding_proxy.button_press_handler (ev)) {
return true;
}
case 1:
if (ev->type == GDK_2BUTTON_PRESS) {
switch_on_release = true;
- grabbed = false;
- darea.remove_modal_grab();
+ drop_grab ();
} else {
switch_on_release = false;
darea.add_modal_grab();
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;
bool
BarController::button_release (GdkEventButton* ev)
{
+ drop_grab ();
+
switch (ev->button) {
case 1:
if (switch_on_release) {
} else {
double scale;
- if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
+ 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;
mouse_control (ev->x, ev->window, scale);
}
- darea.remove_modal_grab();
- grabbed = false;
- StopGesture ();
- grabbed = false;
break;
case 2:
- if (true) { // XXX FIX ME
- /* relax */
- } else {
- double fract;
- fract = ev->x / (darea.get_width() - 2.0);
- adjustment.set_value (adjustment.get_lower() +
- fract * (adjustment.get_upper() - adjustment.get_lower()));
- }
- return true;
-
+ break;
+
case 3:
return false;
{
double scale;
- if (ev->state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK) == (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) {
+ 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;
double scale;
if (!grabbed) {
- return TRUE;
+ 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)) {
+ 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;
gint
BarController::mouse_control (double x, GdkWindow* window, double scaling)
{
- double fract;
+ double fract = 0.0;
double delta;
if (window != grab_window) {
{
Glib::RefPtr<Gdk::Window> win (darea.get_window());
Widget* parent;
- gint x1, x2, y1, y2;
+ gint x1=0, x2=0, y1=0, y2=0;
gint w, h;
double fract;
- w = darea.get_width() - 2;
- h = darea.get_height() - 2;
-
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;
if (parent) {
win->draw_rectangle (parent->get_style()->get_fg_gc (parent->get_state()),
- true,
- 0, 0, darea.get_width(), darea.get_height());
+ 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_height());
- }
- if (fract == 0.0) {
- win->draw_rectangle (get_style()->get_fg_gc (get_state()),
- true, x1, 1, 2, darea.get_height() - 2);
} else {
- win->draw_rectangle (get_style()->get_fg_gc (get_state()),
- true, x1 - 1, 1, 3, darea.get_height() - 2);
+
+ 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;
char buf[64];
buf[0] = '\0';
- label_callback (buf, 64);
+ if (label_callback)
+ label_callback (buf, 64);
if (buf[0] != '\0') {