fix for label components not respecting alignment settings

braitsch · Feb 9, 2016 · 3bbb159 · 3bbb159
1 parent 9ab2545
commit 3bbb159
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/components/ofxDatGuiLabel.h b/src/components/ofxDatGuiLabel.h
@@ -78,6 +78,9 @@ class ofxDatGuiLabel : public ofxDatGuiComponent{
         void setWidth(int width, float labelWidth = 1)
         {
             ofxDatGuiComponent::setWidth(width, labelWidth);
+            mLabel.width = mStyle.width;
+            mLabel.rightAlignedXpos = mLabel.width - mLabel.margin;
+            ofxDatGuiComponent::positionLabel();
         }
 
         void draw()

diff --git a/src/core/ofxDatGuiComponent.cpp b/src/core/ofxDatGuiComponent.cpp
@@ -322,7 +322,8 @@ void ofxDatGuiComponent::setBorderVisible(bool visible)
 
 void ofxDatGuiComponent::update(bool acceptEvents)
 {
-    if (acceptEvents && mEnabled){
+// if window does not have focus x & y will both be zero //
+    if (acceptEvents && mEnabled && ofGetMouseX() != 0 && ofGetMouseY() != 0){
         bool mp = ofGetMousePressed();
         ofPoint mouse = ofPoint(ofGetMouseX() - mParentPosition.x, ofGetMouseY() - mParentPosition.y);
         if (hitTest(mouse)){