Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions source/Gui/CreatorWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <EngineInterface/SimulationFacade.h>

#include "AlienGui.h"
#include "EditorController.h"
#include "EditorModel.h"
#include "HelpStrings.h"
#include "SimulationInteractionController.h"
Expand Down Expand Up @@ -171,7 +170,7 @@ void CreatorWindow::processIntern()

bool CreatorWindow::isShown()
{
return _on && EditorController::get().isOn();
return _on;
}

void CreatorWindow::onDrawing()
Expand Down
4 changes: 0 additions & 4 deletions source/Gui/EditorController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ void EditorController::setOn(bool value)

void EditorController::process()
{
if (!_on) {
return;
}

processInspectorWindows();

EditorModel::get().setForceNoRollout(ImGui::GetIO().KeyShift);
Expand Down
3 changes: 1 addition & 2 deletions source/Gui/GenomeEditorWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "AlienGui.h"
#include "ChangeColorDialog.h"
#include "EditorController.h"
#include "EditorModel.h"
#include "FileTransferController.h"
#include "GenericFileDialog.h"
Expand Down Expand Up @@ -86,7 +85,7 @@ void GenomeEditorWindow::processIntern()

bool GenomeEditorWindow::isShown()
{
return _on && EditorController::get().isOn();
return _on;
}

void GenomeEditorWindow::processToolbar()
Expand Down
17 changes: 6 additions & 11 deletions source/Gui/MainLoopController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ void MainLoopController::processMenubar()
.keyAlt(true)
.key(ImGuiKey_S)
.selected(SelectionWindow::get().isOn())
.disabled(!SimulationInteractionController::get().isEditMode())
.closeMenuWhenItemClicked(false),
[&] { SelectionWindow::get().setOn(!SelectionWindow::get().isOn()); });
AlienGui::MenuItem(
Expand All @@ -439,7 +438,6 @@ void MainLoopController::processMenubar()
.keyAlt(true)
.key(ImGuiKey_G)
.selected(CreatorWindow::get().isOn())
.disabled(!SimulationInteractionController::get().isEditMode())
.closeMenuWhenItemClicked(false),
[&] { CreatorWindow::get().setOn(!CreatorWindow::get().isOn()); });
AlienGui::MenuItem(
Expand All @@ -448,7 +446,6 @@ void MainLoopController::processMenubar()
.keyAlt(true)
.key(ImGuiKey_M)
.selected(PatternEditorWindow::get().isOn())
.disabled(!SimulationInteractionController::get().isEditMode())
.closeMenuWhenItemClicked(false),
[&] { PatternEditorWindow::get().setOn(!PatternEditorWindow::get().isOn()); });
AlienGui::MenuItem(
Expand All @@ -457,7 +454,6 @@ void MainLoopController::processMenubar()
.keyAlt(true)
.key(ImGuiKey_B)
.selected(GenomeEditorWindow::get().isOn())
.disabled(!SimulationInteractionController::get().isEditMode())
.closeMenuWhenItemClicked(false),
[&] { GenomeEditorWindow::get().setOn(!GenomeEditorWindow::get().isOn()); });
AlienGui::MenuItem(
Expand All @@ -466,7 +462,6 @@ void MainLoopController::processMenubar()
.keyAlt(true)
.key(ImGuiKey_A)
.selected(MultiplierWindow::get().isOn())
.disabled(!SimulationInteractionController::get().isEditMode())
.closeMenuWhenItemClicked(false),
[&] { MultiplierWindow::get().setOn(!MultiplierWindow::get().isOn()); });
AlienGui::MenuSeparator();
Expand All @@ -475,41 +470,41 @@ void MainLoopController::processMenubar()
.name("Inspect objects")
.keyAlt(true)
.key(ImGuiKey_N)
.disabled(!SimulationInteractionController::get().isEditMode() || !PatternEditorWindow::get().isObjectInspectionPossible()),
.disabled(!PatternEditorWindow::get().isObjectInspectionPossible()),
[&] { EditorController::get().onInspectSelectedObjects(); });
AlienGui::MenuItem(
AlienGui::MenuItemParameters()
.name("Inspect principal genome")
.keyAlt(true)
.key(ImGuiKey_F)
.disabled(!SimulationInteractionController::get().isEditMode() || !PatternEditorWindow::get().isGenomeInspectionPossible()),
.disabled(!PatternEditorWindow::get().isGenomeInspectionPossible()),
[&] { EditorController::get().onInspectSelectedGenomes(); });
AlienGui::MenuItem(
AlienGui::MenuItemParameters()
.name("Close inspections")
.key(ImGuiKey_Escape)
.disabled(!SimulationInteractionController::get().isEditMode() || !EditorController::get().areInspectionWindowsActive()),
.disabled(!EditorController::get().areInspectionWindowsActive()),
[&] { EditorController::get().onCloseAllInspectorWindows(); });
AlienGui::MenuSeparator();
AlienGui::MenuItem(
AlienGui::MenuItemParameters()
.name("Copy")
.keyCtrl(true)
.key(ImGuiKey_C)
.disabled(!SimulationInteractionController::get().isEditMode() || !EditorController::get().isCopyingPossible()),
.disabled(!EditorController::get().isCopyingPossible()),
[&] { EditorController::get().onCopy(); });
AlienGui::MenuItem(
AlienGui::MenuItemParameters()
.name("Paste")
.keyCtrl(true)
.key(ImGuiKey_V)
.disabled(!SimulationInteractionController::get().isEditMode() || !EditorController::get().isPastingPossible()),
.disabled(!EditorController::get().isPastingPossible()),
[&] { EditorController::get().onPaste(); });
AlienGui::MenuItem(
AlienGui::MenuItemParameters()
.name("Delete")
.key(ImGuiKey_Delete)
.disabled(!SimulationInteractionController::get().isEditMode() || !EditorController::get().isCopyingPossible()),
.disabled(!EditorController::get().isCopyingPossible()),
[&] { EditorController::get().onDelete(); });
AlienGui::EndMenu();

Expand Down
3 changes: 1 addition & 2 deletions source/Gui/MultiplierWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <EngineInterface/SimulationFacade.h>

#include "AlienGui.h"
#include "EditorController.h"
#include "EditorModel.h"
#include "GenericMessageDialog.h"
#include "StyleRepository.h"
Expand Down Expand Up @@ -79,7 +78,7 @@ void MultiplierWindow::processIntern()

bool MultiplierWindow::isShown()
{
return _on && EditorController::get().isOn();
return _on;
}

void MultiplierWindow::processGridPanel()
Expand Down
2 changes: 1 addition & 1 deletion source/Gui/PatternEditorWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void PatternEditorWindow::processIntern()

bool PatternEditorWindow::isShown()
{
return _on && EditorController::get().isOn();
return _on;
}

void PatternEditorWindow::onOpenPattern()
Expand Down
3 changes: 1 addition & 2 deletions source/Gui/SelectionWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <Base/StringHelper.h>

#include "AlienGui.h"
#include "EditorController.h"
#include "EditorModel.h"
#include "StyleRepository.h"

Expand Down Expand Up @@ -62,5 +61,5 @@ void SelectionWindow::processIntern()

bool SelectionWindow::isShown()
{
return _on && EditorController::get().isOn();
return _on;
}