Merge branch 'develop'

abdes · Jul 18, 2020 · bfe9062 · bfe9062
2 parents 1f4913e + 5fbd49e
commit bfe9062
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/CMakeLists.txt b/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})")

diff --git a/README.md b/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

diff --git a/common b/common
diff --git a/filesystem b/filesystem
diff --git a/imgui b/imgui
diff --git a/main/src/ui/application_base.cpp b/main/src/ui/application_base.cpp
@@ -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",

diff --git a/third_party/catch2 b/third_party/catch2
diff --git a/third_party/glfw b/third_party/glfw
diff --git a/third_party/glm b/third_party/glm
diff --git a/third_party/spdlog b/third_party/spdlog