Compare commits

..

No commits in common. "f341c8f8c3185aa3688fb96d34d180b2aee1b11d" and "192698b7bdfe04e9b6ef4ad4e022422f34a00a53" have entirely different histories.

2 changed files with 2 additions and 23 deletions

View File

@ -19,8 +19,7 @@ Building and Running
-------------------- --------------------
Build dependencies: Meson, pkg-config + Build dependencies: Meson, pkg-config +
Runtime dependencies: gtk+-3.0, pixman-1, shared-mime-info, libpng>=1.5.4, Runtime dependencies: gtk+-3.0, pixman-1, shared-mime-info, libpng>=1.5.4,
libturbojpeg, LibRaw (optional), librsvg-2.0 (optional), libturbojpeg, LibRaw (optional), librsvg-2.0 (optional)
gdk-pixbuf-2.0 (optional)
$ git clone --recursive https://git.janouch.name/p/fastiv.git $ git clone --recursive https://git.janouch.name/p/fastiv.git
$ meson builddir $ meson builddir

View File

@ -99,8 +99,7 @@ fastiv_view_realize(GtkWidget *widget)
// Assuming here that we can't ask for a higher-precision Visual // Assuming here that we can't ask for a higher-precision Visual
// than what we get automatically. // than what we get automatically.
.visual = gtk_widget_get_visual(widget), .visual = gtk_widget_get_visual(widget),
.event_mask = gtk_widget_get_events(widget) | GDK_SCROLL_MASK | .event_mask = gtk_widget_get_events(widget) | GDK_SCROLL_MASK,
GDK_KEY_PRESS_MASK,
}; };
// We need this window to receive input events at all. // We need this window to receive input events at all.
@ -190,22 +189,6 @@ fastiv_view_scroll_event(GtkWidget *widget, GdkEventScroll *event)
} }
} }
static gboolean
fastiv_view_key_press_event(GtkWidget *widget, GdkEventKey *event)
{
FastivView *self = FASTIV_VIEW(widget);
if (event->state & gtk_accelerator_get_default_mod_mask())
return FALSE;
switch (event->keyval) {
case GDK_KEY_1:
self->scale = 1;
gtk_widget_queue_resize(widget);
return TRUE;
}
return FALSE;
}
static void static void
fastiv_view_class_init(FastivViewClass *klass) fastiv_view_class_init(FastivViewClass *klass)
{ {
@ -218,7 +201,6 @@ fastiv_view_class_init(FastivViewClass *klass)
widget_class->realize = fastiv_view_realize; widget_class->realize = fastiv_view_realize;
widget_class->draw = fastiv_view_draw; widget_class->draw = fastiv_view_draw;
widget_class->scroll_event = fastiv_view_scroll_event; widget_class->scroll_event = fastiv_view_scroll_event;
widget_class->key_press_event = fastiv_view_key_press_event;
// TODO(p): Later override "screen_changed", recreate Pango layouts there, // TODO(p): Later override "screen_changed", recreate Pango layouts there,
// if we get to have any, or otherwise reflect DPI changes. // if we get to have any, or otherwise reflect DPI changes.
@ -228,8 +210,6 @@ fastiv_view_class_init(FastivViewClass *klass)
static void static void
fastiv_view_init(FastivView *self) fastiv_view_init(FastivView *self)
{ {
gtk_widget_set_can_focus(GTK_WIDGET(self), TRUE);
self->scale = 1.0; self->scale = 1.0;
} }