TWEAK: Layout/styling overhaul for the F1 menu (HarbourMasters#1026)

* First pass of UX changes * More padding/styling/layout * More styling * Moar styling * Some more styling * Implemented padding helpers * More styling, added closing buttons to windows * Fixed merge conflict mistake * Fixed new enhancements * Hopefully fix jenkins errors * Changed button behaviour, more styling * Tiny code cleanup * Change buttons from close/open to > when open * Small button spacing fix * Small styling changes after merge * Small fix after merge mistake
lilDavid · Aug 9, 2022 · e4b58e5 · e4b58e5
1 parent 0d9c390
commit e4b58e5
Show file tree

Hide file tree

Showing 4 changed files with 476 additions and 255 deletions.
diff --git a/libultraship/libultraship/Console.cpp b/libultraship/libultraship/Console.cpp
@@ -100,11 +100,15 @@ namespace Ship {
 	}
 
 	void Console::Draw() {
+		if (!this->opened) {
+			CVar_SetS32("gConsoleEnabled", 0);
+			return;
+		}
+
 		bool input_focus = false;
-		if (!this->opened) return;
 
 		ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-		ImGui::Begin("Console", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
+		ImGui::Begin("Console", &this->opened, ImGuiWindowFlags_NoFocusOnAppearing);
 		const ImVec2 pos = ImGui::GetWindowPos();
 		const ImVec2 size = ImGui::GetWindowSize();
 		// SohImGui::ShowCursor(ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows | ImGuiHoveredFlags_RectOnly), SohImGui::Dialogues::dConsole);