From fb759d45f5c95e3184ffc9c35b57a0a463a6d1ab Mon Sep 17 00:00:00 2001 From: that Date: Sun, 11 Jan 2015 12:16:53 +0100 Subject: gui: simplify blanktimer - get rid of separate thread, check timer in rendering thread instead - use an enum for the blanking state instead of magic integers - move #ifdefs for TW_NO_SCREEN_TIMEOUT inside blanktimer class - move some #includes and enum TOUCH_STATE to pages.hpp Change-Id: Id4b104e3680dc5db41d8ba85e32d722cf4086299 --- gui/pages.hpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gui/pages.hpp') diff --git a/gui/pages.hpp b/gui/pages.hpp index f1179f53e..2ce3e13a4 100644 --- a/gui/pages.hpp +++ b/gui/pages.hpp @@ -4,6 +4,18 @@ #define _PAGES_HEADER_HPP #include "../minzip/Zip.h" +#include +#include +#include "rapidxml.hpp" +using namespace rapidxml; + +enum TOUCH_STATE { + TOUCH_START = 0, + TOUCH_DRAG = 1, + TOUCH_RELEASE = 2, + TOUCH_HOLD = 3, + TOUCH_REPEAT = 4 +}; typedef struct { unsigned char red; -- cgit v1.2.3