Sfoglia il codice sorgente

Merge pull request #728 from jdumas/imgui

ImGui menu: reduce spacing + remove label window frame.

Former-commit-id: 8011310075fee67b8f5c93e08f3825d104abaa0f
Daniele Panozzo 7 anni fa
parent
commit
7b2b6929f0
1 ha cambiato i file con 12 aggiunte e 10 eliminazioni
  1. 12 10
      include/igl/opengl/glfw/imgui/ImGuiMenu.cpp

+ 12 - 10
include/igl/opengl/glfw/imgui/ImGuiMenu.cpp

@@ -175,33 +175,33 @@ IGL_INLINE void ImGuiMenu::draw_viewer_menu()
   // Workspace
   // Workspace
   if (ImGui::CollapsingHeader("Workspace", ImGuiTreeNodeFlags_DefaultOpen))
   if (ImGui::CollapsingHeader("Workspace", ImGuiTreeNodeFlags_DefaultOpen))
   {
   {
-    ImGui::Columns(2, nullptr, false);
-    if (ImGui::Button("Load##Workspace", ImVec2(-1, 0)))
+    float w = ImGui::GetContentRegionAvailWidth();
+    float p = ImGui::GetStyle().FramePadding.x;
+    if (ImGui::Button("Load##Workspace", ImVec2((w-p)/2.f, 0)))
     {
     {
       viewer->load_scene();
       viewer->load_scene();
     }
     }
-    ImGui::NextColumn();
-    if (ImGui::Button("Save##Workspace", ImVec2(-1, 0)))
+    ImGui::SameLine(0, p);
+    if (ImGui::Button("Save##Workspace", ImVec2((w-p)/2.f, 0)))
     {
     {
       viewer->save_scene();
       viewer->save_scene();
     }
     }
-    ImGui::Columns(1);
   }
   }
 
 
   // Mesh
   // Mesh
   if (ImGui::CollapsingHeader("Mesh", ImGuiTreeNodeFlags_DefaultOpen))
   if (ImGui::CollapsingHeader("Mesh", ImGuiTreeNodeFlags_DefaultOpen))
   {
   {
-    ImGui::Columns(2, nullptr, false);
-    if (ImGui::Button("Load##Mesh", ImVec2(-1, 0)))
+    float w = ImGui::GetContentRegionAvailWidth();
+    float p = ImGui::GetStyle().FramePadding.x;
+    if (ImGui::Button("Load##Mesh", ImVec2((w-p)/2.f, 0)))
     {
     {
       viewer->open_dialog_load_mesh();
       viewer->open_dialog_load_mesh();
     }
     }
-    ImGui::NextColumn();
-    if (ImGui::Button("Save##Mesh", ImVec2(-1, 0)))
+    ImGui::SameLine(0, p);
+    if (ImGui::Button("Save##Mesh", ImVec2((w-p)/2.f, 0)))
     {
     {
       viewer->open_dialog_save_mesh();
       viewer->open_dialog_save_mesh();
     }
     }
-    ImGui::Columns(1);
   }
   }
 
 
   // Viewing options
   // Viewing options
@@ -291,6 +291,7 @@ IGL_INLINE void ImGuiMenu::draw_labels_window()
   ImGui::SetNextWindowSize(ImGui::GetIO().DisplaySize, ImGuiSetCond_Always);
   ImGui::SetNextWindowSize(ImGui::GetIO().DisplaySize, ImGuiSetCond_Always);
   bool visible = true;
   bool visible = true;
   ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0,0,0,0));
   ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0,0,0,0));
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0);
   ImGui::Begin("ViewerLabels", &visible,
   ImGui::Begin("ViewerLabels", &visible,
       ImGuiWindowFlags_NoTitleBar
       ImGuiWindowFlags_NoTitleBar
       | ImGuiWindowFlags_NoResize
       | ImGuiWindowFlags_NoResize
@@ -306,6 +307,7 @@ IGL_INLINE void ImGuiMenu::draw_labels_window()
   }
   }
   ImGui::End();
   ImGui::End();
   ImGui::PopStyleColor();
   ImGui::PopStyleColor();
+  ImGui::PopStyleVar();
 }
 }
 
 
 IGL_INLINE void ImGuiMenu::draw_labels(const igl::opengl::ViewerData &data)
 IGL_INLINE void ImGuiMenu::draw_labels(const igl::opengl::ViewerData &data)