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

rename variable: 'small' is a keyword on mingw/win32

Browse source
This commit is contained in:
Robin Gareus 2014-09-30 18:50:41 +02:00
parent e1e4f9c9dd
commit e7255b0473
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/panner2d.cc
View file

@ -415,7 +415,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
{
CartesianVector c;
cairo_t* cr;
bool small = (height <= large_size_threshold);
bool xsmall = (height <= large_size_threshold);
const double diameter = radius*2.0;
cr = gdk_cairo_create (get_window()->gobj());
@ -506,7 +506,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
if (small) {
if (xsmall) {
arc_radius = 4.0;
} else {
cairo_set_font_size (cr, 10);
@ -552,12 +552,12 @@ Panner2d::on_expose_event (GdkEventExpose *event)
cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 0.8);
cairo_stroke (cr);
if (!small && !signal->text.empty()) {
if (!xsmall && !signal->text.empty()) {
cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, .9);
/* the +/- adjustments are a hack to try to center the text in the circle
* TODO use pango get_pixel_size() -- see mono_panner.cc
*/
if (small) {
if (xsmall) {
cairo_move_to (cr, c.x - 1, c.y + 1);
} else {
cairo_move_to (cr, c.x - 4, c.y + 4);
@ -592,7 +592,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
cairo_move_to (cr, c.x, c.y);
cairo_save (cr);
cairo_rotate (cr, -(sp.azi/360.0) * (2.0 * M_PI));
if (small) {
if (xsmall) {
cairo_scale (cr, 0.8, 0.8);
} else {
cairo_scale (cr, 1.2, 1.2);
@ -610,7 +610,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
cairo_fill (cr);
cairo_restore (cr);
if (!small) {
if (!xsmall) {
cairo_set_font_size (cr, 16);
/* move the text in just a bit */