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

Minor UI and wording changes

Browse Source
This commit is contained in:
Bruno Herbelin
2022-05-24 23:28:36 +02:00
parent 3c0b2c64e1
commit 662d8bcfda
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ImGuiVisitor.cpp
View File

@@ -712,7 +712,7 @@ void ImGuiVisitor::visit (SessionGroupSource& s)
ImGuiInputTextFlags_ReadOnly); ImGuiInputTextFlags_ReadOnly);
ImGui::PopStyleColor(1); ImGui::PopStyleColor(1);
if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ) if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
Mixer::manager().import( &s ); Mixer::manager().import( &s );
ImGui::SameLine(0, IMGUI_SAME_LINE); ImGui::SameLine(0, IMGUI_SAME_LINE);
ImGui::Text("Sources"); ImGui::Text("Sources");

4
InfoVisitor.cpp
View File

@@ -176,6 +176,8 @@ void InfoVisitor::visit (SessionGroupSource& s)
return; return;
std::ostringstream oss; std::ostringstream oss;
if (!brief_) oss << "Group of ";
uint N = s.session()->size(); uint N = s.session()->size();
oss << N << " source" << (N>1 ? "s" : ""); oss << N << " source" << (N>1 ? "s" : "");
uint T = s.session()->numSources(); uint T = s.session()->numSources();
@@ -187,7 +189,7 @@ void InfoVisitor::visit (SessionGroupSource& s)
oss << ", RGB, " << s.session()->frame()->width() << " x " << s.session()->frame()->height(); oss << ", RGB, " << s.session()->frame()->width() << " x " << s.session()->frame()->height();
} }
else { else {
oss << " in Group"<< std::endl; oss << std::endl;
oss << "RGB" << std::endl; oss << "RGB" << std::endl;
oss << s.session()->frame()->width() << " x " << s.session()->frame()->height(); oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
} }

2
Source.cpp
View File

@@ -546,7 +546,7 @@ void Source::attach(FrameBuffer *renderbuffer)
// if a symbol is available // if a symbol is available
if (symbol_) if (symbol_)
// hack to place the symbols in the corner independently of aspect ratio // hack to place the symbols in the corner independently of aspect ratio
symbol_->translation_.x = 1.1f * (renderbuffer_->aspectRatio()-1.f); symbol_->translation_.x = (renderbuffer_->aspectRatio() - 0.3f) / renderbuffer_->aspectRatio();
// hack to place the initials in the corner independently of aspect ratio // hack to place the initials in the corner independently of aspect ratio
initial_0_->translation_.x = 0.2f - renderbuffer_->aspectRatio(); initial_0_->translation_.x = 0.2f - renderbuffer_->aspectRatio();

6
UserInterfaceManager.cpp
View File

@@ -983,13 +983,13 @@ void UserInterface::showMenuFile()
// GROUP // GROUP
ImGui::Separator(); ImGui::Separator();
if (ImGuiToolkit::MenuItemIcon(11, 2, "Group all sources", false, Mixer::manager().numSource() > 0)) { if (ImGuiToolkit::MenuItemIcon(11, 2, " Group all sources", false, Mixer::manager().numSource() > 0)) {
// create a new group session with all sources // create a new group session with all sources
Mixer::manager().groupAll(); Mixer::manager().groupAll();
// switch pannel to show first source (created) // switch pannel to show first source (created)
navigator.showPannelSource(0); navigator.showPannelSource(0);
} }
if (ImGuiToolkit::MenuItemIcon(7, 2, "Expand all groups", false, Mixer::manager().numSource() > 0)) { if (ImGuiToolkit::MenuItemIcon(7, 2, " Expand all groups", false, Mixer::manager().numSource() > 0)) {
// create a new group session with all sources // create a new group session with all sources
Mixer::manager().ungroupAll(); Mixer::manager().ungroupAll();
} }
@@ -5934,7 +5934,7 @@ void Navigator::RenderSourcePannel(Source *s)
// clone & delete buttons // clone & delete buttons
ImGui::Text(" "); ImGui::Text(" ");
// Action on source // Action on source
if ( ImGui::Button( ICON_FA_SHARE_SQUARE " Clone", ImVec2(ImGui::GetContentRegionAvail().x, 0)) ) if ( ImGui::Button( ICON_FA_SHARE_SQUARE " Clone & Filter", ImVec2(ImGui::GetContentRegionAvail().x, 0)) )
Mixer::manager().addSource ( Mixer::manager().createSourceClone() ); Mixer::manager().addSource ( Mixer::manager().createSourceClone() );
if ( ImGui::Button( ICON_FA_BACKSPACE " Delete", ImVec2(ImGui::GetContentRegionAvail().x, 0)) ) { if ( ImGui::Button( ICON_FA_BACKSPACE " Delete", ImVec2(ImGui::GetContentRegionAvail().x, 0)) ) {
Mixer::manager().deleteSource(s); Mixer::manager().deleteSource(s);