rebuilding gui

2 files changed, 13 insertions, 16 deletions

diff --git a/le_new/src/ofApp.cpp b/le_new/src/ofApp.cpp
index d9488ec..d2df54c 100644
--- a/le_new/src/ofApp.cpp
+++ b/le_new/src/ofApp.cpp
@@ -74,24 +74,21 @@ void previewWindow::setup(){
 	setWindowShape(600,800);
 	setWindowPosition(260, 0);
 	setWindowTitle("PREVIEW");
-	ofAddListener(onMouseMoved, this, &previewWindow::mousemoved);
 }
-void previewWindow::setParent(ofApp *p){
-	parent=p;
+void previewWindow::setParent(ofBaseApp *p){
+	ofAddListener(onMouseDragged, p, &ofBaseApp::mousePressed);
+	ofAddListener(onMouseReleased, p, &ofBaseApp::mousePressed);
+	ofAddListener(onMousePressed, p, &ofBaseApp::mousePressed);
+	//parent=p;
 }
 void previewWindow::setBuffer(ofFbo *buffer){
 	rb=buffer;
 }
 void previewWindow::draw(){
-
+	
 	rb->draw(0,0,getWidth(),getHeight()); //why crash?
 
 }
-void previewWindow::mousemoved(ofMouseEventArgs &arg){
-
-	printf("moved\n");
-
-}
 
 //--------------------------------------------------------------
 outputWindow::~outputWindow(){
@@ -239,11 +236,11 @@ void ofApp::setup(){
 	gui.add(noteRandomiseColours.set("randomise note colours", false));
 	gui.add(transparentBlack.set("transparent black", false));
 
-	/*
-	gui.add(resetDrawscale.set("reset draw scale"));
-	gui.add(resetFBscale.set("reset FB scale"));
-
+	
+	gui.add(resetDrawscale.setup("reset draw scale"));
+	gui.add(resetFBscale.setup("reset FB scale"));
 
+/*
 	fadeScale=128;
 	gui.add(fS.setup("decay draw",fadeScale,0,255,255));
 	decayTime=1.0f;
@@ -439,7 +436,6 @@ void ofApp::windowEvent(ofResizeEventArgs &args){
 }
 
 void ofApp::mousePressed( int x, int y, int button ) {
-	printf("mouse: %i,%i %i\n",x,y,button);
 	switch (button) {
 		case 0:
 			xshift=x-(prevWin->getWidth()/2);
diff --git a/le_new/src/ofApp.h b/le_new/src/ofApp.h
index 8a33b96..4830665 100644
--- a/le_new/src/ofApp.h
+++ b/le_new/src/ofApp.h
@@ -37,6 +37,8 @@ class ofApp : public ofBaseApp, public ofxMidiListener{
 		void dragEvent(ofDragInfo dragInfo);
 		void dragEvent(ofDragInfo dragInfo,ofxFenster* win);
 
+		void previewMouse(int x, int y, int button);
+
 		void mousePressedEvent(ofMouseEventArgs &args);
 		void keyPressedEvent(ofKeyEventArgs &args);
 		void windowEvent(ofResizeEventArgs &args);
@@ -123,11 +125,10 @@ public:
 	~previewWindow();
 	ofFbo *rb;
 	ofApp *parent;
-	void setParent(ofApp *p);
+	void setParent(ofBaseApp *p);
 	void setup();
 	void setBuffer(ofFbo *buffer);
 	void draw();
-	void mousemoved(ofMouseEventArgs &arg);
 
 };