mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-11 10:19:59 +01:00
prefix ++View::need_deep_update_
This commit is contained in:
@@ -258,7 +258,7 @@ void GeometryView::draw()
|
|||||||
static std::vector< std::pair<int, int> > icons_ws = { {10,16}, {11,16}, {12,16} };
|
static std::vector< std::pair<int, int> > icons_ws = { {10,16}, {11,16}, {12,16} };
|
||||||
static std::vector< std::string > labels_ws = { "Background", "Workspace", "Foreground" };
|
static std::vector< std::string > labels_ws = { "Background", "Workspace", "Foreground" };
|
||||||
if ( ImGuiToolkit::ComboIcon (icons_ws, labels_ws, &Settings::application.current_workspace) ){
|
if ( ImGuiToolkit::ComboIcon (icons_ws, labels_ws, &Settings::application.current_workspace) ){
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleColor(8); // 14 colors
|
ImGui::PopStyleColor(8); // 14 colors
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ void LayerView::draw()
|
|||||||
(*it)->setDepth(depth);
|
(*it)->setDepth(depth);
|
||||||
}
|
}
|
||||||
Action::manager().store(std::string("Selection: Layer Distribute"));
|
Action::manager().store(std::string("Selection: Layer Distribute"));
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
if (ImGui::Selectable( ICON_FA_RULER_HORIZONTAL " Compress" )){
|
if (ImGui::Selectable( ICON_FA_RULER_HORIZONTAL " Compress" )){
|
||||||
SourceList dsl = depth_sorted(Mixer::selection().getCopy());
|
SourceList dsl = depth_sorted(Mixer::selection().getCopy());
|
||||||
@@ -135,7 +135,7 @@ void LayerView::draw()
|
|||||||
(*it)->setDepth(depth);
|
(*it)->setDepth(depth);
|
||||||
}
|
}
|
||||||
Action::manager().store(std::string("Selection: Layer Compress"));
|
Action::manager().store(std::string("Selection: Layer Compress"));
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
if (ImGui::Selectable( ICON_FA_EXCHANGE_ALT " Reverse order" )){
|
if (ImGui::Selectable( ICON_FA_EXCHANGE_ALT " Reverse order" )){
|
||||||
SourceList dsl = depth_sorted(Mixer::selection().getCopy());
|
SourceList dsl = depth_sorted(Mixer::selection().getCopy());
|
||||||
@@ -145,7 +145,7 @@ void LayerView::draw()
|
|||||||
(*it)->setDepth((*rit)->depth());
|
(*it)->setDepth((*rit)->depth());
|
||||||
}
|
}
|
||||||
Action::manager().store(std::string("Selection: Layer Reverse order"));
|
Action::manager().store(std::string("Selection: Layer Reverse order"));
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleColor(2);
|
ImGui::PopStyleColor(2);
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ void MediaSource::init()
|
|||||||
active_ = true;
|
active_ = true;
|
||||||
|
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// done init
|
// done init
|
||||||
initialized_ = true;
|
initialized_ = true;
|
||||||
|
|||||||
13
Mixer.cpp
13
Mixer.cpp
@@ -138,7 +138,7 @@ void Mixer::update()
|
|||||||
if ( back_session_ ) {
|
if ( back_session_ ) {
|
||||||
// swap front and back sessions
|
// swap front and back sessions
|
||||||
swap();
|
swap();
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
// set session filename
|
// set session filename
|
||||||
Rendering::manager().mainWindow().setTitle(session_->filename());
|
Rendering::manager().mainWindow().setTitle(session_->filename());
|
||||||
Settings::application.recentSessions.push(session_->filename());
|
Settings::application.recentSessions.push(session_->filename());
|
||||||
@@ -193,7 +193,7 @@ void Mixer::update()
|
|||||||
|
|
||||||
// deep update was performed
|
// deep update was performed
|
||||||
if (View::need_deep_update_ > 0)
|
if (View::need_deep_update_ > 0)
|
||||||
View::need_deep_update_--;
|
--View::need_deep_update_;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mixer::draw()
|
void Mixer::draw()
|
||||||
@@ -886,7 +886,7 @@ void Mixer::setView(View::Mode m)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// need to deeply update view to apply eventual changes
|
// need to deeply update view to apply eventual changes
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
|
|
||||||
View *Mixer::view(View::Mode m)
|
View *Mixer::view(View::Mode m)
|
||||||
@@ -1018,7 +1018,7 @@ void Mixer::merge(Session *session)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// needs to update !
|
// needs to update !
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// avoid display issues
|
// avoid display issues
|
||||||
current_view_->update(0.f);
|
current_view_->update(0.f);
|
||||||
@@ -1101,7 +1101,7 @@ void Mixer::merge(SessionSource *source)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// needs to update !
|
// needs to update !
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1200,7 +1200,7 @@ void Mixer::clear()
|
|||||||
sessionSwapRequested_ = true;
|
sessionSwapRequested_ = true;
|
||||||
|
|
||||||
// need to deeply update view to apply eventual changes
|
// need to deeply update view to apply eventual changes
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
Log::Info("New session ready.");
|
Log::Info("New session ready.");
|
||||||
}
|
}
|
||||||
@@ -1317,5 +1317,6 @@ void Mixer::restore(tinyxml2::XMLElement *sessionNode)
|
|||||||
session_->link( *group_loader_it, view(View::MIXING)->scene.fg() );
|
session_->link( *group_loader_it, view(View::MIXING)->scene.fg() );
|
||||||
|
|
||||||
|
|
||||||
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ void SessionFileSource::init()
|
|||||||
overlays_[View::TRANSITION]->detach(loader);
|
overlays_[View::TRANSITION]->detach(loader);
|
||||||
delete loader;
|
delete loader;
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -287,7 +287,7 @@ void SessionGroupSource::init()
|
|||||||
attach(renderbuffer);
|
attach(renderbuffer);
|
||||||
|
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// done init
|
// done init
|
||||||
initialized_ = true;
|
initialized_ = true;
|
||||||
@@ -355,7 +355,7 @@ void RenderSource::init()
|
|||||||
attach(renderbuffer);
|
attach(renderbuffer);
|
||||||
|
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// done init
|
// done init
|
||||||
initialized_ = true;
|
initialized_ = true;
|
||||||
|
|||||||
@@ -848,7 +848,7 @@ void CloneSource::init()
|
|||||||
attach(renderbuffer);
|
attach(renderbuffer);
|
||||||
|
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// done init
|
// done init
|
||||||
initialized_ = true;
|
initialized_ = true;
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ void StreamSource::init()
|
|||||||
attach(renderbuffer);
|
attach(renderbuffer);
|
||||||
|
|
||||||
// deep update to reorder
|
// deep update to reorder
|
||||||
View::need_deep_update_++;
|
++View::need_deep_update_;
|
||||||
|
|
||||||
// force update of activation mode
|
// force update of activation mode
|
||||||
active_ = true;
|
active_ = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user