Merge branch 'fix/high-dpi'

Conflicts:
	src/config.def.h

diff --cc src/config.def.h
index cc0ab33,ff0807d..92bed30
--- 1/src/config.def.h
--- 2/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
 -#define FEATURE_HIGH_DPI
 +/* show wget style progressbar in status bar */
 +#define FEATURE_WGET_PROGRESS_BAR
++#ifdef HAS_GTK3
+ /* enables workaround for hight dpi displays */
++/* 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

diff --cc src/main.c
Simple merge

diff --cc src/main.h
Simple merge

diff --cc src/normal.c
Simple merge