projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NO-OP: whitespac
[ardour.git]
/
libs
/
surfaces
/
push2
/
menu.h
diff --git
a/libs/surfaces/push2/menu.h
b/libs/surfaces/push2/menu.h
index a3a08abb738e1faaf88c8917030a0fe45a34189e..41f46c8fc4ee8b3088d83dc1cbd0ece6c334ea88 100644
(file)
--- a/
libs/surfaces/push2/menu.h
+++ b/
libs/surfaces/push2/menu.h
@@
-35,6
+35,7
@@
namespace Cairo {
namespace ArdourCanvas {
class Text;
class Rectangle;
namespace ArdourCanvas {
class Text;
class Rectangle;
+ class Rect;
}
namespace ArdourSurface {
}
namespace ArdourSurface {
@@
-57,8
+58,8
@@
class Push2Menu : public ArdourCanvas::Container
void set_layout (int cols, int rows);
void set_font_description (Pango::FontDescription);
void set_layout (int cols, int rows);
void set_font_description (Pango::FontDescription);
- void set_text_color (
ArdourCanvas
::Color);
- void set_active_color (
ArdourCanvas
::Color);
+ void set_text_color (
Gtkmm2ext
::Color);
+ void set_active_color (
Gtkmm2ext
::Color);
bool can_scroll_left() const { return first >= nrows; }
bool can_scroll_right() const { return last < displays.size() - 1; }
bool can_scroll_left() const { return first >= nrows; }
bool can_scroll_right() const { return last < displays.size() - 1; }
@@
-85,9
+86,9
@@
class Push2Menu : public ArdourCanvas::Container
uint32_t last;
uint32_t _active;
uint32_t last;
uint32_t _active;
-
ArdourCanvas
::Color text_color;
-
ArdourCanvas
::Color active_color;
-
ArdourCanvas
::Color contrast_color;
+
Gtkmm2ext
::Color text_color;
+
Gtkmm2ext
::Color active_color;
+
Gtkmm2ext
::Color contrast_color;
Pango::FontDescription font_description;
inline int active_row () const { return _active % nrows; }
Pango::FontDescription font_description;
inline int active_row () const { return _active % nrows; }