From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 2 Apr 2014 21:59:35 +0000 (+0200)
Subject: Merge branch 'fix/high-dpi'
X-Git-Url: https://git.owens.tech/dummy.html/dummy.html/git?a=commitdiff_plain;h=2f71d8c877daf50d0c7e3c02bbd971f4978c758d;p=vimb.git

Merge branch 'fix/high-dpi'

Conflicts:
	src/config.def.h
---

2f71d8c877daf50d0c7e3c02bbd971f4978c758d
diff --cc src/config.def.h
index cc0ab33,ff0807d..92bed30
--- a/src/config.def.h
+++ b/src/config.def.h
@@@ -36,8 -36,8 +36,14 @@@
  #define FEATURE_TITLE_PROGRESS
  /* should the history indicator [+-] be shown in status bar after url */
  #define FEATURE_HISTORY_INDICATOR
 +/* show wget style progressbar in status bar */
 +#define FEATURE_WGET_PROGRESS_BAR
++#ifdef HAS_GTK3
+ /* enables workaround for hight dpi displays */
 -#define FEATURE_HIGH_DPI
++/* eventually the environment variable GDK_DPI_SCALE=2.0 must be set */
++/* to get the hack working */
++/* #define FEATURE_HIGH_DPI */
++#endif
  
  
  /* time in seconds after that message will be removed from inputbox if the