1 files changed, 36 insertions, 11 deletions

diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 244d94b157..1576b875dd 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -220,22 +220,47 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define MANDELBROT_QUIT          BUTTON_POWER
-#define MANDELBROT_UP            BUTTON_UP
-#define MANDELBROT_DOWN          BUTTON_DOWN
-#define MANDELBROT_LEFT          BUTTON_LEFT
-#define MANDELBROT_RIGHT         BUTTON_RIGHT
-#define MANDELBROT_ZOOM_IN_PRE   BUTTON_SELECT
-#define MANDELBROT_ZOOM_IN       (BUTTON_SELECT | BUTTON_PLUS)
-#define MANDELBROT_ZOOM_OUT_PRE  BUTTON_SELECT
-#define MANDELBROT_ZOOM_OUT      (BUTTON_SELECT | BUTTON_MINUS)
-#define MANDELBROT_MAXITER_INC   BUTTON_PLUS
-#define MANDELBROT_MAXITER_DEC   BUTTON_MINUS
-#define MANDELBROT_RESET         BUTTON_MENU
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef MANDELBROT_UP
+#define MANDELBROT_UP            BUTTON_TOPMIDDLE
+#endif
+#ifndef MANDELBROT_DOWN
+#define MANDELBROT_DOWN          BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef MANDELBROT_LEFT
+#define MANDELBROT_LEFT          BUTTON_MIDLEFT
+#endif
+#ifndef MANDELBROT_RIGHT
+#define MANDELBROT_RIGHT         BUTTON_MIDRIGHT
+#endif
+#ifndef MANDELBROT_ZOOM_IN_PRE
+#define MANDELBROT_ZOOM_IN_PRE   BUTTON_TOPRIGHT
+#endif
+#ifndef MANDELBROT_ZOOM_IN
+#define MANDELBROT_ZOOM_IN      (BUTTON_TOPRIGHT | BUTTON_REL)
+#endif
+#ifndef MANDELBROT_ZOOM_OUT_PRE
+#define MANDELBROT_ZOOM_OUT_PRE  BUTTON_TOPLEFT
+#endif
+#ifndef MANDELBROT_ZOOM_OUT
+#define MANDELBROT_ZOOM_OUT     (BUTTON_TOPLEFT | BUTTON_REL)
+#endif
+#ifndef MANDELBROT_MAXITER_INC
+#define MANDELBROT_MAXITER_INC   BUTTON_BOTTOMRIGHT
+#endif
+#ifndef MANDELBROT_MAXITER_DEC
+#define MANDELBROT_MAXITER_DEC   BUTTON_BOTTOMLEFT
+#endif
+#ifndef MANDELBROT_RESET
+#define MANDELBROT_RESET         BUTTON_CENTER
+#endif
+#endif
+
 #if LCD_DEPTH < 8
 #define USEGSLIB
 #define MYLCD(fn) grey_ub_ ## fn