Browse Source

Use `GuiEventType` in `Application` and `Gui`

master
Krisjanis Rijnieks 9 years ago
parent
commit
92df6bef84
  1. 1
      src/Application/Application.h
  2. 2
      src/Application/Gui.cpp
  3. 1
      src/Application/Gui.h

1
src/Application/Application.h

@ -45,6 +45,7 @@ class Application {
void onMousePressed(ofMouseEventArgs & args); void onMousePressed(ofMouseEventArgs & args);
// Then we catch GUI events with this one and create commands // Then we catch GUI events with this one and create commands
void onGuiEvent(GuiEvent & e); void onGuiEvent(GuiEvent & e);
// Every state should have it's own GUI layer
void addFboSource(FboSource & fboSource); void addFboSource(FboSource & fboSource);

2
src/Application/Gui.cpp

@ -15,7 +15,7 @@ Gui * Gui::instance(){
void Gui::notifyEvent(ofMouseEventArgs & args){ void Gui::notifyEvent(ofMouseEventArgs & args){
GuiEvent e; GuiEvent e;
e.args = args; e.args = args;
e.type = 1; e.type = GuiEventType::SURFACE_HIT;
ofNotifyEvent(event, e, this); ofNotifyEvent(event, e, this);
} }

1
src/Application/Gui.h

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "ofEvents.h" #include "ofEvents.h"
#include "GuiEventType.h"
namespace ofx { namespace ofx {
namespace piMapper { namespace piMapper {

Loading…
Cancel
Save