diff options
| author | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
| commit | 868f557f2612903f72614a2b3a317c7a528188d1 (patch) | |
| tree | 979151d7bbb25fb633adb662d386ef4df0d46158 /libs/gtkmm2ext/gtkmm2ext/fastmeter.h | |
| parent | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (diff) | |
Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext/fastmeter.h')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h index c59e85b674..d624f29afb 100644 --- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h +++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h @@ -46,23 +46,16 @@ class FastMeter : public Gtk::DrawingArea { long hold_count() { return hold_cnt; } void set_hold_count (long); - static void set_horizontal_xpm (std::string); - static void set_vertical_xpm (std::string); - protected: bool on_expose_event (GdkEventExpose*); void on_size_request (GtkRequisition*); + void on_size_allocate (Gtk::Allocation&); private: - static std::string h_image_path; - static std::string v_image_path; - static Glib::RefPtr<Gdk::Pixbuf> h_pixbuf; - static gint h_pixheight; - static gint h_pixwidth; - static Glib::RefPtr<Gdk::Pixbuf> v_pixbuf; - static gint v_pixheight; - static gint v_pixwidth; + Glib::RefPtr<Gdk::Pixbuf> pixbuf; + gint pixheight; + gint pixwidth; Orientation orientation; GdkRectangle pixrect; @@ -76,6 +69,18 @@ class FastMeter : public Gtk::DrawingArea { bool vertical_expose (GdkEventExpose*); bool horizontal_expose (GdkEventExpose*); + + static Glib::RefPtr<Gdk::Pixbuf> request_vertical_meter(int); + + static Glib::RefPtr<Gdk::Pixbuf> *v_pixbuf_cache; + static int min_v_pixbuf_size; + static int max_v_pixbuf_size; + + static Glib::RefPtr<Gdk::Pixbuf> request_horizontal_meter(int); + + static Glib::RefPtr<Gdk::Pixbuf> *h_pixbuf_cache; + static int min_h_pixbuf_size; + static int max_h_pixbuf_size; }; |