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

BugFix New source pannel

Browse Source 
Clear status of new source pannel when changing type of input.
This commit is contained in:
Bruno Herbelin
2022-07-02 11:34:43 +02:00
parent cef7379c07
commit af009e03a0
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
UserInterfaceManager.cpp
View File

@@ -93,6 +93,7 @@ using namespace std;
#include "ImageProcessingShader.h" #include "ImageProcessingShader.h"
#include "Metronome.h" #include "Metronome.h"
#include "VideoBroadcast.h" #include "VideoBroadcast.h"
#include "MultiFileRecorder.h"
#include "TextEditor.h" #include "TextEditor.h"
TextEditor _editor; TextEditor _editor;
@@ -5805,6 +5806,17 @@ void Navigator::applyButtonSelection(int index)
show_config_ = false; show_config_ = false;
} }
void Navigator::clearNewPannel()
{
new_source_preview_.setSource();
pattern_type = -1;
custom_pipeline = false;
custom_connected = false;
sourceSequenceFiles.clear();
sourceMediaFileCurrent.clear();
new_media_mode_changed = true;
}
void Navigator::clearButtonSelection() void Navigator::clearButtonSelection()
{ {
// clear all buttons // clear all buttons
@@ -5812,12 +5824,7 @@ void Navigator::clearButtonSelection()
selected_button[i] = false; selected_button[i] = false;
// clear new source pannel // clear new source pannel
new_source_preview_.setSource(); clearNewPannel();
pattern_type = -1;
custom_pipeline = false;
sourceSequenceFiles.clear();
sourceMediaFileCurrent.clear();
new_media_mode_changed = true;
} }
void Navigator::showPannelSource(int index) void Navigator::showPannelSource(int index)
@@ -6219,7 +6226,7 @@ void Navigator::RenderNewPannel()
}; };
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
if (ImGui::Combo("##Origin", &Settings::application.source.new_type, origin_names, IM_ARRAYSIZE(origin_names)) ) if (ImGui::Combo("##Origin", &Settings::application.source.new_type, origin_names, IM_ARRAYSIZE(origin_names)) )
new_source_preview_.setSource(); clearNewPannel();
ImGui::SetCursorPosY(2.f * width_); ImGui::SetCursorPosY(2.f * width_);
@@ -6419,6 +6426,7 @@ void Navigator::RenderNewPannel()
bool update_new_source = false; bool update_new_source = false;
static DialogToolkit::MultipleImagesDialog _selectImagesDialog("Select Images"); static DialogToolkit::MultipleImagesDialog _selectImagesDialog("Select Images");
//static bool _create_video_sequence = false;
// clic button to load file // clic button to load file
if ( ImGui::Button( ICON_FA_IMAGES " Open images", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) { if ( ImGui::Button( ICON_FA_IMAGES " Open images", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) {

1
UserInterfaceManager.h
View File

@@ -160,6 +160,7 @@ class Navigator
bool custom_pipeline; bool custom_pipeline;
bool custom_connected; bool custom_connected;
void clearButtonSelection(); void clearButtonSelection();
void clearNewPannel();
void applyButtonSelection(int index); void applyButtonSelection(int index);
// side pannels // side pannels