eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2026-04-18 09:09:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor GUI fix for flags and media player

Browse Source
This commit is contained in:
brunoherbelin
2026-02-13 18:16:34 +01:00
parent 52d9bf19be
commit bd18c17edb
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Window/InputMappingWindow.cpp
View File

@@ -537,11 +537,11 @@ void InputMappingWindow::SliderParametersCallback(SourceCallback *callback, cons
ImGui::SetNextItemWidth(right_align);
ImGui::SameLine(0, IMGUI_SAME_LINE / 2);
if (ImGui::SliderInt("##CALLBACK_PLAY_FLAG", &val, -1, max, val < 0 ? "Next Flag" : "Flag <%d>"))
if (ImGui::SliderInt("##CALLBACK_PLAY_FLAG", &val, -1, max, val < 0 ? ICON_FA_FLAG " Next" : ICON_FA_FLAG " %d"))
edited->setValue(val );
ImGui::SameLine(0, IMGUI_SAME_LINE / 3);
testButton(edited, target, "Flag to jump to in a video source.", 12, 6);
testButton(edited, target, "Flag to jump to in a video source.", 11, 6);
}
break;

20
src/Window/SourceControlWindow.cpp
View File

@@ -26,6 +26,7 @@
#include <gst/gst.h>
// ImGui
#include "IconsFontAwesome5.h"
#include "Toolkit/ImGuiToolkit.h"
#include "Timeline.h"
#include "gst/gstclock.h"
@@ -516,14 +517,15 @@ void SourceControlWindow::Render()
p.x += g.CurrentWindow->Size.x - 2.1f * g.FontSize;
if (g.CurrentWindow->DC.CursorPos.x < p.x)
{
bool enabled = (active_selection_ < 0 && selection_.size() == 1);
ImGui::PushStyleColor(ImGuiCol_Text, enabled ? ImGui::GetColorU32(ImGuiCol_Text) : ImGui::GetColorU32(ImGuiCol_TextDisabled));
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f));
ImGui::SetCursorScreenPos(p);
if (selection_.size() == 1) {
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.f, 0.f, 0.f, 0.f));
ImGuiToolkit::ButtonToggle( ICON_FA_SEARCH, &magnifying_glass);
ImGui::PopStyleColor();
}
else
ImGui::TextDisabled(" " ICON_FA_SEARCH);
ImGuiToolkit::ButtonToggle( ICON_FA_SEARCH, &magnifying_glass);
// FORCE DISABLE IF NOT ENABLED
if (!enabled)
magnifying_glass = false;
ImGui::PopStyleColor(2);
}
ImGui::EndMenuBar();
@@ -976,7 +978,7 @@ bool TimelineSlider (const char* label, guint64 *time, TimeInterval *flag, Timel
// show time when hovering
if (hovered)
ImGui::SetTooltip(" <%d> %s ", index, GstToolkit::time_to_string(flag_time).c_str());
ImGui::SetTooltip(ICON_FA_FLAG " %d (%s)", index, GstToolkit::time_to_string(flag_time).c_str());
++index;
}
@@ -1783,7 +1785,7 @@ int SourceControlWindow::SourceButton(Source *s, ImVec2 framesize)
// centered icon in front of dark background
if (s->active() && s->playable()) {
draw_list->AddRectFilled(frame_center - ImVec2(H * 0.3f, H * 0.2f),
frame_center + ImVec2(H * 1.1f, H * 1.2f), ImGui::GetColorU32(ImGuiCol_TitleBgCollapsed), 6.f);
frame_center + ImVec2(H * 1.1f, H * 1.15f), ImGui::GetColorU32(ImGuiCol_TitleBgCollapsed), 6.f);
draw_list->AddText(frame_center, icon_color, s->playing() ? ICON_FA_PAUSE : ICON_FA_PLAY);
}
}