From ec264e54002003a10436c95a4ceba67c14dc7d9a Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Thu, 13 Feb 2014 07:33:20 +0900 Subject: [PATCH] ecere/gui/Menu: (#1045) Avoiding menu item selection on mouse position when popping menu from keyboard - FileDialog: Took out nativeDecorations = true (default value) --- ecere/src/gui/controls/Menu.ec | 5 ++++- ecere/src/gui/dialogs/FileDialog.ec | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ecere/src/gui/controls/Menu.ec b/ecere/src/gui/controls/Menu.ec index f8421ee..28188c4 100644 --- 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 index 8729d1b..e649b10 100644 --- 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: -- 1.8.3.1