Merge pull request jvcleave#49 from hamoid/master

Allow setting ImGuiWindowFlags in BeginWindow

Author: jvcleave

src/Helpers.cpp

@@ -72,6 +72,26 @@ bool ofxImGui::BeginWindow(const string& name, Settings& settings, bool collapse
 	return ImGui::Begin(name.c_str(), open, ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize | (collapse ? 0 : ImGuiWindowFlags_NoCollapse));
 }
 
+//--------------------------------------------------------------
+bool ofxImGui::BeginWindow(const string& name, Settings& settings, ImGuiWindowFlags flags, bool * open)
+{
+        if (settings.windowBlock)
+        {
+                ofLogWarning(__FUNCTION__) << "Already inside a window block!";
+                return false;
+        }
+
+        settings.windowBlock = true;
+
+        // Push a new list of names onto the stack.
+        windowOpen.usedNames.push(std::vector<std::string>());
+
+        ImGui::SetNextWindowPos(settings.windowPos, ImGuiSetCond_Appearing);
+        ImGui::SetNextWindowSize(settings.windowSize, ImGuiSetCond_Appearing);
+        ImGui::SetNextWindowCollapsed(!(flags & ImGuiWindowFlags_NoCollapse), ImGuiSetCond_Appearing);
+        return ImGui::Begin(name.c_str(), open, flags);
+}
+
 //--------------------------------------------------------------
 void ofxImGui::EndWindow(Settings& settings)
 {
@@ -563,4 +583,4 @@ void ofxImGui::AddImage(ofTexture& texture, const ofVec2f& size)
 {
 	ImTextureID textureID = (ImTextureID)(uintptr_t)texture.texData.textureID;
 	ImGui::Image(textureID, size);
-}
+}

src/Helpers.h

@@ -38,6 +38,7 @@ namespace ofxImGui
 	void SetNextWindow(Settings& settings);
 	bool BeginWindow(ofParameter<bool>& parameter, Settings& settings, bool collapse = true);
 	bool BeginWindow(const string& name, Settings& settings, bool collapse = true, bool * open = nullptr);
+	bool BeginWindow(const string& name, Settings& settings, ImGuiWindowFlags flags, bool * open = nullptr);
 	void EndWindow(Settings& settings);
 
 	bool BeginTree(ofAbstractParameter& parameter, Settings& settings);
@@ -157,4 +158,4 @@ bool ofxImGui::AddValues(const string& name, vector<DataType>& values, DataType
 		}
 	}
 	return result;
-}
+}