#include <gtkmm.h>
-#include <gtkmm2ext/pixscroller.h>
+#include "gtkmm2ext/pixscroller.h"
+#include "gtkmm2ext/keyboard.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
-PixScroller::PixScroller (Adjustment& a, Pix& pix)
- : adj (a)
+PixScroller::PixScroller (Adjustment& a,
+ Glib::RefPtr<Gdk::Pixbuf> s,
+ Glib::RefPtr<Gdk::Pixbuf> r)
+ : adj (a),
+ rail (r),
+ slider (s)
{
+ Cairo::Format format;
+
dragging = false;
- add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
+ add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
adj.signal_value_changed().connect (mem_fun (*this, &PixScroller::adjustment_changed));
default_value = adj.get_value();
- pix.generate ();
-
- rail = *(pix.pixmap (0));
- rail_mask = *(pix.shape_mask (0));
- slider = *(pix.pixmap (1));
- slider_mask = *(pix.shape_mask (1));
-
- int w, h;
-
- slider->get_size (w, h);
- sliderrect.set_width(w);
- sliderrect.set_height(h);
- rail->get_size (w, h);
- railrect.set_width(w);
- railrect.set_height(h);
+ sliderrect.set_width(slider->get_width());
+ sliderrect.set_height(slider->get_height());
+ railrect.set_width(rail->get_width());
+ railrect.set_height(rail->get_height());
railrect.set_y(sliderrect.get_height() / 2);
sliderrect.set_x(0);
sliderrect.set_y((int) rint ((overall_height - sliderrect.get_height()) * (adj.get_upper() - adj.get_value())));
railrect.set_x((sliderrect.get_width() / 2) - 2);
+
+ if (rail->get_has_alpha()) {
+ format = Cairo::FORMAT_ARGB32;
+ } else {
+ format = Cairo::FORMAT_RGB24;
+ }
+ rail_surface = Cairo::ImageSurface::create (format, rail->get_width(), rail->get_height());
+ rail_context = Cairo::Context::create (rail_surface);
+ Gdk::Cairo::set_source_pixbuf (rail_context, rail, 0.0, 0.0);
+ rail_context->paint();
+
+ if (slider->get_has_alpha()) {
+ format = Cairo::FORMAT_ARGB32;
+ } else {
+ format = Cairo::FORMAT_RGB24;
+ }
+ slider_surface = Cairo::ImageSurface::create (format, slider->get_width(), slider->get_height());
+ slider_context = Cairo::Context::create (slider_surface);
+ Gdk::Cairo::set_source_pixbuf (slider_context, slider, 0.0, 0.0);
+ slider_context->paint();
}
void
{
GdkRectangle intersect;
Glib::RefPtr<Gdk::Window> win (get_window());
-
- win->draw_rectangle (get_style()->get_bg_gc(get_state()), TRUE,
- ev->area.x,
- ev->area.y,
- ev->area.width,
- ev->area.height);
-
+ Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context();
+
if (gdk_rectangle_intersect (railrect.gobj(), &ev->area, &intersect)) {
- Glib::RefPtr<Gdk::GC> gc(get_style()->get_bg_gc(get_state()));
- win->draw_drawable (gc, rail,
- intersect.x - railrect.get_x(),
- intersect.y - railrect.get_y(),
- intersect.x,
- intersect.y,
- intersect.width,
- intersect.height);
+
+ context->save();
+ context->rectangle (intersect.x, intersect.y, intersect.width, intersect.height);
+ context->clip();
+ context->set_source (rail_surface, intersect.x - railrect.get_x(), intersect.y - railrect.get_y());
+ context->rectangle (intersect.x, intersect.y, intersect.width, intersect.height);
+ context->clip();
+ context->paint();
+ context->restore();
}
if (gdk_rectangle_intersect (sliderrect.gobj(), &ev->area, &intersect)) {
- Glib::RefPtr<Gdk::GC> gc(get_style()->get_fg_gc(get_state()));
- Glib::RefPtr<Gdk::Bitmap> mask (slider_mask);
-// Do these have a gtk2 equivalent?
-// Gdk::GCValues values;
-// gc->get_values(values);
- gc->set_clip_origin (sliderrect.get_x(), sliderrect.get_y());
- gc->set_clip_mask (mask);
- win->draw_drawable (gc, slider,
- intersect.x - sliderrect.get_x(),
- intersect.y - sliderrect.get_y(),
- intersect.x,
- intersect.y,
- intersect.width,
- intersect.height);
-// gc->set_clip_origin(values.clip_x_origin, values.clip_y_origin);
-// Gdk::Bitmap i_hate_gdk (values.clip_mask);
-// gc->set_clip_mask (i_hate_gdk);
- }
+ context->save();
+ context->rectangle (intersect.x, intersect.y, intersect.width, intersect.height);
+ context->clip();
+ context->set_source (rail_surface, intersect.x - sliderrect.get_x(), intersect.y - sliderrect.get_y());
+ context->rectangle (intersect.x, intersect.y, intersect.width, intersect.height);
+ context->clip();
+ context->paint();
+ context->restore();
+ }
return true;
}
{
switch (ev->button) {
case 1:
- if (!(ev->state & Gdk::SHIFT_MASK)) {
+ if (!(ev->state & Keyboard::TertiaryModifier)) {
add_modal_grab();
grab_y = ev->y;
grab_start = ev->y;
{
double scale;
- 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;
adj.set_value (scale * fract * (adj.get_upper() - adj.get_lower()));
}
} else {
- if (ev->state & Gdk::SHIFT_MASK) {
+ if (ev->state & Keyboard::TertiaryModifier) {
adj.set_value (default_value);
cerr << "default value = " << default_value << endl;
}
}
break;
- case 4:
+ default:
+ break;
+ }
+ return false;
+}
+
+bool
+PixScroller::on_scroll_event (GdkEventScroll* ev)
+{
+ double scale;
+
+ if (ev->state & Keyboard::PrimaryModifier) {
+ if (ev->state & Keyboard::SecondaryModifier) {
+ scale = 0.05;
+ } else {
+ scale = 0.1;
+ }
+ } else {
+ scale = 0.5;
+ }
+
+ switch (ev->direction) {
+
+ case GDK_SCROLL_UP:
/* wheel up */
adj.set_value (adj.get_value() + (adj.get_page_increment() * scale));
break;
- case 5:
+ case GDK_SCROLL_DOWN:
/* wheel down */
adj.set_value (adj.get_value() - (adj.get_page_increment() * scale));
break;
return true;
}
- 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;