piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Menu black overlay fix (need to give the pointer of the current window)

Browse Source
This commit is contained in:
Bertrand Songis
2019-12-13 20:53:54 +01:00
parent 6cab260ee6
commit 81ce0398bd
30 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/simu.cpp
+12 -8
View File
@@ -252,12 +252,12 @@ long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v)
return 0;
}
long OpenTxSim::onMouseDown(FXObject*,FXSelector,void*v)
long OpenTxSim::onMouseDown(FXObject *, FXSelector, void * v)
{
FXEvent * evt = (FXEvent *)v;
UNUSED(evt);
// TRACE("onMouseDown %d %d", evt->win_x, evt->win_y);
TRACE_WINDOWS("[Mouse Press] %d %d", evt->win_x, evt->win_y);
#if defined(HARDWARE_TOUCH)
touchState.event = TE_DOWN;
@@ -273,7 +273,7 @@ long OpenTxSim::onMouseUp(FXObject*,FXSelector,void*v)
FXEvent * evt = (FXEvent *)v;
UNUSED(evt);
// TRACE("onMouseUp %d %d", evt->win_x, evt->win_y);
TRACE_WINDOWS("[Mouse Release] %d %d", evt->win_x, evt->win_y);
#if defined(HARDWARE_TOUCH)
if (touchState.event == TE_DOWN) {
@@ -294,13 +294,17 @@ long OpenTxSim::onMouseMove(FXObject*,FXSelector,void*v)
FXEvent * evt = (FXEvent *)v;
UNUSED(evt);
if (evt->state & LEFTBUTTONMASK) {
TRACE_WINDOWS("[Mouse Move] %d %d", evt->win_x, evt->win_y);
#if defined(HARDWARE_TOUCH)
if (evt->state & LEFTBUTTONMASK && (touchState.event == TE_SLIDE || abs(evt->win_x - touchState.x) > 5 || abs(evt->win_y - touchState.y) > 5)) {
touchState.event = TE_SLIDE;
touchState.x = evt->win_x;
touchState.y = evt->win_y;
}
if (touchState.event == TE_SLIDE || abs(evt->win_x - touchState.x) > 5 || abs(evt->win_y - touchState.y) > 5) {
touchState.event = TE_SLIDE;
touchState.x = evt->win_x;
touchState.y = evt->win_y;
}
#endif
}
return 0;
}