Merge 'upstream/master' - At least it builds...

This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions

View file

@ -49,6 +49,11 @@ public:
ui::Context& context
);
EventDispatcher(const EventDispatcher&) = delete;
EventDispatcher(EventDispatcher&&) = delete;
EventDispatcher& operator=(const EventDispatcher&) = delete;
EventDispatcher& operator=(EventDispatcher&&) = delete;
void run();
static void request_stop();
@ -94,7 +99,7 @@ private:
static Thread* thread_event_loop;
touch::Manager touch_manager;
touch::Manager touch_manager { };
ui::Widget* const top_widget;
ui::Painter painter;
ui::Context& context;