mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-10-30 20:51:06 +01:00 
			
		
		
		
	Demo: Minor coding style tweaks so bgfx copy needs less patching.
This commit is contained in:
		| @@ -1550,9 +1550,9 @@ void ImGui::ShowTestWindow(bool* p_open) | ||||
|             ImGui::InputFloat("blue", &bar, 0.05f, 0, 3); | ||||
|             ImGui::NextColumn(); | ||||
|  | ||||
|             if (ImGui::CollapsingHeader("Category A")) ImGui::Text("Blah blah blah"); ImGui::NextColumn(); | ||||
|             if (ImGui::CollapsingHeader("Category B")) ImGui::Text("Blah blah blah"); ImGui::NextColumn(); | ||||
|             if (ImGui::CollapsingHeader("Category C")) ImGui::Text("Blah blah blah"); ImGui::NextColumn(); | ||||
|             if (ImGui::CollapsingHeader("Category A")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn(); | ||||
|             if (ImGui::CollapsingHeader("Category B")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn(); | ||||
|             if (ImGui::CollapsingHeader("Category C")) { ImGui::Text("Blah blah blah"); } ImGui::NextColumn(); | ||||
|             ImGui::Columns(1); | ||||
|             ImGui::Separator(); | ||||
|             ImGui::TreePop(); | ||||
| @@ -2105,9 +2105,9 @@ static void ShowExampleAppConstrainedResize(bool* p_open) | ||||
|             "Custom: Fixed Steps (100)", | ||||
|         }; | ||||
|         ImGui::Combo("Constraint", &type, desc, IM_ARRAYSIZE(desc));  | ||||
|         if (ImGui::Button("200x200")) ImGui::SetWindowSize(ImVec2(200,200)); ImGui::SameLine(); | ||||
|         if (ImGui::Button("500x500")) ImGui::SetWindowSize(ImVec2(500,500)); ImGui::SameLine(); | ||||
|         if (ImGui::Button("800x200")) ImGui::SetWindowSize(ImVec2(800,200)); | ||||
|         if (ImGui::Button("200x200")) { ImGui::SetWindowSize(ImVec2(200,200)); } ImGui::SameLine(); | ||||
|         if (ImGui::Button("500x500")) { ImGui::SetWindowSize(ImVec2(500,500)); } ImGui::SameLine(); | ||||
|         if (ImGui::Button("800x200")) { ImGui::SetWindowSize(ImVec2(800,200)); } | ||||
|         for (int i = 0; i < 10; i++)  | ||||
|             ImGui::Text("Hello, sailor! Making this line long enough for the example."); | ||||
|     } | ||||
| @@ -2325,8 +2325,8 @@ struct ExampleAppConsole | ||||
|         // TODO: display items starting from the bottom | ||||
|  | ||||
|         if (ImGui::SmallButton("Add Dummy Text")) { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } ImGui::SameLine(); | ||||
|         if (ImGui::SmallButton("Add Dummy Error")) AddLog("[error] something went wrong"); ImGui::SameLine(); | ||||
|         if (ImGui::SmallButton("Clear")) ClearLog(); ImGui::SameLine(); | ||||
|         if (ImGui::SmallButton("Add Dummy Error")) { AddLog("[error] something went wrong"); } ImGui::SameLine(); | ||||
|         if (ImGui::SmallButton("Clear")) { ClearLog(); } ImGui::SameLine(); | ||||
|         bool copy_to_clipboard = ImGui::SmallButton("Copy"); ImGui::SameLine(); | ||||
|         if (ImGui::SmallButton("Scroll to bottom")) ScrollToBottom = true; | ||||
|         //static float t = 0.0f; if (ImGui::GetTime() - t > 0.02f) { t = ImGui::GetTime(); AddLog("Spam %f", t); } | ||||
| @@ -2385,7 +2385,7 @@ struct ExampleAppConsole | ||||
|         if (ImGui::InputText("Input", InputBuf, IM_ARRAYSIZE(InputBuf), ImGuiInputTextFlags_EnterReturnsTrue|ImGuiInputTextFlags_CallbackCompletion|ImGuiInputTextFlags_CallbackHistory, &TextEditCallbackStub, (void*)this)) | ||||
|         { | ||||
|             char* input_end = InputBuf+strlen(InputBuf); | ||||
|             while (input_end > InputBuf && input_end[-1] == ' ') input_end--; *input_end = 0; | ||||
|             while (input_end > InputBuf && input_end[-1] == ' ') { input_end--; } *input_end = 0; | ||||
|             if (InputBuf[0]) | ||||
|                 ExecCommand(InputBuf); | ||||
|             strcpy(InputBuf, ""); | ||||
| @@ -2426,7 +2426,8 @@ struct ExampleAppConsole | ||||
|         } | ||||
|         else if (Stricmp(command_line, "HISTORY") == 0) | ||||
|         { | ||||
|             for (int i = History.Size >= 10 ? History.Size - 10 : 0; i < History.Size; i++) | ||||
|             int first = History.Size - 10; | ||||
|             for (int i = first > 0 ? first : 0; i < History.Size; i++) | ||||
|                 AddLog("%3d: %s\n", i, History[i]); | ||||
|         } | ||||
|         else | ||||
|   | ||||
		Reference in New Issue
	
	Block a user