ofxButton: distinguish button from Toggle visually with circle vs square (#8144)

Author: artificiel

addons/ofxGui/src/ofxButton.cpp

@@ -46,6 +46,44 @@ ofxButton* ofxButton::setup(const std::string& toggleName, float width, float he
 	return this;
 }
 
+void ofxButton::generateDraw(){
+	bg.clear();
+	bg.setFillColor(thisBackgroundColor);
+	bg.rectangle(b);
+
+	fg.clear();
+	fg.setFilled(false);
+	fg.setStrokeWidth(1);
+	fg.setStrokeColor(thisFillColor);
+	fg.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec2{1,1},checkboxRect.width-2,checkboxRect.height-2, 5);
+
+	cross.clear();
+	cross.setStrokeColor(thisTextColor);
+	cross.setFillColor(thisFillColor);
+	cross.setStrokeWidth(2);
+	cross.setFilled(true);
+	cross.rectRounded(b.getPosition()+checkboxRect.getTopLeft()+glm::vec2{1,1},checkboxRect.width-2,checkboxRect.height-2, 5);
+
+	std::string name;
+	auto textX = b.x + textPadding + checkboxRect.width;
+	if(getTextBoundingBox(getName(), textX, 0).getMaxX() > b.getMaxX() - textPadding){
+		for(auto c: ofUTF8Iterator(getName())){
+			auto next = name;
+			ofUTF8Append(next, c);
+			if(getTextBoundingBox(next,textX,0).getMaxX() > b.getMaxX() - textPadding){
+				break;
+			}else{
+				name = next;
+			}
+		}
+	}else{
+		name = getName();
+	}
+
+	textMesh = getTextMesh(name, textX, getTextVCenteredInRect(b));
+}
+
+
 bool ofxButton::mouseReleased(ofMouseEventArgs & args){
 	bool attended = setValue(args.x, args.y, false);
 	bGuiActive = false;

addons/ofxGui/src/ofxButton.h

@@ -12,6 +12,7 @@ class ofxButton : public ofxToggle{
 	~ofxButton();
 	ofxButton* setup(ofParameter<void> _bVal, float width = defaultWidth, float height = defaultHeight);
     ofxButton* setup(const std::string& toggleName, float width = defaultWidth, float height = defaultHeight);
+	void generateDraw();
 
 	virtual bool mouseReleased(ofMouseEventArgs & args);
 	virtual bool mouseMoved(ofMouseEventArgs & args);