From 718a9635cce021f20fc5876a424a887f7ec27309 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Tue, 6 May 2014 22:20:20 +0100 Subject: rebuilding gui --- le_new/src/ofApp.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'le_new/src/ofApp.cpp') 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,23 +74,20 @@ 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"); - } //-------------------------------------------------------------- @@ -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); -- cgit v1.2.3