ardour/livetrax
13
0
Fork 0
Code

inline ScrollGroup::canvas_position() for no particular reason

Browse Source
This commit is contained in:
Paul Davis 2014-05-21 19:13:26 -04:00
parent 5696199daf
commit 22e7252729
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/canvas/canvas/scroll_group.h
View File

@ -35,8 +35,16 @@ class LIBCANVAS_API ScrollGroup : public Group
explicit ScrollGroup (Group *, Duple, ScrollSensitivity);
void scroll_to (Duple const& d);
Duple canvas_position() const;
/** return the normal "base" position of this item
rather its position as affected by any scroll
offset.
*/
Duple canvas_position() const {
return _position.translate (_scroll_offset);
}
Duple scroll_offset() const { return _scroll_offset; }
private:
ScrollSensitivity _scroll_sensitivity;
Duple _scroll_offset;

19
libs/canvas/scroll_group.cc
View File

@ -37,7 +37,13 @@ ScrollGroup::ScrollGroup (Group* parent, Duple position, ScrollSensitivity s)
void
ScrollGroup::scroll_to (Duple const& d)
{
Duple base_pos (position().translate (_scroll_offset));
/* get the nominal position of the group without scroll being in effect
*/
Duple base_pos (_position.translate (_scroll_offset));
/* compute a new position given our sensitivity to h- and v-scrolling
*/
if (_scroll_sensitivity & ScrollsHorizontally) {
base_pos.x -= d.x;
@ -49,15 +55,8 @@ ScrollGroup::scroll_to (Duple const& d)
_scroll_offset.y = d.y;
}
/* move there */
set_position (base_pos);
}
Duple
ScrollGroup::canvas_position() const
{
/* return the normal "base" position of this item
rather its position as affected by any scroll
offset.
*/
return _position.translate (_scroll_offset);
}