otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

instrument drag&drop: adding option to disable

Browse source
This commit is contained in:
yohannd1 2024-12-20 21:36:04 -03:00
parent 8aeb50bc32
commit 0b4cf34e4d
3 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/dataList.cpp
View file

@ -71,7 +71,7 @@ const char* sampleNote[12]={
} }
#define SIMPLE_DRAG_SOURCE(_c,_toMoveVar) \ #define SIMPLE_DRAG_SOURCE(_c,_toMoveVar) \
if (ImGui::BeginDragDropSource()) { \ if (settings.draggableDataView && ImGui::BeginDragDropSource()) { \
_toMoveVar=i; \ _toMoveVar=i; \
ImGui::SetDragDropPayload(_c,NULL,0,ImGuiCond_Once); \ ImGui::SetDragDropPayload(_c,NULL,0,ImGuiCond_Once); \
ImGui::Button(ICON_FA_ARROWS "##AssetDrag"); \ ImGui::Button(ICON_FA_ARROWS "##AssetDrag"); \
@ -79,7 +79,7 @@ const char* sampleNote[12]={
} }
#define SIMPLE_DRAG_TARGET(_c,_toMoveVar,_curVar,_swapFn,_moveUpFn,_moveDownFn) \ #define SIMPLE_DRAG_TARGET(_c,_toMoveVar,_curVar,_swapFn,_moveUpFn,_moveDownFn) \
if (ImGui::BeginDragDropTarget()) { \ if (settings.draggableDataView && ImGui::BeginDragDropTarget()) { \
const ImGuiPayload* payload=ImGui::AcceptDragDropPayload(_c); \ const ImGuiPayload* payload=ImGui::AcceptDragDropPayload(_c); \
if (payload!=NULL) { \ if (payload!=NULL) { \
int target=i; \ int target=i; \

2
src/gui/gui.h
View file

@ -1914,6 +1914,7 @@ class FurnaceGUI {
int doubleClickColumn; int doubleClickColumn;
int blankIns; int blankIns;
int dragMovesSelection; int dragMovesSelection;
int draggableDataView;
int cursorFollowsOrder; int cursorFollowsOrder;
int unsignedDetune; int unsignedDetune;
int noThreadedInput; int noThreadedInput;
@ -2176,6 +2177,7 @@ class FurnaceGUI {
doubleClickColumn(1), doubleClickColumn(1),
blankIns(0), blankIns(0),
dragMovesSelection(1), dragMovesSelection(1),
draggableDataView(1),
cursorFollowsOrder(1), cursorFollowsOrder(1),
unsignedDetune(0), unsignedDetune(0),
noThreadedInput(0), noThreadedInput(0),

8
src/gui/settings.cpp
View file

@ -2688,6 +2688,12 @@ void FurnaceGUI::drawSettings() {
settingsChanged=true; settingsChanged=true;
} }
bool draggableDataViewB=settings.draggableDataView;
if (ImGui::Checkbox(_("Draggable instruments/samples/waves"),&draggableDataViewB)) {
settings.draggableDataView=draggableDataViewB;
settingsChanged=true;
}
ImGui::Text(_("Note preview behavior:")); ImGui::Text(_("Note preview behavior:"));
ImGui::Indent(); ImGui::Indent();
if (ImGui::RadioButton(_("Never##npb0"),settings.notePreviewBehavior==0)) { if (ImGui::RadioButton(_("Never##npb0"),settings.notePreviewBehavior==0)) {
@ -4960,6 +4966,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
settings.doubleClickColumn=conf.getInt("doubleClickColumn",1); settings.doubleClickColumn=conf.getInt("doubleClickColumn",1);
settings.dragMovesSelection=conf.getInt("dragMovesSelection",2); settings.dragMovesSelection=conf.getInt("dragMovesSelection",2);
settings.draggableDataView=conf.getInt("draggableDataView",1);
settings.cursorFollowsOrder=conf.getInt("cursorFollowsOrder",1); settings.cursorFollowsOrder=conf.getInt("cursorFollowsOrder",1);
@ -5555,6 +5562,7 @@ void FurnaceGUI::writeConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
conf.set("doubleClickColumn",settings.doubleClickColumn); conf.set("doubleClickColumn",settings.doubleClickColumn);
conf.set("dragMovesSelection",settings.dragMovesSelection); conf.set("dragMovesSelection",settings.dragMovesSelection);
conf.set("draggableDataView",settings.draggableDataView);
conf.set("cursorFollowsOrder",settings.cursorFollowsOrder); conf.set("cursorFollowsOrder",settings.cursorFollowsOrder);