Fix drag and drop for cartmanager

asb2m10 · Sep 29, 2024 · 05a62d5 · 05a62d5
1 parent b4c7053
commit 05a62d5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/Documentation/Keybindings.md b/Documentation/Keybindings.md
@@ -9,3 +9,4 @@
 | CTRL+P                       | Open parameter dialog                      |
 | CTRL+C                       | Copy current context on clipboard as hexa  |
 | CTRL+V                       | Paste context from clipboard content       |
+| SHIFT+UP or SHIFT+DOWN       | On sliders, it steps 10 %                  |
diff --git a/README.md b/README.md
@@ -30,10 +30,10 @@ Dexed Forks
 Changelog
 ---------
 #### Version 0.9.8 (in development)
-* Accessibility implementation
-* Cartridge Manager UI refactoring (e.g. display .syx cartridge name)
+* UI Refresh
+* Accessibility implementation (including keyboard shortcuts)
 * Mono/Poly parameter is now a plugin parameter
-* Fix Logic startup issue
+* Fix Apple Logic startup issue
 
 #### Version 0.9.7
 * [MTS-ESP](https://oddsound.com/index.php) microtuning support

diff --git a/Source/CartManager.cpp b/Source/CartManager.cpp
@@ -424,7 +424,7 @@ void CartManager::programDragged(ProgramListBox *destListBox, int dest, char *pa
 
         Cartridge cart;
         cart.load(file);
-        memcpy(cart.getRawVoice()+(dest*128), packedPgm, 128);
+        cart.replaceProgram(dest, packedPgm);;
         cart.saveVoice(file);
         browserCart->setCartridge(cart);
     }

diff --git a/Source/PluginData.h b/Source/PluginData.h
@@ -246,7 +246,11 @@ class Cartridge {
         memcpy(perfData, other.perfData, SYSEX_SIZE);
         return *this;
     }
-
+
+    void replaceProgram(int idx, char *src) {
+        memcpy(getRawVoice() + (idx * 128), src, 128);
+    }
+
     void unpackProgram(uint8_t *unpackPgm, int idx);
     void packProgram(uint8_t *src, int idx, String name, char *opSwitch);
 };

diff --git a/Source/ProgramListBox.h b/Source/ProgramListBox.h
@@ -81,8 +81,7 @@ class ProgramLabel : public Component, public DragAndDropTarget {
 
     void paint(Graphics &g) override {
         if ( inDrag ) {
-            g.setColour(Colours::black);
-            g.fillRect(0,0,getWidth(), getHeight());
+            g.fillAll(DXLookNFeel::background);
             return;
         }
 
@@ -146,9 +145,7 @@ class ProgramLabel : public Component, public DragAndDropTarget {
             return;
 
         if (DragAndDropContainer* const dragContainer = DragAndDropContainer::findParentDragContainerFor(this)) {
-            Image snapshot (Image::ARGB, getWidth(), getHeight(), true);
-            Graphics g(snapshot);
-            paint(g);
+            ScaledImage snapshot;
             void *src = pgmListBox->cartContent.getRawVoice() + (idx*128);
             var description = var(src, 128);
             dragContainer->startDragging(description, this, snapshot, false);
@@ -193,7 +190,7 @@ class ProgramLabel : public Component, public DragAndDropTarget {
 
         MemoryBlock* block = dragSourceDetails.description.getBinaryData();
         if ( pgmListBox->listener != nullptr )
-            pgmListBox->listener->programDragged(pgmListBox, dest->idx, (char *)block->getData());
+            pgmListBox->listener->programDragged(pgmListBox, idx, (char *)block->getData());
 
         repaint();
     }