smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-15 01:46:34 +01:00
Code Issues Projects Releases Wiki Activity

potential fix for "crashes" caused by an endless loop of enter/hide events involving the verbose canvas cursor

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6108 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-11-17 13:34:23 +00:00
parent f7e28b858a
commit 804f08f17e
3 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

45
gtk2_ardour/canvas-noevent-text.h Normal file
View file

@ -0,0 +1,45 @@
/*
* Copyright (C) 2009 Paul Davis <paul@linuxaudiosystems.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#ifndef __gtk2_ardour_canvas_noevent_text_h__
#define __gtk2_ardour_canvas_noevent_text_h__
#include <libgnomecanvasmm/text.h>
#include <libgnomecanvasmm/text.h>
namespace Gnome { namespace Canvas {
class NoEventText : public Text
{
public:
NoEventText(Group& parent, double x, double y, const Glib::ustring& text)
: Text (parent, x, y, text) {}
NoEventText(Group& parent)
: Text (parent) {}
double point_vfunc(double, double, int, int, GnomeCanvasItem**) {
/* return a huge value to tell the canvas that we're never the item for an event */
return 9999999999999.0;
}
};
} } /* namespaces */
#endif /* __gtk2_ardour_canvas_noevent_text_h__ */

3
gtk2_ardour/editor.h
View file

@ -57,6 +57,7 @@
#include "editing.h"
#include "enums.h"
#include "editor_items.h"
#include "canvas-noevent-text.h"
#include "region_selection.h"
#include "canvas.h"
#include "time_axis_view.h"
@ -599,7 +600,7 @@ class Editor : public PublicEditor
Gdk::Cursor* which_grabber_cursor ();
ArdourCanvas::Canvas* track_canvas;
ArdourCanvas::Text* verbose_canvas_cursor;
ArdourCanvas::NoEventText* verbose_canvas_cursor;
bool verbose_cursor_visible;
void parameter_changed (const char *);

2
gtk2_ardour/editor_canvas.cc
View file

@ -119,7 +119,7 @@ Editor::initialize_canvas ()
Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor"));
verbose_canvas_cursor = new ArdourCanvas::Text (*track_canvas->root());
verbose_canvas_cursor = new ArdourCanvas::NoEventText (*track_canvas->root());
verbose_canvas_cursor->property_font_desc() = *font;
verbose_canvas_cursor->property_anchor() = ANCHOR_NW;