Compare commits

..

No commits in common. "ca7b71fb3669969a128f0917591cda4c1ed29c4b" and "d9755a31fee2c8d003e32c46f9e4fc793884527b" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View file

@ -468,7 +468,6 @@ Application::drawDecalEditor(GameObjects::Decal& decal) {
ImGui::SameLine(); ImGui::SameLine();
ImGui::BeginGroup(); ImGui::BeginGroup();
ImGui::PushItemWidth(-1.0f);
ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth()); ImGui::PushMultiItemsWidths(3, ImGui::CalcItemWidth());
ImGui::DragFloat("##PosX", &decal.position.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f"); ImGui::DragFloat("##PosX", &decal.position.x(), 1.0f, -FLT_MAX, +FLT_MAX, "X: %.3f");
ImGui::PopItemWidth(); ImGui::PopItemWidth();
@ -498,7 +497,6 @@ Application::drawDecalEditor(GameObjects::Decal& decal) {
ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
ImGui::DragFloat("##VZ", &decal.vAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f"); ImGui::DragFloat("##VZ", &decal.vAxis.z(), 1.0f, -FLT_MAX, +FLT_MAX, "Z: %.3f");
ImGui::PopItemWidth(); ImGui::PopItemWidth();
ImGui::PopItemWidth();
ImGui::EndGroup(); ImGui::EndGroup();
} }

View file

@ -158,6 +158,8 @@ Application::drawWeapons() {
ImGui::EndGroup(); ImGui::EndGroup();
ImGui::SameLine();
ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
ImGui::SameLine(); ImGui::SameLine();
if(!_currentWeapon) { if(!_currentWeapon) {