gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in Fl_Tabs without children (#1366)

Browse Source
This commit is contained in:
Matthias Melcher 2026-02-27 14:17:48 +01:00
parent e7addb470f
commit 97c2a52c7c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Fl_Tabs.cxx
View File

@ -373,7 +373,12 @@ int Fl_Tabs::hit_tabs_area(int event_x, int event_y) {
*/ */
void Fl_Tabs::check_overflow_menu() { void Fl_Tabs::check_overflow_menu() {
int nc = children(); int nc = children();
int H = tab_height(); if (H < 0) H = -H; if (nc == 0) {
has_overflow_menu = 0;
return;
}
int H = tab_height();
if (H < 0) H = -H;
if (tab_pos[nc] > w()-H+OV_BORDER) { if (tab_pos[nc] > w()-H+OV_BORDER) {
has_overflow_menu = 1; has_overflow_menu = 1;
} else { } else {
@ -433,9 +438,9 @@ int Fl_Tabs::maybe_do_callback(Fl_Widget *o) {
*/ */
void Fl_Tabs::handle_overflow_menu() { void Fl_Tabs::handle_overflow_menu() {
int nc = children(); int nc = children();
if (nc == 0) return;
int H = tab_height(); if (H < 0) H = -H; int H = tab_height(); if (H < 0) H = -H;
int i, fv=-1, lv=nc; // first and last visible tab int i, fv=-1, lv=nc; // first and last visible tab
if (nc <= 0) return;
// count visible children // count visible children
for (i = 0; i < nc; i++) { for (i = 0; i < nc; i++) {
@ -535,8 +540,9 @@ int Fl_Tabs::handle(int event) {
switch (event) { switch (event) {
case FL_MOUSEWHEEL: case FL_MOUSEWHEEL:
if ( ( (overflow_type == OVERFLOW_DRAG) || (overflow_type == OVERFLOW_PULLDOWN) ) if (((overflow_type == OVERFLOW_DRAG) || (overflow_type == OVERFLOW_PULLDOWN)) &&
&& hit_tabs_area(Fl::event_x(), Fl::event_y()) ) { (children() > 0) &&
hit_tabs_area(Fl::event_x(), Fl::event_y()) ) {
int original_tab_offset = tab_offset; int original_tab_offset = tab_offset;
tab_offset -= 2 * Fl::event_dx(); tab_offset -= 2 * Fl::event_dx();
if (tab_offset > 0) if (tab_offset > 0)
@ -573,7 +579,8 @@ int Fl_Tabs::handle(int event) {
if (event == FL_RELEASE && o != o_push_drag) { // see issue #1075 if (event == FL_RELEASE && o != o_push_drag) { // see issue #1075
return 1; return 1;
} }
if ( (overflow_type == OVERFLOW_DRAG) || (overflow_type == OVERFLOW_PULLDOWN) ) { if (((overflow_type == OVERFLOW_DRAG) || (overflow_type == OVERFLOW_PULLDOWN)) &&
(children() > 0)) {
if (tab_pos[children()] < w() && tab_offset == 0) { if (tab_pos[children()] < w() && tab_offset == 0) {
// fall through // fall through
} else if (!Fl::event_is_click()) { } else if (!Fl::event_is_click()) {