benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converted mouse chevron to use pixels not time values

Browse source
This commit is contained in:
Joel Holdsworth 2008-07-15 18:36:43 +01:00
parent 6e0abf0e44
commit b2df771149
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/widgets/timeline-widget.cpp
View file

@ -210,7 +210,7 @@ TimelineWidget::zoom_view(int point, int zoom_size)
void
TimelineWidget::on_mouse_move_in_body(int x, int y)
{
ruler.set_mouse_chevron_time(x * timeScale + timeOffset);
ruler.set_mouse_chevron_offset(x);
}
} // namespace widgets

35
src/gui/widgets/timeline/timeline-ruler.cpp
View file

@ -43,16 +43,15 @@ namespace timeline {
TimelineRuler::TimelineRuler() :
Glib::ObjectBase("TimelineRuler"),
timeOffset(0),
timeOffset(-1),
timeScale(1),
mouseChevronTime(0),
mouseChevronOffset(0),
annotationHorzMargin(0),
annotationVertMargin(0),
majorTickHeight(0),
minorLongTickHeight(0),
minorShortTickHeight(0),
minDivisionWidth(100),
mouseChevronSize(0)
minDivisionWidth(100)
{
// Install style properties
register_styles();
@ -60,10 +59,7 @@ TimelineRuler::TimelineRuler() :
void
TimelineRuler::set_time_offset(gavl_time_t time_offset)
{
// Keep the chevron position lined up
mouseChevronTime += time_offset - timeOffset;
{
timeOffset = time_offset;
rulerImage.clear();
queue_draw();
@ -73,20 +69,15 @@ void
TimelineRuler::set_time_scale(int64_t time_scale)
{
REQUIRE(time_scale > 0);
// Keep the chevron position lined up
mouseChevronTime =
(time_scale * (mouseChevronTime - timeOffset)) / timeScale + timeOffset;
timeScale = time_scale;
rulerImage.clear();
queue_draw();
}
void
TimelineRuler::set_mouse_chevron_time(gavl_time_t time)
TimelineRuler::set_mouse_chevron_offset(int offset)
{
mouseChevronTime = time;
mouseChevronOffset = offset;
queue_draw();
}
@ -152,7 +143,7 @@ TimelineRuler::on_motion_notify_event(GdkEventMotion *event)
{
REQUIRE(event != NULL);
set_mouse_chevron_time(event->x * timeScale + timeOffset);
set_mouse_chevron_offset(event->x);
return true;
}
@ -256,16 +247,20 @@ TimelineRuler::draw_mouse_chevron(Cairo::RefPtr<Cairo::Context> cairo,
REQUIRE(ruler_rect.get_width() > 0);
REQUIRE(ruler_rect.get_height() > 0);
// Is the mouse chevron in view?
if(mouseChevronOffset < 0 ||
mouseChevronOffset >= ruler_rect.get_width())
return;
// Set the source colour
Glib::RefPtr<Style> style = get_style();
Gdk::Cairo::set_source_color(cairo, style->get_fg(STATE_NORMAL));
const int x = (mouseChevronTime - timeOffset) / timeScale;
cairo->move_to(x + 0.5,
cairo->move_to(mouseChevronOffset + 0.5,
ruler_rect.get_height());
cairo->line_to(x + mouseChevronSize + 0.5,
cairo->line_to(mouseChevronOffset + mouseChevronSize + 0.5,
ruler_rect.get_height() - mouseChevronSize);
cairo->line_to(x - mouseChevronSize + 0.5,
cairo->line_to(mouseChevronOffset - mouseChevronSize + 0.5,
ruler_rect.get_height() - mouseChevronSize);
cairo->fill();

11
src/gui/widgets/timeline/timeline-ruler.hpp
View file

@ -53,7 +53,12 @@ public:
*/
void set_time_scale(int64_t time_scale);
void set_mouse_chevron_time(gavl_time_t time);
/**
* Sets the offset of the mouse chevron in pixels from the left
* edge of the widget. If offset is less than 0 or greater than the
* width, the chevron will not be visible.
*/
void set_mouse_chevron_offset(int offset);
/* ===== Events ===== */
protected:
@ -86,7 +91,9 @@ private:
// View values
gavl_time_t timeOffset;
int64_t timeScale;
int mouseChevronTime;
// Indicated values
int mouseChevronOffset;
// Style values
int annotationHorzMargin;