minor fixes

tworide · Feb 27, 2012 · 0e81a97 · 0e81a97
1 parent 820c44c
commit 0e81a97
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate b/....xcodeproj/project.xcworkspace/xcuserdata/reza.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/example-ofxUIAllWidgets/src/testApp.cpp b/example-ofxUIAllWidgets/src/testApp.cpp
@@ -34,6 +34,8 @@ void testApp::draw()
 	}
 
 	ofPopStyle(); 
+
+    ofSetRectMode(OF_RECTMODE_CENTER); 
 }
 //--------------------------------------------------------------
 void testApp::guiEvent(ofxUIEventArgs &e)

diff --git a/src/ofxUICanvas.h b/src/ofxUICanvas.h
@@ -513,6 +513,9 @@ class ofxUICanvas : public ofxUIWidget
         ofPushStyle(); 
 		glDisable(GL_DEPTH_TEST);        
         ofEnableBlendMode(OF_BLENDMODE_ALPHA); 
+        ofSetRectMode(OF_RECTMODE_CORNER);         
+        ofSetLineWidth(1.0);         
+
         if(draw_back)
         {
             ofFill(); 
@@ -553,11 +556,7 @@ class ofxUICanvas : public ofxUIWidget
             ofNoFill();
             ofSetColor(color_outline_highlight); 
 			paddedRect->draw(); 
-		}
-
-        ofPopStyle();         
-
-        ofSetLineWidth(1.0); 
+		}            
 
 		for(int i = widgets.size()-1; i >= 0; i--)
 		{
@@ -568,7 +567,7 @@ class ofxUICanvas : public ofxUIWidget
 		}
 
 		glDisable(GL_DEPTH_TEST); 
-
+        ofPopStyle();         
     }
 
     void exit()

diff --git a/src/ofxUIRotarySlider.h b/src/ofxUIRotarySlider.h
@@ -233,7 +233,7 @@ class ofxUIRotarySlider : public ofxUIWidget
 
         ofPushMatrix(); 
         ofTranslate(rect->getX(),rect->getY()); 
-        
+
         ofBeginShape(); 
 
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -233,7 +233,7 @@ class ofxUIRotarySlider : public ofxUIWidget @@
             ofPushMatrix();
             ofTranslate(rect->getX(),rect->getY());
             ofBeginShape();
             {
@@ Expand Down @@