diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-10-18 19:51:12 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-10-18 19:51:12 +0300 |
| commit | 46427eefd4d27704397f4fe3cf3bc9d29946c1b2 (patch) | |
| tree | 45a0c9a6a02d6151a12b5e2e5568f7a8cb3bfdd1 | |
| parent | 68973b856ee4f096f7e1c0c4c72815f4ca676266 (diff) | |
SL-17916 FIXED Unnecessary double click actions
| -rw-r--r-- | indra/newview/llviewerinput.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp index 43b9cd90bd..6bab2c2100 100644 --- a/indra/newview/llviewerinput.cpp +++ b/indra/newview/llviewerinput.cpp @@ -1614,12 +1614,22 @@ BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask, clicktype = CLICK_DOUBLELEFT; } + // If the first LMB click is handled by the menu, skip the following double click + static bool skip_double_click = false; + if (clicktype == CLICK_LEFT && down ) + { + skip_double_click = handled; + } if (double_click_sp && down) { // Consume click. // Due to handling, double click that is not handled will be immediately followed by LMB click } + else if (clicktype == CLICK_DOUBLELEFT && skip_double_click) + { + handled = true; + } // If UI handled 'down', it should handle 'up' as well // If we handle 'down' not by UI, then we should handle 'up'/'level' regardless of UI else if (handled) |