display: add title bar, exit button

stowmyy · Oct 9, 2024 · 5c3566f · 5c3566f
1 parent ea740a0
commit 5c3566f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/dropship/dropship/src/App.cpp b/dropship/dropship/src/App.cpp
@@ -25,10 +25,11 @@ void App::render(bool* p_open) {
 	}
 #endif
 
-	static const ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysAutoResize;
+	//static const ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysAutoResize;
+	static const ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_AlwaysAutoResize;
 	ImGui::SetNextWindowSize(ImVec2(418, 0), ImGuiCond_Once);
 	ImGui::SetNextWindowPos(ImVec2(99, 99), ImGuiCond_Once);
-	ImGui::Begin("dashboard", p_open, window_flags);
+	ImGui::Begin("dropship", p_open, window_flags);
 
 	{
 		/* draw */

diff --git a/dropship/dropship/src/main.cpp b/dropship/dropship/src/main.cpp
@@ -444,20 +444,25 @@ int main(int, char**)
                 {
                     App::render(&dashboard_open);
                 }
+
+                else
+                {
+                    done = true;
+                }
             }
             catch (const json::exception& e)
             {
                 //error = std::make_optional<json::exception>(e);
                 error = std::make_optional<std::runtime_error>(e.what());
             }
-            //catch (const std::exception& e)
-            //{
-            //    error = e;
-            //}
-            //catch (...)
-            //{
-            //    error = std::make_optional<unknown_exception>();
-            //}
+            catch (const std::exception& e)
+            {
+                error = e;
+            }
+            catch (...)
+            {
+                error = std::make_optional<unknown_exception>();
+            }
         }
 
         /* testing */