Commit 55a4b2ce authored by Cedric Roux's avatar Cedric Roux

scroll view/time.c if control+mouse wheel

parent 392a818b
...@@ -159,15 +159,34 @@ static void scroll(void *private, gui *g, ...@@ -159,15 +159,34 @@ static void scroll(void *private, gui *g,
struct time *this = private; struct time *this = private;
int *d = notification_data; int *d = notification_data;
int x = d[0]; int x = d[0];
int key_modifiers = d[2];
double mul = 1.2; double mul = 1.2;
double pixel_length; double pixel_length;
int64_t old_px_len_rounded; int64_t old_px_len_rounded;
struct timespec t; struct timespec t;
int scroll_px;
int width;
if (pthread_mutex_lock(&this->lock)) abort(); if (pthread_mutex_lock(&this->lock)) abort();
old_px_len_rounded = this->pixel_length; old_px_len_rounded = this->pixel_length;
/* scroll if control+wheel, zoom otherwise */
if (key_modifiers & KEY_CONTROL) {
timeline_get_width(this->g, this->w, &width);
if (width < 2) width = 2;
scroll_px = 100;
if (scroll_px > width - 1) scroll_px = width - 1;
if (!strcmp(notification, "scrolldown"))
this->start_time = time_add(this->start_time,
nano_to_time(scroll_px * old_px_len_rounded));
else
this->start_time = time_sub(this->start_time,
nano_to_time(scroll_px * old_px_len_rounded));
goto end;
}
if (!strcmp(notification, "scrollup")) mul = 1 / mul; if (!strcmp(notification, "scrollup")) mul = 1 / mul;
again: again:
...@@ -191,6 +210,7 @@ again: ...@@ -191,6 +210,7 @@ again:
t = time_add(this->start_time, nano_to_time(x * old_px_len_rounded)); t = time_add(this->start_time, nano_to_time(x * old_px_len_rounded));
this->start_time = time_sub(t, nano_to_time(x * (int64_t)pixel_length)); this->start_time = time_sub(t, nano_to_time(x * (int64_t)pixel_length));
end:
if (pthread_mutex_unlock(&this->lock)) abort(); if (pthread_mutex_unlock(&this->lock)) abort();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment