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

Unifying icons for session and group sources UI

Browse Source
This commit is contained in:
Bruno Herbelin
2022-04-02 17:45:57 +02:00
parent d10b809687
commit dc1f1e02a1
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ImGuiVisitor.cpp
View File

@@ -638,12 +638,12 @@ void ImGuiVisitor::visit (SessionFileSource& s)
ImGui::SetCursorPos(pos); ImGui::SetCursorPos(pos);
} }
if ( ImGui::Button( ICON_FA_FILE_EXPORT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ) if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
Mixer::manager().import( &s ); Mixer::manager().import( &s );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Text("Sources"); ImGui::Text("Sources");
if (ImGuiToolkit::ButtonIcon(3, 2)) s.session()->setFadingTarget(0.f); if (ImGuiToolkit::IconButton(2, 1)) s.session()->setFadingTarget(0.f);
float f = s.session()->fading(); float f = s.session()->fading();
ImGui::SameLine(0, IMGUI_SAME_LINE); ImGui::SameLine(0, IMGUI_SAME_LINE);
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
@@ -693,9 +693,12 @@ void ImGuiVisitor::visit (SessionGroupSource& s)
ImGui::SetCursorPos(pos); ImGui::SetCursorPos(pos);
} }
if ( ImGui::Button( ICON_FA_UPLOAD " Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){
if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
Mixer::manager().import( &s ); Mixer::manager().import( &s );
} ImGui::SameLine();
ImGui::Text("Sources");
} }
void ImGuiVisitor::visit (RenderSource& s) void ImGuiVisitor::visit (RenderSource& s)

2
MixingView.cpp
View File

@@ -499,7 +499,7 @@ View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pai
// cursor feedback // cursor feedback
slider_->color = glm::vec4( COLOR_CIRCLE_OVER, 0.9f ); slider_->color = glm::vec4( COLOR_CIRCLE_OVER, 0.9f );
std::ostringstream info; std::ostringstream info;
info << "Output " << 100 - int(f * 100.0) << " %"; info << ICON_FA_ADJUST << " Output fading " << 100 - int(f * 100.0) << " %";
return Cursor(Cursor_Hand, info.str() ); return Cursor(Cursor_Hand, info.str() );
} }
else if (pick.first == limbo_slider_) { else if (pick.first == limbo_slider_) {