smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] To have USE_CAIRO_IMAGE_SURFACE working -- clean up and fixing cairo_widget. With occasion: eliminating _current_event_expose as Robin has introduced expose_area which plays similar role. Now WINDOW works under USE_CAIRO_IMAGE_SURFACE condition.

Browse source 
WARNING: we should assure that cairo's clip() serves well in Ardour as we stopped using clip_preserve().
This commit is contained in:
VKamyshniy 2014-11-17 17:55:47 +02:00
parent c4f1d74ebc
commit 96b8486ceb
4 changed files with 86 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

56
gtk2_ardour/audio_clock.cc
View file

@ -285,7 +285,7 @@ AudioClock::set_colors ()
}
void
AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
AudioClock::render (cairo_t* cr, cairo_rectangle_t* expose_area)
{
/* main layout: rounded rect, plus the text */
@ -293,19 +293,19 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
cairo_set_source_rgba (cr, bg_r, bg_g, bg_b, bg_a);
if (corner_radius) {
if (_left_layout) {
Gtkmm2ext::rounded_top_half_rectangle (cr, _current_event_expose->area.x, _current_event_expose->area.y, get_width(), upper_height, corner_radius);
Gtkmm2ext::rounded_top_half_rectangle (cr, expose_area->x, expose_area->y, get_width(), upper_height, corner_radius);
} else {
Gtkmm2ext::rounded_rectangle (cr, _current_event_expose->area.x, _current_event_expose->area.y, get_width(), upper_height, corner_radius);
Gtkmm2ext::rounded_rectangle (cr, expose_area->x, expose_area->y, get_width(), upper_height, corner_radius);
}
} else {
cairo_rectangle (cr, _current_event_expose->area.x, _current_event_expose->area.y, get_width(), upper_height);
cairo_rectangle (cr, expose_area->x, expose_area->y, get_width(), upper_height);
}
cairo_fill (cr);
}
cairo_move_to (cr,
(get_width() - layout_width) / 2.0 + _current_event_expose->area.x,
(upper_height - layout_height) / 2.0 + _current_event_expose->area.y);
(get_width() - layout_width) / 2.0 + expose_area->x,
(upper_height - layout_height) / 2.0 + expose_area->y);
pango_cairo_show_layout (cr, _layout->gobj());
@ -324,15 +324,15 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
if (_need_bg) {
if (corner_radius) {
Gtkmm2ext::rounded_bottom_half_rectangle (cr,
_current_event_expose->area.x,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x,
expose_area->y + upper_height + separator_height,
left_rect_width + (separator_height == 0 ? corner_radius : 0),
h,
corner_radius);
} else {
cairo_rectangle (cr,
_current_event_expose->area.x,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x,
expose_area->y + upper_height + separator_height,
left_rect_width,
h);
}
@ -340,22 +340,22 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
}
cairo_move_to (cr,
_current_event_expose->area.x + x_leading_padding,
_current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0));
expose_area->x + x_leading_padding,
expose_area->y + upper_height + separator_height + ((h - info_height)/2.0));
pango_cairo_show_layout (cr, _left_layout->gobj());
if (_need_bg) {
if (corner_radius) {
Gtkmm2ext::rounded_bottom_half_rectangle (cr,
_current_event_expose->area.x + left_rect_width + separator_height,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x + left_rect_width + separator_height,
expose_area->y + upper_height + separator_height,
get_width() - separator_height - left_rect_width,
h,
corner_radius);
} else {
cairo_rectangle (cr,
_current_event_expose->area.x + left_rect_width + separator_height,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x + left_rect_width + separator_height,
expose_area->y + upper_height + separator_height,
get_width() - separator_height - left_rect_width,
h);
}
@ -379,12 +379,12 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
x = x_leading_padding + left_rect_width + separator_height;
}
cairo_move_to (cr,
_current_event_expose->area.x + x,
_current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0));
expose_area->x + x,
expose_area->y + upper_height + separator_height + ((h - info_height)/2.0));
} else {
cairo_move_to (cr,
_current_event_expose->area.x + x_leading_padding + left_rect_width + separator_height,
_current_event_expose->area.y + upper_height + separator_height + ((h - info_height)/2.0));
expose_area->x + x_leading_padding + left_rect_width + separator_height,
expose_area->y + upper_height + separator_height + ((h - info_height)/2.0));
}
pango_cairo_show_layout (cr, _right_layout->gobj());
@ -394,15 +394,15 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
if (_need_bg) {
if (corner_radius) {
Gtkmm2ext::rounded_bottom_half_rectangle (cr,
_current_event_expose->area.x,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x,
expose_area->y + upper_height + separator_height,
get_width(),
h,
corner_radius);
} else {
cairo_rectangle (cr,
_current_event_expose->area.x,
_current_event_expose->area.y + upper_height + separator_height,
expose_area->x,
expose_area->y + upper_height + separator_height,
get_width(),
h);
}
@ -430,8 +430,8 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
cairo_rectangle (cr,
_current_event_expose->area.x + min (get_width() - 2.0, (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width),
_current_event_expose->area.y + (upper_height - layout_height)/2.0,
expose_area->x + min (get_width() - 2.0, (double) xcenter + cursor.get_x()/PANGO_SCALE + em_width),
expose_area->y + (upper_height - layout_height)/2.0,
2.0,
cursor.get_height()/PANGO_SCALE);
cairo_fill (cr);
@ -442,8 +442,8 @@ AudioClock::render (cairo_t* cr, cairo_rectangle_t*)
if (input_string.empty()) {
cairo_set_source_rgba (cr, cursor_r, cursor_g, cursor_b, cursor_a);
cairo_rectangle (cr,
_current_event_expose->area.x + (get_width()/2.0),
_current_event_expose->area.y + (upper_height - layout_height)/2.0,
expose_area->x + (get_width()/2.0),
expose_area->y + (upper_height - layout_height)/2.0,
2.0,
upper_height);
cairo_fill (cr);