diff --git a/config.mk b/config.mk index 9d957bb..05fffec 100644 --- a/config.mk +++ b/config.mk @@ -26,7 +26,7 @@ GLIB_MIN_VERSION = 2.50 GLIB_PKG_CONFIG_NAME = glib-2.0 # GTK GTK_VERSION_CHECK ?= 1 -GTK_MIN_VERSION = 3.6 +GTK_MIN_VERSION = 3.10 GTK_PKG_CONFIG_NAME = gtk+-3.0 # pkg-config binary @@ -49,12 +49,9 @@ WITH_MAGIC ?= 1 # HiDPI HIDPI_SUPPORT_CAIRO = $(shell (${PKG_CONFIG} --atleast-version=1.14 cairo && echo 1) || echo 0) -HIDPI_SUPPORT_GTK = $(shell (${PKG_CONFIG} --atleast-version=3.10 ${GTK_PKG_CONFIG_NAME} && echo 1) || echo 0) ifeq (${HIDPI_SUPPORT_CAIRO},1) -ifeq (${HIDPI_SUPPORT_GTK},1) CPPFLAGS += -DHAVE_HIDPI_SUPPORT endif -endif # paths PREFIX ?= /usr diff --git a/zathura/callbacks.c b/zathura/callbacks.c index b89a4a7..f82eda0 100644 --- a/zathura/callbacks.c +++ b/zathura/callbacks.c @@ -224,11 +224,7 @@ cb_scale_factor(GObject* object, GParamSpec* UNUSED(pspec), gpointer data) return; } -#ifdef HAVE_HIDPI_SUPPORT int new_factor = gtk_widget_get_scale_factor(GTK_WIDGET(object)); -#else - int new_factor = 1; -#endif double current_x; double current_y; diff --git a/zathura/zathura.c b/zathura/zathura.c index e83bf7b..2d9a5d6 100644 --- a/zathura/zathura.c +++ b/zathura/zathura.c @@ -153,10 +153,8 @@ init_ui(zathura_t* zathura) g_signal_connect(G_OBJECT(zathura->ui.session->gtk.view), "refresh-view", G_CALLBACK(cb_refresh_view), zathura); -#ifdef HAVE_HIDPI_SUPPORT g_signal_connect(G_OBJECT(zathura->ui.session->gtk.view), "notify::scale-factor", G_CALLBACK(cb_scale_factor), zathura); -#endif /* page view */ zathura->ui.page_widget = gtk_grid_new();