Merge branch 'develop'

Author: abdes

CMakeLists.txt

@@ -58,7 +58,7 @@ set(META_AUTHOR_DOMAIN       "https://github.com/abdes/asap")
 set(META_AUTHOR_MAINTAINER   "Abdessattar Sassi (abde.sassi gmail account)")
 set(META_VERSION_MAJOR       "0")
 set(META_VERSION_MINOR       "9")
-set(META_VERSION_PATCH       "3")
+set(META_VERSION_PATCH       "4")
 set(META_VERSION_REVISION    "${GIT_REV}")
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 set(META_NAME_VERSION        "${META_PROJECT_NAME} v${META_VERSION} (${META_VERSION_REVISION})")

README.md

@@ -11,13 +11,13 @@
 | Windows | [![Windows][21]][20] |
 
 [0]: https://travis-ci.org/abdes/asap_app_imgui
-[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/9
-[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/10
-[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/11
-[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/12
-[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/master/13
+[9]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/9
+[10]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/10
+[11]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/11
+[12]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/12
+[13]: https://travis-matrix-badges.herokuapp.com/repos/abdes/asap_app_imgui/branches/develop/13
 [20]: https://ci.appveyor.com/project/abdes/asap-app-imgui
-[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/master?svg=true
+[21]: https://ci.appveyor.com/api/projects/status/qoaae14rw3cyivgq/branch/develop?svg=true
 
 # Starter project with minimum necessary functionality
   - use cmake for the build system

common

@@ -358,7 +358,7 @@ void ShowDisplaySettings(ImGuiRunner *runner) {
   // Toolbar
   ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {5.0f, 2.0f});
   ImGui::PushStyleColor(
-      ImGuiCol_ChildWindowBg,
+      ImGuiCol_ChildBg,
       (pending_changes) ? ImGui::GetStyleColorVec4(ImGuiCol_PlotLinesHovered)
                         : ImGui::GetStyleColorVec4(ImGuiCol_MenuBarBg));
 
@@ -460,7 +460,7 @@ void ShowStyleSettings() {
   // Toolbar
   {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, {5.0f, 2.0f});
-    ImGui::PushStyleColor(ImGuiCol_ChildWindowBg,
+    ImGui::PushStyleColor(ImGuiCol_ChildBg,
                           ImGui::GetStyleColorVec4(ImGuiCol_MenuBarBg));
     {
       ImGui::BeginChild("Style Settings Toolbar",