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

overwrite state of libs/canvas with code from corresponding period in ardour-cairocanvas

Browse source 
This makes continued merges with ardour codebase easier, at the
small cost of removing the XML-based constructors. They were not
in use anyway and their use doesn't really fit into the
conception of the canvas as a dynamic UI element. Could reintroduce
them at a later date.
This commit is contained in:
Paul Davis 2014-08-17 13:29:01 -04:00
parent dcbcf09cf5
commit 6d3b9fe7e6
21 changed files with 20 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libs/canvas/canvas.cc
View file

@ -46,18 +46,6 @@ Canvas::Canvas ()
set_epoch ();
}
Canvas::Canvas (const XMLNode& definition, const XMLNodeMap& styles, std::map<std::string, Item*>& named_items)
: _root (this)
, _scroll_offset_x (0)
, _scroll_offset_y (0)
{
set_epoch ();
const XMLNodeList& children = definition.children();
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
XMLUI::create_item (root(), **i, styles, named_items);
}
}
void
Canvas::scroll_to (Coord x, Coord y)
{
@ -293,19 +281,6 @@ GtkCanvas::GtkCanvas ()
Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK);
}
GtkCanvas::GtkCanvas (const XMLNode& definition, const XMLNodeMap& styles, std::map<std::string, Item*>& named_items)
: Canvas(definition, styles, named_items)
, _current_item (0)
, _new_current_item (0)
, _grabbed_item (0)
, _focused_item (0)
{
/* these are the events we want to know about */
add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK |
Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK);
}
void
GtkCanvas::pick_current_item (int state)
{
@ -780,11 +755,8 @@ GtkCanvas::request_size (Duple size)
if (req.y > INT_MAX) {
req.y = INT_MAX;
}
int applied_width;
int applied_height;
get_size_request(applied_width, applied_height);
set_size_request (applied_width == -1 ? req.x : applied_width,
applied_height == -1 ? req.y : applied_height );
set_size_request (req.x, req.y);
}
/** `Grab' an item, so that all events are sent to that item until it is `ungrabbed'.