momentary rollback to d3cod3 ofxImGui fork due to retina screens problems

Author: d3cod3

README.md

@@ -79,7 +79,7 @@ In order to build ofxVisualProgramming, you'll need this addons:
 
 #### [ofxHapPlayer](https://github.com/d3cod3/ofxHapPlayer)
 
-#### [ofxImGui](https://github.com/Daandelange/ofxImGui)
+#### [ofxImGui](https://github.com/d3cod3/ofxImGui)
 
 #### [ofxInfiniteCanvas](https://github.com/d3cod3/ofxInfiniteCanvas)
 
@@ -128,7 +128,7 @@ git clone https://github.com/d3cod3/ofxFFmpegRecorder
 git clone https://github.com/Akira-Hayasaka/ofxGLEditor
 git clone https://github.com/jeffcrouse/ofxJSON
 git clone https://github.com/d3cod3/ofxHapPlayer
-git clone https://github.com/Daandelange/ofxImGui
+git clone https://github.com/d3cod3/ofxImGui
 git clone https://github.com/d3cod3/ofxInfiniteCanvas
 git clone --branch=of-0.10.0 https://github.com/d3cod3/ofxLua
 git clone https://github.com/danomatika/ofxMidi

src/core/FileBrowser/ImGuiFileBrowser.cpp

@@ -704,7 +704,8 @@ namespace imgui_addons
         input_combobox_sz.y = std::min((inputcb_filter_files.size() + 1) * frame_height + style.WindowPadding.y *  2.0f,
                                         8 * ImGui::GetFrameHeight() + style.WindowPadding.y *  2.0f);
 
-        if(show_inputbar_combobox && ( ImGui::GetFocusedFocusScope() == focus_scope_id || ImGui::GetCurrentContext()->ActiveIdIsAlive == input_id  ))
+        // ImGui::GetFocusedFocusScope()
+        if(show_inputbar_combobox && ( ImGui::GetFocusScopeID() == focus_scope_id || ImGui::GetCurrentContext()->ActiveIdIsAlive == input_id  ))
         {
             ImGuiWindowFlags popupFlags = ImGuiWindowFlags_NoTitleBar           |
                                           ImGuiWindowFlags_NoResize             |
@@ -723,7 +724,8 @@ namespace imgui_addons
             ImGui::BeginChild("##InputBarComboBox", input_combobox_sz, true, popupFlags);
 
             ImVec2 listbox_size = input_combobox_sz - ImGui::GetStyle().WindowPadding * 2.0f;
-            if(ImGui::BeginListBox("##InputBarComboBoxList", listbox_size))
+            // ImGui::BeginListBox
+            if(ImGui::ListBoxHeader("##InputBarComboBoxList", listbox_size))
             {
                 ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f,1.0f));
                 ImGui::PushFocusScope(focus_scope_id);
@@ -747,7 +749,8 @@ namespace imgui_addons
                 }
                 ImGui::PopFocusScope();
                 ImGui::PopStyleColor(1);
-                ImGui::EndListBox();
+                //ImGui::EndListBox()
+                ImGui::ListBoxFooter();
             }
             ImGui::EndChild();
             ImGui::PopStyleColor(2);

src/core/imgui_node_canvas.cpp

@@ -556,10 +556,10 @@ bool ImGuiEx::NodeCanvas::BeginNode( int nId, const char* _id, std::string name,
     // The combination of a cliprect and columns allows us to set a clipping space for node widgets while reserving drawable space for pins, without having to add an extra window / childframe.
     ImGui::PushClipRect( curNodeData.leftPins.region.Min, curNodeData.rightPins.region.Max, true); // Inner space + Node Spaces
     ImGui::BeginColumns("innerNode", 3,
-                        ImGuiOldColumnFlags_NoBorder
-                        | ImGuiOldColumnFlags_NoResize
+                        ImGuiColumnsFlags_NoBorder
+                        | ImGuiColumnsFlags_NoResize
                         //| ImGuiOldColumnFlags_NoPreserveWidths
-                        | ImGuiOldColumnFlags_NoForceWithinWindow // important so there's no weird auto adjustments.
+                        | ImGuiColumnsFlags_NoForceWithinWindow // important so there's no weird auto adjustments.
                         );
     // Column layout
     // Note: A column of 0 width will probably cause crashes
@@ -768,7 +768,7 @@ ImGuiEx::NodeConnectData ImGuiEx::NodeCanvas::AddNodePin( const int nodeID, cons
                     auto connectingColor = ImGui::ColorConvertU32ToFloat4(_color);
                     connectingColor.w = 0.4f;
                     const LinkBezierData link_data = get_link_renderable(pinLayout.curDrawPos + ImVec2( IMGUI_EX_NODE_PIN_WIDTH*scaleFactor * -.5f, pinLayout.pinSpace.y * .5f),ImGui::GetMousePos(),IMGUI_EX_NODE_LINK_LINE_SEGMENTS_PER_LENGTH);
-                    canvasDrawList->AddBezierCubic(link_data.bezier.p0,link_data.bezier.p1,link_data.bezier.p2,link_data.bezier.p3,ImGui::ColorConvertFloat4ToU32(connectingColor),IMGUI_EX_NODE_LINK_THICKNESS,link_data.num_segments);
+                    canvasDrawList->AddBezierCurve(link_data.bezier.p0,link_data.bezier.p1,link_data.bezier.p2,link_data.bezier.p3,ImGui::ColorConvertFloat4ToU32(connectingColor),IMGUI_EX_NODE_LINK_THICKNESS,link_data.num_segments);
 
                     // add link info
                     std::string _temp = _type+" "+_gui_label;
@@ -792,7 +792,7 @@ ImGuiEx::NodeConnectData ImGuiEx::NodeCanvas::AddNodePin( const int nodeID, cons
                     auto connectingColor = ImGui::ColorConvertU32ToFloat4(_color);
                     connectingColor.w = 0.4f;
                     const LinkBezierData link_data = get_link_renderable(canvasView.translation+(_linksData.at(0)._toPinPosition*canvasView.scale),ImGui::GetMousePos(),IMGUI_EX_NODE_LINK_LINE_SEGMENTS_PER_LENGTH);
-                    canvasDrawList->AddBezierCubic(link_data.bezier.p0,link_data.bezier.p1,link_data.bezier.p2,link_data.bezier.p3,ImGui::ColorConvertFloat4ToU32(connectingColor),IMGUI_EX_NODE_LINK_THICKNESS,link_data.num_segments);
+                    canvasDrawList->AddBezierCurve(link_data.bezier.p0,link_data.bezier.p1,link_data.bezier.p2,link_data.bezier.p3,ImGui::ColorConvertFloat4ToU32(connectingColor),IMGUI_EX_NODE_LINK_THICKNESS,link_data.num_segments);
 
                     // add link info
                     std::string _temp = _type+" "+_linksData.at(0)._linkLabel;
@@ -922,7 +922,7 @@ ImGuiEx::NodeConnectData ImGuiEx::NodeCanvas::AddNodePin( const int nodeID, cons
                 _tempColor = IM_COL32(255,0,0,255);
             }
 
-            canvasDrawList->AddBezierCubic(link_data.bezier.p0, link_data.bezier.p1, link_data.bezier.p2, link_data.bezier.p3, _tempColor, IMGUI_EX_NODE_LINK_THICKNESS, link_data.num_segments);
+            canvasDrawList->AddBezierCurve(link_data.bezier.p0, link_data.bezier.p1, link_data.bezier.p2, link_data.bezier.p3, _tempColor, IMGUI_EX_NODE_LINK_THICKNESS, link_data.num_segments);
         }
 
         // Draw pin

src/ofxVisualProgramming.cpp

@@ -136,13 +136,13 @@ void ofxVisualProgramming::setup(ofxImGui::Gui* _guiRef, string release){
         // Dummy call to IO which will crash if _guiRef is not initialised.
         ImGui::GetIO();
         // Ensure ImGui gets loaded correctly
-        if(ImGui::GetCurrentContext()==nullptr || !ImGui::GetCurrentContext()->Initialized){
+        /*if(ImGui::GetCurrentContext()==nullptr || !ImGui::GetCurrentContext()->Initialized){
             ofxVPGui->setup();
         }
         // Manually force shared mode
         else {
             ofxVPGui->setSharedMode(true);
-        }
+        }*/
 
         //ofLogError("ofxVP") << "Setting up ImGui from reference instance." << (ImGui::GetCurrentContext()->Initialized?'1':'0');
     }