ecere;Listbox/ide;watches; (#998) handle clipboard shortcut keys in watches list...

diff --git a/ecere/src/gui/Key.ec b/ecere/src/gui/Key.ec
index 49cacfd..c8edb74 100644 (file)
--- a/ecere/src/gui/Key.ec
+++ b/ecere/src/gui/Key.ec
@@ -400,5 +400,6 @@ public enum PredefinedKey : Key
    shiftF10 = Key { f10, shift = true },
    shiftF11 = Key { f11, shift = true },
    shiftF12 = Key { f12, shift = true },
-   shiftInsert = Key { insert, shift = true }
+   shiftInsert = Key { insert, shift = true },
+   shiftDel = Key { del, shift = true }
 };

diff --git a/ecere/src/gui/controls/ListBox.ec b/ecere/src/gui/controls/ListBox.ec
index 32037d5..0434b18 100644 (file)
--- a/ecere/src/gui/controls/ListBox.ec
+++ b/ecere/src/gui/controls/ListBox.ec
@@ -4149,7 +4149,8 @@ private:
                break;
             }
          }
-      if(key == f2 && currentField && currentField.editable)
+      if((key == f2 || (style.alwaysEdit && (key == ctrlV || key == ctrlC || key == ctrlX || key == shiftInsert || key == ctrlInsert || key == shiftDel))) &&
+            currentField && currentField.editable)
       {
          PopupEditBox(currentField, false);
          if(editData && editData.visible)
@@ -4157,8 +4158,11 @@ private:
             if(style.alwaysEdit)
             {
                editData.Activate();
-               // For Installer to pop up file dialog
-               NotifyKeyDown(master, this, currentRow, key, ch);
+               if(key == ctrlV || key == ctrlC || key == ctrlX || key == shiftInsert || key == ctrlInsert || key == shiftDel)
+                  editData.OnKeyHit(key, ch);
+               else
+                  // For Installer to pop up file dialog
+                  NotifyKeyDown(master, this, currentRow, key, ch);
             }
             return false;
          }