eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-05 15:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve views

Browse Source 
Just a bit more space and tooltips in the menus above Geometry, Texture and Display views
This commit is contained in:
Bruno Herbelin
2024-10-28 20:52:39 +01:00
parent d84f8b14c4
commit 85308462eb
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DisplaysView.cpp
View File

@@ -553,7 +553,7 @@ void DisplaysView::draw()
Settings::application.windows[0].fullscreen);
// Set window position depending on icons size
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 1.5f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 2.f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
if (ImGui::Begin("##DisplaysMaskOptions", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground
| ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings
| ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus ))

8
src/GeometryView.cpp
View File

@@ -298,7 +298,7 @@ void GeometryView::draw()
P = Rendering::manager().project(glm::vec3(P, 0.f), scene.root()->transform_, false);
// Set window position depending on icons size
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 1.5f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 2.f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
if (ImGui::Begin("##GeometryViewOptions", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground
| ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings
| ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus ))
@@ -312,8 +312,8 @@ void GeometryView::draw()
ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 0.9f));
// toggle sources visibility flag
std::string _label = std::to_string(hidden_count_) + " source" + (hidden_count_>1?"s ":" ")
+ "outside mixing circle " + ICON_FA_MOON;
std::string _label = "Show sources outside mixing circle (" + std::to_string(hidden_count_)
+ " source" + (hidden_count_>1?"s ":" ") + "not visible " + ICON_FA_MOON + ")";
ImGuiToolkit::ButtonIconToggle(12, 0, &Settings::application.views[mode_].ignore_mix, _label.c_str());
// select layers visibility
@@ -335,6 +335,8 @@ void GeometryView::draw()
// need full update
Mixer::manager().setView(mode_);
}
if ( ImGui::IsItemHovered() )
ImGuiToolkit::ToolTip("Show sources per layer");
ImGui::PopStyleColor(6);
ImGui::End();

4
src/TextureView.cpp
View File

@@ -651,7 +651,7 @@ void TextureView::draw()
P = Rendering::manager().project(glm::vec3(P, 0.f), scene.root()->transform_, false);
// Set window position depending on icons size
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 1.5f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y - 2.f * ImGui::GetFrameHeight() ), ImGuiCond_Always);
if (ImGui::Begin("##AppearanceMaskOptions", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground
| ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings
| ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus ))
@@ -706,6 +706,8 @@ void TextureView::draw()
}
ImGui::EndCombo();
}
if (ImGui::IsItemHovered())
ImGuiToolkit::ToolTip(MaskShader::mask_names[maskmode]);
// GUI for selecting source mask
if (maskmode == MaskShader::SOURCE) {