summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2024-01-25 08:09:25 -0800
committerGreg Ercolano <erco@seriss.com>2024-01-25 08:09:25 -0800
commitf2544509c1796ea2bb120af23b73a94f88d219bc (patch)
tree3cd596dfebc23728c0be823cad880a93bffa7dd5 /src
parent6a887bf69b059ad2c6a3852f1726313ad3e8f247 (diff)
Fix mousewheel problem with Fl_Text_Editor (issue #879)
When an Fl_Text_Editor ended up under the mouse, it took mousewheel events for itself, freezing navigation of a parent's Fl_Scroll. Patch handles mousewheel events for both up/down and left/right by checking: > If editor has no scrollbar (e.g. no content to scroll to), then mousewheel events for that scrollbar are ignored so the parent can be navigated. > If editor has a scrollbar, it handles wheel events until scroller reaches an extreme position (e.g. top or bottom), it starts ignoring wheel events so the parent can be navigated.
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Text_Display.cxx18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
index f67b1865e..ff4649ee9 100644
--- a/src/Fl_Text_Display.cxx
+++ b/src/Fl_Text_Display.cxx
@@ -4128,7 +4128,7 @@ int Fl_Text_Display::handle(int event) {
if (!Fl::event_inside(text_area.x, text_area.y, text_area.w, text_area.h) &&
!dragging && event != FL_LEAVE && event != FL_ENTER &&
event != FL_MOVE && event != FL_FOCUS && event != FL_UNFOCUS &&
- event != FL_KEYBOARD && event != FL_KEYUP) {
+ event != FL_KEYBOARD && event != FL_KEYUP && event != FL_MOUSEWHEEL) {
return Fl_Group::handle(event);
}
@@ -4303,8 +4303,20 @@ int Fl_Text_Display::handle(int event) {
}
case FL_MOUSEWHEEL:
- if (Fl::event_dy()) return mVScrollBar->handle(event);
- else return mHScrollBar->handle(event);
+ if (Fl::e_dy && mVScrollBar->visible()) {
+ // Issue #879
+ Fl_Scrollbar *vs = mVScrollBar;
+ if ((Fl::e_dy < 0) && (vs->value() == int(vs->minimum()))) return 0; // hit top? ignore
+ if ((Fl::e_dy > 0) && (vs->value() == int(vs->maximum()))) return 0; // hit bot? ignore
+ return vs->handle(event);
+ } else if (Fl::e_dx && mHScrollBar->visible()) {
+ // Issue #879
+ Fl_Scrollbar *hs = mHScrollBar;
+ if ((Fl::e_dx < 0) && (hs->value() == int(hs->minimum()))) return 0; // hit left? ignore
+ if ((Fl::e_dx > 0) && (hs->value() == int(hs->maximum()))) return 0; // hit right? ignore
+ return hs->handle(event);
+ }
+ return 0;
case FL_UNFOCUS:
if (active_r() && window()) window()->cursor(FL_CURSOR_DEFAULT);