ecere/gui/Menu: (#1045) Avoiding menu item selection on mouse positio…

…n when popping menu from keyboard - FileDialog: Took out nativeDecorations = true (default value)
ecere · Feb 12, 2014 · ec264e5 · ec264e5
1 parent 8eaed7e
commit ec264e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ecere/src/gui/controls/Menu.ec b/ecere/src/gui/controls/Menu.ec
@@ -1706,8 +1706,11 @@ public class PopupMenu : Window
    bool OnMouseMove(int mx, int my, Modifiers mods)
    {
       int selectedX, selectedY;
+      ItemPtr selected;
 
-      ItemPtr selected = FindSelected(mx, my, &selectedX, &selectedY);
+      if(mods.isSideEffect) return true;
+
+      selected = FindSelected(mx, my, &selectedX, &selectedY);
 
       if((!mods.isSideEffect || !this.selected) && (/*selected && */
          selected != this.selected && (!selected || !ITEM_DISABLED(selected.item)) && (selected || !keyboardFocus)))

diff --git a/ecere/src/gui/dialogs/FileDialog.ec b/ecere/src/gui/dialogs/FileDialog.ec
@@ -248,7 +248,6 @@ public class FileDialog : Window
    borderStyle = sizable;
    tabCycle = true;
    autoCreate = false;
-   nativeDecorations = true;
    minClientSize = { 500, 300 };
 
 public: